diff options
| -rw-r--r-- | src/main/java/com/c2kernel/gui/tabs/CollectionPane.java | 14 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/gui/tree/NodeCollection.java | 6 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java index c55c4c7..9578497 100644 --- a/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/CollectionPane.java @@ -1,5 +1,6 @@ package com.c2kernel.gui.tabs;
import java.awt.GridBagConstraints;
+import java.util.StringTokenizer;
import javax.swing.JTabbedPane;
@@ -93,7 +94,18 @@ public class CollectionPane extends ItemTabPane implements ProxyObserver<Collect public void run()
{
Thread.currentThread().setName("Collection Loader");
- sourceItem.getItem().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, true));
+ sourceItem.getItem().subscribe(new MemberSubscription<Collection<?>>(this, ClusterStorage.COLLECTION, false));
+ try {
+ String collNames = sourceItem.getItem().queryData(ClusterStorage.COLLECTION+"/all");
+ StringTokenizer tok = new StringTokenizer(collNames, ",");
+ while (tok.hasMoreTokens()) {
+ Collection<?> thisLastColl = (Collection<?>) sourceItem.getItem().getObject(ClusterStorage.COLLECTION+"/"+tok.nextToken()+"/last");
+ add(thisLastColl);
+ }
+ } catch (Exception e) {
+ Logger.error(e);
+ Logger.msg(2, "Error loading collections");
+ }
}
@Override
diff --git a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java index 7cd66b5..36d32e3 100644 --- a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java +++ b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java @@ -30,7 +30,7 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e super(desktop);
this.parent = parent;
this.name = name;
- this.path = parent.getPath()+"/Collection/"+name;
+ this.path = parent.getPath()+"/"+ClusterStorage.COLLECTION+"/"+name+"/last";
createTreeNode();
this.makeExpandable();
}
@@ -39,7 +39,7 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e super(desktop);
this.parent = parent;
this.name = coll.getName();
- this.path = parent.getPath()+"/Collection/"+name;
+ this.path = parent.getPath()+"/"+ClusterStorage.COLLECTION+"/"+name+"/last";
createTreeNode();
this.makeExpandable();
add(coll);
@@ -50,7 +50,7 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e Logger.msg(8, "NodeCollection::loadChildren()");
try {
if (thisCollection == null) {
- Collection<? extends CollectionMember> initColl = (Collection<? extends CollectionMember>)parent.getObject(ClusterStorage.COLLECTION+"/"+name);
+ Collection<? extends CollectionMember> initColl = (Collection<? extends CollectionMember>)parent.getObject(ClusterStorage.COLLECTION+"/"+name+"/last");
add(initColl);
}
parent.subscribe(new MemberSubscription<Collection<? extends CollectionMember>>(this, ClusterStorage.COLLECTION, false));
|