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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-12-18 22:03:59 +0000 (Mon, 18 Dec 2006)
New Revision: 11472

Modified:
   trunk/apps/Thaw/src/thaw/core/Core.java
   trunk/apps/Thaw/src/thaw/core/MainWindow.java
   trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
Log:
Woops forgot to save the state of the option 'thaw and the node are on the same 
computer' in the configuration

Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java     2006-12-17 21:44:39 UTC (rev 
11471)
+++ trunk/apps/Thaw/src/thaw/core/Core.java     2006-12-18 22:03:59 UTC (rev 
11472)
@@ -172,10 +172,12 @@
                                                               
Integer.parseInt(config.getValue("maxUploadSpeed")),
                                                               
Boolean.valueOf(config.getValue("multipleSockets")).booleanValue(),
                                                               
Boolean.valueOf(config.getValue("sameComputer")).booleanValue());
-                       } else {
+                       } else { /* connection is not recreate to avoid 
troubles with observer etc */
                                
connection.setNodeAddress(config.getValue("nodeAddress"));
                                
connection.setNodePort(Integer.parseInt(config.getValue("nodePort")));
                                
connection.setMaxUploadSpeed(Integer.parseInt(config.getValue("maxUploadSpeed")));
+                               
connection.setDuplicationAllowed(Boolean.valueOf(config.getValue("multipleSockets")).booleanValue());
+                               
connection.setLocalSocket(Boolean.valueOf(config.getValue("sameComputer")).booleanValue());
                        }

                        if(!connection.connect()) {
@@ -348,6 +350,7 @@

                Logger.info(this, "Saving queue state");
                QueueKeeper.saveQueue(queueManager, "thaw.queue.xml");
+
        }

        /**

Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java       2006-12-17 21:44:39 UTC 
(rev 11471)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java       2006-12-18 22:03:59 UTC 
(rev 11472)
@@ -360,7 +360,7 @@


        public void updateToolBar() {
-               if(core.getConnectionManager().isConnected()) {
+               if(core.getConnectionManager() != null && 
core.getConnectionManager().isConnected()) {
                        connectButton.setEnabled(false);
                        disconnectButton.setEnabled(true);
                } else {

Modified: trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java  2006-12-17 21:44:39 UTC 
(rev 11471)
+++ trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java  2006-12-18 22:03:59 UTC 
(rev 11472)
@@ -130,6 +130,7 @@
                        }

                        core.getConfig().setValue("multipleSockets", 
Boolean.toString(multipleSockets.isSelected()));
+                       core.getConfig().setValue("sameComputer", 
Boolean.toString(sameComputer.isSelected()));

                        
setVisibility(Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue());
                }