Author: jflesch
Date: 2007-01-25 07:38:02 +0000 (Thu, 25 Jan 2007)
New Revision: 11615
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
Log:
Fix NPE and index tree refreshing
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java 2007-01-25 07:05:44 UTC
(rev 11614)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java 2007-01-25 07:38:02 UTC
(rev 11615)
@@ -94,7 +94,7 @@
Logger.info(this, "Hello "+nodeName+", I'm Thaw :)");
} else {
Logger.warning(this, "Unable to connect, ID is probably
already taken or there was a timeout");
-
queueManager.getQueryManager().getConnection().disconnect();
+ queryManager.getConnection().disconnect();
return false;
}
@@ -132,7 +132,6 @@
/* Damn ... ! */
Logger.warning(this, "According to the node,
Thaw ID is already used. Please change it in the configuration (in advanced
mode)");
queryManager.deleteObserver(this);
- queryManager.getConnection().disconnect();
receiveAnswer = true;
synchronized(this) {
notify();
Modified: trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java 2007-01-25
07:05:44 UTC (rev 11614)
+++ trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java 2007-01-25
07:38:02 UTC (rev 11615)
@@ -127,7 +127,7 @@
public void update(java.util.Observable o, Object param) {
if (((Index)o).hasChanged())
- browserPanel.getIndexTree().refresh();
+ browserPanel.getIndexTree().redraw();
else
browserPanel.getIndexTree().redraw();
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-01-25 07:05:44 UTC
(rev 11614)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-01-25 07:38:02 UTC
(rev 11615)
@@ -1348,7 +1348,7 @@
public void forceHasChangedReload() {
- /* Do nothing here */
+ loadData();
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-01-25
07:05:44 UTC (rev 11614)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-01-25
07:38:02 UTC (rev 11615)
@@ -1054,7 +1054,18 @@
private boolean hasLastHasChangedValueBeenSet = false;
public void forceHasChangedReload() {
+ if (children != null) {
+ synchronized(children) {
+ for (Iterator it = children.iterator();
+ it.hasNext();) {
+ IndexTreeNode child =
(IndexTreeNode)it.next();
+ child.forceHasChangedReload();
+ }
+ }
+ }
+
hasLastHasChangedValueBeenSet = false;
+ hasChanged();
}
public boolean hasChanged() {
