Author: bombe
Date: 2006-04-29 23:18:18 +0000 (Sat, 29 Apr 2006)
New Revision: 8596
Modified:
trunk/apps/jSite/src/de/todesbaum/jsite/application/ProjectInserter.java
trunk/apps/jSite/src/de/todesbaum/jsite/gui/NodeManagerPage.java
trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
trunk/apps/jSite/src/de/todesbaum/util/freenet/fcp2/Connection.java
Log:
version 0.4.6: improved handling of closed connections; fix bug in
node-hostname-changing
Modified:
trunk/apps/jSite/src/de/todesbaum/jsite/application/ProjectInserter.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/application/ProjectInserter.java
2006-04-27 23:38:03 UTC (rev 8595)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/application/ProjectInserter.java
2006-04-29 23:18:18 UTC (rev 8596)
@@ -48,7 +48,7 @@
/**
* @author David Roden <droden at gmail.com>
- * @version $Id: ProjectInserter.java 440 2006-03-30 09:31:25Z bombe $
+ * @version $Id: ProjectInserter.java 486 2006-04-27 10:58:34Z bombe $
*/
public class ProjectInserter implements FileScannerListener, Runnable {
@@ -240,12 +240,19 @@
/* create connection to node */
Connection connection =
freenetInterface.getConnection("project-insert-" + counter++);
+ boolean connected = false;
+ Throwable cause = null;
try {
- connection.connect();
+ connected = connection.connect();
} catch (IOException e1) {
- fireProjectInsertFinished(false, e1);
+ cause = e1;
+ }
+
+ if (!connected) {
+ fireProjectInsertFinished(false, cause);
return;
}
+
Client client = new Client(connection);
/* create containers */
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/gui/NodeManagerPage.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/gui/NodeManagerPage.java
2006-04-27 23:38:03 UTC (rev 8595)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/gui/NodeManagerPage.java
2006-04-29 23:18:18 UTC (rev 8596)
@@ -212,6 +212,7 @@
} else if ("node-hostname".equals(documentName)) {
node.setHostname(documentText);
nodeList.repaint();
+ fireNodesUpdated(getNodes());
}
}
Modified: trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java 2006-04-27
23:38:03 UTC (rev 8595)
+++ trunk/apps/jSite/src/de/todesbaum/jsite/main/Version.java 2006-04-29
23:18:18 UTC (rev 8596)
@@ -25,7 +25,7 @@
*/
public class Version {
- private static final String VERSION = "0.4.5";
+ private static final String VERSION = "0.4.6";
public static final String getVersion() {
return VERSION;
Modified: trunk/apps/jSite/src/de/todesbaum/util/freenet/fcp2/Connection.java
===================================================================
--- trunk/apps/jSite/src/de/todesbaum/util/freenet/fcp2/Connection.java
2006-04-27 23:38:03 UTC (rev 8595)
+++ trunk/apps/jSite/src/de/todesbaum/util/freenet/fcp2/Connection.java
2006-04-29 23:18:18 UTC (rev 8596)
@@ -231,6 +231,9 @@
}
nodeSocket = null;
}
+ synchronized (this) {
+ notify();
+ }
fireConnectionTerminated();
}
