Fix testcase for updatetest

Configfile work
Added topic history to Channel

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

src/com/dmdirc/Channel.java

@@ -59,6 +59,7 @@ import com.dmdirc.ui.messages.Styliser;
 import java.awt.Color;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -106,6 +107,10 @@ public final class Channel extends MessageTarget implements
     /** The config manager for this channel. */
     private final ConfigManager configManager;
     
+    // TODO: Make this some kind of fixed-length buffer
+    /** A list of previous topics we've seen. */
+    private final List<Topic> topics = new ArrayList<Topic>();
+    
     /** Whether we're in this channel or not. */
     private boolean onChannel;
     
@@ -475,6 +480,10 @@ public final class Channel extends MessageTarget implements
             
             addLine(buff, modes, parts[0], parts[1], parts[2], cChannel, topic);
         }
+        
+        topics.add(new Topic(cChannel.getTopic(), 
+                cChannel.getTopicUser(), cChannel.getTopicTime()));
+        
         updateTitle();
     }
     
@@ -750,6 +759,16 @@ public final class Channel extends MessageTarget implements
         return res;
     }
     
+    /**
+     * Retrieve the topics that have been seen on this channel.
+     * 
+     * @return A list of topics that have been seen on this channel, including
+     * the current one.
+     */
+    public List<Topic> getTopics() {
+        return new ArrayList<Topic>(topics);
+    }
+    
     /**
      * Returns this channel's name.
      * 

src/com/dmdirc/Topic.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc;
+
+/**
+ * Stores information about a channel topic.
+ * 
+ * @author chris
+ */
+public class Topic {
+    
+    private final String topic;
+    private final String client;
+    private final long time;
+
+    public Topic(String topic, String client, long time) {
+        this.topic = topic;
+        this.client = client;
+        this.time = time;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+    public long getTime() {
+        return time;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+    
+}

src/com/dmdirc/util/ConfigFile.java

@@ -67,16 +67,13 @@ public class ConfigFile {
 
                 domains.add(domain);
 
-                keydomain = "meta".equals(domain) || keydomains.containsKey(domain);
+                keydomain = keydomains.containsKey(domain)
+                        || flatdomains.containsValue("keysections", domain);
             } else if (domain != null && keydomain && (offset = tline.indexOf('=')) != -1) {
                 final String key = tline.substring(0, offset);
                 final String value = tline.substring(offset + 1);
 
-                if ("meta".equals(domain) && value.equals("key")) {
-                    keydomains.put(domain, new HashMap<String, String>());
-                } else if (!"meta".equals(domain)) {
-                    keydomains.get(domain).put(key, value);
-                }
+                keydomains.get(domain).put(key, value);
             } else if (domain != null && !keydomain) {
                 flatdomains.add(domain, tline);
             }
@@ -92,7 +89,7 @@ public class ConfigFile {
         writeMeta(lines);
 
         for (String domain : domains) {
-            if ("meta".equals(domain)) {
+            if ("keysections".equals(domain)) {
                 continue;
             }
 
@@ -116,16 +113,29 @@ public class ConfigFile {
 
     private void writeMeta(final List<String> lines) {
         lines.add("");
-        lines.add("# This section describes the format of the rest of the file.");
+        lines.add("# This section indicates which sections below take key/value");
+        lines.add("# pairs, rather than a simple list. It should be placed above");
+        lines.add("# any sections that take key/values.");
+        lines.add("keysections:");
 
         for (String domain : domains) {
-            if ("meta".equals(domain)) {
+            if ("keysections".equals(domain)) {
                 continue;
             } else if (keydomains.containsKey(domain)) {
-                lines.add("  " + domain + "=key");
-            } else {
-                lines.add("  " + domain + "=list");
+                lines.add("  " + domain);
             }
         }
     }
+    
+    public Map<String, String> getKeyDomain(final String domain) {
+        return keydomains.get(domain);
+    }
+    
+    public List<String> getListDomain(final String domain) {
+        return flatdomains.get(domain);
+    }
+    
+    public boolean hasDomain(final String domain) {
+        return keydomains.containsKey(domain) || flatdomains.containsKey(domain);
+    }
 }

test/com/dmdirc/actions/ConditionTreeTest.java

@@ -45,6 +45,7 @@ public class ConditionTreeTest {
             {"!!1", "!!1"},
             {"1 & !(2 | (3 & !4))", "(1&!(2|(3&!4)))"},
             {"", ""},
+            {"((1|((2&!3)&(!4))|6)&7)|!8", "((((1|((2&!3)&!4))|6)&7)|!8)"},
         };
         
         for (String[] testCase : testCases) {

test/com/dmdirc/updater/UpdateTest.java

@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
 
 public class UpdateTest {
     
-    private final String subject = "outofdate component rversion lversion url";
+    private final String subject = "outofdate component channel date version url";
     
     private Update update;
 
@@ -42,14 +42,9 @@ public class UpdateTest {
         assertEquals("component", update.getComponent());
     }
 
-    @Test
-    public void testGetLocalVersion() {
-        //assertEquals("lversion", update.getLocalVersion());
-    }
-
     @Test
     public void testGetRemoteVersion() {
-        assertEquals("rversion", update.getRemoteVersion());
+        assertEquals("version", update.getRemoteVersion());
     }
 
     @Test