[Thaw-dev] r12462 - trunk/apps/Thaw/src/thaw/core

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-31 00:35:06 +0000 (Sat, 31 Mar 2007)
New Revision: 12462

Modified:
   trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
   trunk/apps/Thaw/src/thaw/core/Core.java
Log:
Thaw: commit missing stuffs

Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2007-03-31 00:30:31 UTC 
(rev 12461)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2007-03-31 00:35:06 UTC 
(rev 12462)
@@ -31,9 +31,9 @@
        private JButton okButton;
        private JButton cancelButton;

-       private ThawConfigPanel thawConfigPanel;
-       private NodeConfigPanel nodeConfigPanel;
-       private PluginConfigPanel pluginConfigPanel;
+       protected ThawConfigPanel thawConfigPanel;
+       protected NodeConfigPanel nodeConfigPanel;
+       protected PluginConfigPanel pluginConfigPanel;

        private Core core;


Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java     2007-03-31 00:30:31 UTC (rev 
12461)
+++ trunk/apps/Thaw/src/thaw/core/Core.java     2007-03-31 00:35:06 UTC (rev 
12462)
@@ -1,7 +1,7 @@
 package thaw.core;

 import java.io.IOException;
-import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.Observable;
 import java.util.Observer;

@@ -50,7 +50,8 @@

        // MDNS stuffs
        private final JmDNS jmdns;
-       private final LinkedHashMap foundNodes;
+       // SYNC IT!!!
+       protected final LinkedList foundNodes;

        private class FCPMDNSListener implements ServiceListener {
                public void serviceAdded(ServiceEvent event) {
@@ -64,7 +65,10 @@
                        ServiceInfo service = event.getInfo();

                        synchronized (foundNodes) {
-                               foundNodes.remove(service.getName());   
+                               foundNodes.remove(service);
+                               synchronized 
(configWindow.nodeConfigPanel.mdnsPanel) {
+                                       
configWindow.nodeConfigPanel.mdnsPanel.notifyAll();     
+                               }
                        }
                }

@@ -73,7 +77,10 @@
                        ServiceInfo service = event.getInfo();

                        synchronized (foundNodes) {
-                               foundNodes.put(service.getName(), service);
+                               foundNodes.add(service);
+                               synchronized 
(configWindow.nodeConfigPanel.mdnsPanel) {
+                                       
configWindow.nodeConfigPanel.mdnsPanel.notifyAll();
+                               }
                        }
                }
        }
@@ -86,7 +93,7 @@
                Logger.info(this, "2006(c) Freenet project", true);
                Logger.info(this, "Released under GPL license version 2 or 
later (see http://www.fsf.org/licensing/licenses/gpl.html)", true);

-               this.foundNodes = new LinkedHashMap();
+               this.foundNodes = new LinkedList();
                try {
                        // Spawn the mdns listener
                        Logger.info(this, "Starting JMDNS ...");
@@ -100,12 +107,6 @@
                        throw new RuntimeException("Error loading 
MDNSDiscoveryPanel : " + e.getMessage());
                }
        }
-
-       protected int getDiscoveredNodeListSize() {
-               synchronized (foundNodes) {
-                       return foundNodes.size();
-               }
-       }

        protected boolean isHasTheSameIPAddress(ServiceInfo host) {
                try{
@@ -115,13 +116,6 @@
                }
        }

-       protected ServiceInfo getServiceInfoFromDiscoveredNodeList(Object o) {
-               if(o == null) return null;
-               synchronized (foundNodes) {
-                       return (ServiceInfo) foundNodes.get(o);
-               }
-       }
-
        /**
         * Gives a ref to the object containing the config.
         */