--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java	Mon Aug 22 13:29:55 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java	Mon Aug 22 14:29:49 2011 +0000
@@ -45,6 +45,8 @@
 import de.intevation.flys.client.shared.model.AttrList;
 
 import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
 
@@ -66,7 +68,7 @@
 
     protected Layout layout;
 
-    protected List<ToLoad> toLoad;
+    protected Map<String, ToLoad> toLoad;
 
 
     public DatacageWindow(Artifact artifact, User user) {
@@ -123,12 +125,12 @@
 
         centerInPage();
 
-        toLoad = new ArrayList<ToLoad>();
+        toLoad = new HashMap<String, ToLoad>();
 
         triggerTreeBuilding();
     }
 
-    public List<ToLoad> toLoad() {
+    public Map<String, ToLoad> toLoad() {
         return toLoad;
     }
 
@@ -175,10 +177,12 @@
                 String artifactId = node.getAttribute("artifact-id");
                 String num        = node.getAttribute("num");
 
-                ToLoad tl = new ToLoad(factory, artifactId, ids, num);
-                if (!toLoad.contains(tl)) {
-                    toLoad.add(tl);
+                ToLoad tl = toLoad.get(artifactId);
+                if (tl == null) {
+                    tl = new ToLoad(artifactId);
                 }
+
+                tl.add(factory, ids, num);
             }
             TreeNode [] children = tree.getChildren(node);
             if (children != null) {