Identities initialised using streams now require two to be passed, as there doesn't seem to be a reliable way to read one twice...

Fixes issue 1123
Fixes issue 1124
Fixes issue 1125

git-svn-id: http://svn.dmdirc.com/trunk@3878 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/config/Identity.java

@@ -134,7 +134,7 @@ public class Identity extends ConfigSource implements Serializable,
             InvalidIdentityFileException {
         this.file = new ConfigFile(new TextFile(file));
         this.file.setAutomake(true);
-        initFile(forceDefault, null, file);
+        initFile(forceDefault, new FileInputStream(file), new FileInputStream(file));
         myTarget = getTarget(forceDefault);
     }
 
@@ -142,16 +142,18 @@ public class Identity extends ConfigSource implements Serializable,
      * Creates a new read-only identity.
      *
      * @param stream The input stream to read the identity from
+     * @param stream2 A second input stream if the first doesn't support marking
      * @param forceDefault Whether to force this identity to be loaded as default
      * identity or not
      * @throws InvalidIdentityFileException Missing required properties
      * @throws IOException Input/output exception
      */
-    public Identity(final InputStream stream, final boolean forceDefault) throws IOException,
+    public Identity(final InputStream stream, final InputStream stream2,
+            final boolean forceDefault) throws IOException,
             InvalidIdentityFileException {
         this.file = new ConfigFile(new TextFile(stream));
         this.file.setAutomake(true);
-        initFile(forceDefault, stream, null);
+        initFile(forceDefault, stream, stream2);
         myTarget = getTarget(forceDefault);
     }
 
@@ -220,34 +222,30 @@ public class Identity extends ConfigSource implements Serializable,
      * @throws InvalidIdentityFileException if the identity file is invalid
      * @throws IOException On I/O exception when reading the identity
      */
-    @Precondition("Exactly one of stream and file are specified")
     private void initFile(final boolean forceDefault, final InputStream stream,
-            final File file) throws InvalidIdentityFileException, IOException {
-        Logger.assertTrue(file == null ^ stream == null);
+            final InputStream newStream) throws InvalidIdentityFileException, IOException {
         
-        if (stream != null && stream.markSupported()) {
+        if (stream.markSupported()) {
             stream.mark(Integer.MAX_VALUE);
         }
         
         try {
             this.file.read();
-        } catch (InvalidConfigFileException ex) {
-            InputStream newStream;
+        } catch (InvalidConfigFileException ex) {            
+            InputStream myStream;
             
             if (stream != null && stream.markSupported()) {
                 // Not a config file
                 stream.reset();
-                newStream = stream;
-            } else if (file != null) {
-                newStream = new FileInputStream(file);
+                myStream = stream;
             } else {
-                throw new IllegalArgumentException("InputStream does not support "
-                        + "mark and contents are not a ConfigFile");                
+                myStream = newStream;
             }
                 
             final Properties properties = new Properties();
-            properties.load(newStream);
-            newStream.close();
+            properties.load(myStream);
+            
+            myStream.close();
             
             migrateProperties(properties);
         }

src/com/dmdirc/themes/Theme.java

@@ -112,7 +112,7 @@ public class Theme implements Comparable<Theme> {
 
         if (stream != null) {
             try {
-                identity = new ThemeIdentity(stream);
+                identity = new ThemeIdentity(stream, rm.getResourceInputStream("config"));
                 IdentityManager.addIdentity(identity);
             } catch (InvalidIdentityFileException ex) {
                 Logger.userError(ErrorLevel.MEDIUM, "Error loading theme identity file: "

src/com/dmdirc/themes/ThemeIdentity.java

@@ -47,12 +47,13 @@ public class ThemeIdentity extends Identity {
      * Creates a new instance of ThemeIdentity.
      *
      * @param stream The input stream to read the identity from.
+     * @param stream2 A second input stream (for migration)
      * @throws InvalidIdentityFileException Missing required properties
      * @throws IOException Input/output exception
      */
-    public ThemeIdentity(final InputStream stream) throws IOException,
+    public ThemeIdentity(final InputStream stream, final InputStream stream2) throws IOException,
             InvalidIdentityFileException {
-        super(stream, true);
+        super(stream, stream2, true);
         myTarget.setTheme();
     }
     

test/com/dmdirc/config/IdentityTest.java

@@ -165,17 +165,17 @@ public class IdentityTest {
     
     @Test(expected=InvalidIdentityFileException.class)
     public void testNoName() throws IOException, InvalidIdentityFileException {
-        new Identity(getClass().getResourceAsStream("identity1"), false);
+        new Identity(getClass().getResourceAsStream("identity1"), null, false);
     }
     
     @Test(expected=InvalidIdentityFileException.class)
     public void testNoTarget() throws IOException, InvalidIdentityFileException {
-        new Identity(getClass().getResourceAsStream("identity2"), false);
+        new Identity(getClass().getResourceAsStream("identity2"), null, false);
     }
     
     @Test
     public void testMigrate() throws IOException, InvalidIdentityFileException {
-        final Identity id = new Identity(getClass().getResourceAsStream("identity3"), false);
+        final Identity id = new Identity(getClass().getResourceAsStream("identity3"), null, false);
         
         assertTrue(id.getFile().isKeyDomain("identity"));
         assertTrue(id.getFile().isKeyDomain("meep"));