Changeset 5661

Timestamp:

10/09/08 10:47:52 (6 weeks ago)

Author:

jburel

Message:

removed comments creating bug when expanding time node

Location:

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer

Files:

• RefreshExperimenterDataLoader.java (modified) (3 diffs)
• browser/BrowserComponent.java (modified) (1 diff)
• browser/BrowserControl.java (modified) (2 diffs)
• browser/BrowserUI.java (modified) (1 diff)

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/RefreshExperimenterDataLoader.java

@@ -41 +41 @@
 import org.openmicroscopy.shoola.env.data.model.TimeRefObject;
 import org.openmicroscopy.shoola.env.data.views.CallHandle;
-import pojos.CategoryData;
-import pojos.CategoryGroupData;
 import pojos.DataObject;
 import pojos.DatasetData;
@@ -86 +84 @@
     {
         if (ProjectData.class.equals(klass) || ImageData.class.equals(klass) ||
-                CategoryGroupData.class.equals(klass) ||
                 TagAnnotationData.class.equals(klass) ||
                 ScreenData.class.equals(klass))
@@ -115 +112 @@
                 if (parent instanceof ProjectData) {
                     children = ((ProjectData) parent).getDatasets();
-                } else if (parent instanceof CategoryGroupData) {
-                    children = ((CategoryGroupData) parent).getCategories();
                 } else if (parent instanceof DatasetData) {
-                        children = new HashSet(1);
-                        children.add(parent);
-                } else if (parent instanceof CategoryData) {
                         children = new HashSet(1);
                         children.add(parent);

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/browser/BrowserComponent.java

@@ -363 +363 @@
         long userID = exp.getId();
         long groupID = -1;//exp.getDefaultGroup().getId();
+        
         Set visLeaves = TreeViewerTranslator.transformHierarchy(leaves, userID, 
                                                                 groupID);

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/browser/BrowserControl.java

@@ -46 +46 @@
 import org.openmicroscopy.shoola.agents.treeviewer.actions.SortByDateAction;
 import org.openmicroscopy.shoola.env.ui.UserNotifier;
-import org.openmicroscopy.shoola.util.ui.UIUtilities;
-
-import pojos.CategoryData;
 import pojos.DatasetData;
 import pojos.ExperimenterData;
@@ -188 +185 @@
                 return;
         }
-        // if (display.isChildrenLoaded()); //tmp 06/10
-        if (display.isChildrenLoaded() && ho instanceof ProjectData) {
+        if (display.isChildrenLoaded()) {
                 List l = display.getChildrenDisplay();
                         //if (display.getChildCount() != l.size()) {

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/browser/BrowserUI.java

@@ -1131 +1131 @@
         parent.removeAllChildren();
         parent.setChildrenLoaded(Boolean.TRUE);
+        System.err.println(parent.getNodeText());
         if (nodes.size() != 0) {
             Iterator i = nodes.iterator();