ConfigFile now extends TextFile instead of wrapping it rather oddly (groundwork for fixing issue 1154)

Fixed a couple of deprecated method uses in Server
Removed deprecated TextFile constructor

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

src/com/dmdirc/Server.java

@@ -425,7 +425,7 @@ public final class Server extends WritableFrameContainer implements Serializable
         final String nick = ClientInfo.parseHost(host);
 
         for (Query query : queries) {
-            if (parser.equalsIgnoreCase(ClientInfo.parseHost(query.getHost()), nick)) {
+            if (converter.equalsIgnoreCase(ClientInfo.parseHost(query.getHost()), nick)) {
                 return true;
             }
         }
@@ -443,7 +443,7 @@ public final class Server extends WritableFrameContainer implements Serializable
         final String nick = ClientInfo.parseHost(host);
 
         for (Query query : queries) {
-            if (parser.equalsIgnoreCase(ClientInfo.parseHost(query.getHost()), nick)) {
+            if (converter.equalsIgnoreCase(ClientInfo.parseHost(query.getHost()), nick)) {
                 return query;
             }
         }
@@ -1000,7 +1000,7 @@ public final class Server extends WritableFrameContainer implements Serializable
         final String lastNick = parser.getMyNickname();
 
         // If our last nick is still valid, ignore the in use message
-        if (!parser.equalsIgnoreCase(lastNick, nickname)) {
+        if (!converter.equalsIgnoreCase(lastNick, nickname)) {
             return;
         }
 
@@ -1010,11 +1010,11 @@ public final class Server extends WritableFrameContainer implements Serializable
             final String[] alts = profile.getOption(DOMAIN_PROFILE, "altnicks").split("\n");
             int offset = 0;
 
-            if (!parser.equalsIgnoreCase(lastNick,
+            if (!converter.equalsIgnoreCase(lastNick,
                     profile.getOption(DOMAIN_PROFILE, "nickname"))) {
                 for (String alt : alts) {
                     offset++;
-                    if (parser.equalsIgnoreCase(alt, lastNick)) {
+                    if (converter.equalsIgnoreCase(alt, lastNick)) {
                         break;
                     }
                 }

src/com/dmdirc/config/Identity.java

@@ -29,7 +29,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
-import com.dmdirc.util.TextFile;
 import com.dmdirc.util.WeakList;
 
 import java.io.File;
@@ -131,7 +130,7 @@ public class Identity extends ConfigSource implements Serializable,
      */
     public Identity(final File file, final boolean forceDefault) throws IOException,
             InvalidIdentityFileException {
-        this.file = new ConfigFile(new TextFile(file));
+        this.file = new ConfigFile(file);
         this.file.setAutomake(true);
         initFile(forceDefault, new FileInputStream(file), new FileInputStream(file));
         myTarget = getTarget(forceDefault);
@@ -150,7 +149,7 @@ public class Identity extends ConfigSource implements Serializable,
     public Identity(final InputStream stream, final InputStream stream2,
             final boolean forceDefault) throws IOException,
             InvalidIdentityFileException {
-        this.file = new ConfigFile(new TextFile(stream));
+        this.file = new ConfigFile(stream);
         this.file.setAutomake(true);
         initFile(forceDefault, stream, stream2);
         myTarget = getTarget(forceDefault);

src/com/dmdirc/config/IdentityManager.java

@@ -185,7 +185,7 @@ public final class IdentityManager {
     private static void loadIdentity(final File file) {
         synchronized (identities) {
             for (Identity identity : identities) {
-                if (file.equals(identity.getFile().getFile().getFile())) {
+                if (file.equals(identity.getFile().getFile())) {
                     try {
                         identity.reload();
                     } catch (IOException ex) {

src/com/dmdirc/util/ConfigFile.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.util;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -37,7 +37,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public class ConfigFile {
+public class ConfigFile extends TextFile {
 
     /** A list of domains in this config file. */
     private final List<String> domains = new ArrayList<String>();
@@ -48,55 +48,38 @@ public class ConfigFile {
     /** The key/value sets associated with each key domain. */
     private final Map<String, Map<String, String>> keydomains
             = new HashMap<String, Map<String, String>>();
-
-    /** The text file we're reading. */
-    private final TextFile file;
     
     /** Whether or not we should automatically create domains. */
     private boolean automake;
 
     /**
-     * Creates a new instance of ConfigFile.
+     * Creates a new read-only Config File from the specified input stream.
      * 
-     * @param file The path of the file to be loaded
-     * @deprecated Pass a TextFile instead
-     */
-    @Deprecated
-    public ConfigFile(final String file) {
-        this.file = new TextFile(file);
-    }
-    
-    /**
-     * Creates a new instance of ConfigFile.
-     * 
-     * @param uri The URI of the file to be loaded
-     * @deprecated Pass a TextFile instead
+     * @param is The input stream to read
      */
-    @Deprecated
-    public ConfigFile(final URI uri) {
-        this.file = new TextFile(uri);
+    public ConfigFile(final InputStream is) {
+        super(is);
     }
-    
+
     /**
-     * Creates a ConfigFile from the specified input stream.
+     * Creates a new Config File from the specified file.
      * 
-     * @param is The input stream to read
-     * @deprecated Pass a TextFile instead
+     * @param file The file to read/write
      */
-    @Deprecated
-    public ConfigFile(final InputStream is) {
-        this.file = new TextFile(is);
+    public ConfigFile(final File file) {
+        super(file);
     }
-    
+
     /**
-     * Creates a ConfigFile for the specified file.
+     * Creates a new Config File from the specified file.
      * 
-     * @param file The file to use
+     * @param filename The name of the file to read/write
      */
-    public ConfigFile(final TextFile file) {
-        this.file = file;
+    public ConfigFile(final String filename) {
+        super(filename);
     }
 
+
     /**
      * Sets the "automake" value of this config file. If automake is set to
      * true, any calls to getKeyDomain will automatically create the domain
@@ -124,7 +107,7 @@ public class ConfigFile {
         flatdomains.clear();
         domains.clear();
 
-        for (String line : file.getLines()) {
+        for (String line : getLines()) {
             String tline = line;
             
             while (!tline.isEmpty() && (tline.charAt(0) == '\t' || 
@@ -170,7 +153,7 @@ public class ConfigFile {
      * @throws IOException if the write operation fails
      */
     public void write() throws IOException {
-        if (!file.isWritable()) {
+        if (!isWritable()) {
             throw new UnsupportedOperationException("Cannot write to a file "
                     + "that isn't writable");
         }
@@ -203,34 +186,9 @@ public class ConfigFile {
             }
         }
 
-        file.writeLines(lines);
+        writeLines(lines);
     }
     
-    /**
-     * Determines if this file is writable or not.
-     * 
-     * @return True if the file is writable, false otherwise
-     */
-    public boolean isWritable() {
-        return file != null && file.isWritable();
-    }    
-    
-    /**
-     * Deletes this config file.
-     */
-    public void delete() {
-        file.delete();
-    }
-
-    /**
-     * Retrieves the text file for this config file.
-     * 
-     * @return This config file's text file
-     */
-    public TextFile getFile() {
-        return file;
-    }
-
     /**
      * Appends the meta-data (keysections) to the specified list of lines.
      * 

src/com/dmdirc/util/TextFile.java

@@ -30,7 +30,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -55,18 +54,7 @@ public class TextFile {
     public TextFile(final String filename) {
         file = new File(filename);
     }
-    
-    /**
-     * Creates a new instance of TextFile for the specified URI.
-     * 
-     * @param uri The URI of the file
-     * @deprecated Pass an InputStream or File instead
-     */
-    @Deprecated
-    public TextFile(final URI uri) {
-        file = new File(uri);
-    }
-    
+
     /**
      * Creates a new instance of TextFile for the specified File.
      * 

test/com/dmdirc/actions/ActionTest.java

@@ -25,12 +25,12 @@ import com.dmdirc.actions.interfaces.ActionType;
 
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
-import com.dmdirc.util.TextFile;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-
 import java.util.Arrays;
+
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -85,7 +85,7 @@ public class ActionTest extends junit.framework.TestCase {
         ActionManager.init();
 
         final Action action = new Action("unit-test", "doesn't_exist");
-        action.config = new ConfigFile(new TextFile(getClass().getResourceAsStream("action1")));
+        action.config = new ConfigFile(getClass().getResourceAsStream("action1"));
         action.config.read();
         action.loadActionFromConfig();
 

test/com/dmdirc/util/ConfigFileTest.java

@@ -28,6 +28,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -39,7 +40,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Before
     public void setUp() throws Exception {
         cf = new ConfigFile(getClass().getClassLoader().
-                    getResource("com/dmdirc/util/test2.txt").toURI());
+                    getResourceAsStream("com/dmdirc/util/test2.txt"));
     }    
 
     @Test
@@ -107,7 +108,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Test
     public void testColons() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
-        ConfigFile config = new ConfigFile(file.toURI());
+        ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<String, String>();
         data.put("test1", "hello");
         data.put("test:2", "hello");
@@ -115,7 +116,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
         config.addDomain("test", data);
         config.write();
         
-        config = new ConfigFile(file.toURI());
+        config = new ConfigFile(file);
         config.read();
         
         assertTrue(config.isKeyDomain("test"));
@@ -128,7 +129,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Test
     public void testEquals() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
-        ConfigFile config = new ConfigFile(file.toURI());
+        ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<String, String>();
         data.put("test1", "hello");
         data.put("test=2", "hello");
@@ -136,7 +137,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
         config.addDomain("test", data);
         config.write();
         
-        config = new ConfigFile(file.toURI());
+        config = new ConfigFile(file);
         config.read();
         
         assertTrue(config.isKeyDomain("test"));
@@ -149,7 +150,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Test
     public void testNewlines() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
-        ConfigFile config = new ConfigFile(file.toURI());
+        ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<String, String>();
         data.put("test1", "hello");
         data.put("test2", "hello\ngoodbye");
@@ -158,7 +159,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
         config.addDomain("test", data);
         config.write();
         
-        config = new ConfigFile(file.toURI());
+        config = new ConfigFile(file);
         config.read();
         
         assertTrue(config.isKeyDomain("test"));
@@ -172,7 +173,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Test
     public void testBackslash() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
-        ConfigFile config = new ConfigFile(file.toURI());
+        ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<String, String>();
         data.put("test1", "hello\\");
         data.put("test2", "\\nhello");
@@ -180,7 +181,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
         config.addDomain("test", data);
         config.write();
         
-        config = new ConfigFile(file.toURI());
+        config = new ConfigFile(file);
         config.read();
         
         assertTrue(config.isKeyDomain("test"));
@@ -193,7 +194,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Test
     public void testHash() throws IOException, InvalidConfigFileException {
         final File file = File.createTempFile("DMDirc.unittest", null);
-        ConfigFile config = new ConfigFile(file.toURI());
+        ConfigFile config = new ConfigFile(file);
         Map<String, String> data = new HashMap<String, String>();
         data.put("test1#", "hello");
         data.put("#test2", "hello");
@@ -201,7 +202,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
         config.addDomain("test", data);
         config.write();
         
-        config = new ConfigFile(file.toURI());
+        config = new ConfigFile(file);
         config.read();
         
         assertTrue(config.isKeyDomain("test"));
@@ -227,7 +228,7 @@ public class ConfigFileTest extends junit.framework.TestCase {
     @Test
     public void testDelete() throws IOException {
         final File file = File.createTempFile("DMDirc_unittest", null);
-        ConfigFile config = new ConfigFile(new TextFile(file));
+        ConfigFile config = new ConfigFile(file);
         config.write();
         assertTrue(file.exists());
         config.delete();