Changeset 5681

Timestamp:

10/13/08 14:02:17 (7 weeks ago)

Author:

jburel

Message:

Cleaning

Location:

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

Files:

• browser/BrowserComponent.java (modified) (2 diffs)
• browser/BrowserModel.java (modified) (4 diffs)
• browser/BrowserUI.java (modified) (1 diff)
• view/TreeViewer.java (modified) (1 diff)
• view/TreeViewerControl.java (modified) (1 diff)

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

@@ -54 +54 @@
 import pojos.DatasetData;
 import pojos.ExperimenterData;
+import pojos.ImageData;
 import pojos.PlateData;
 import pojos.ProjectData;
@@ -1259 +1260 @@
                 } else if (uo instanceof PlateData) {
                         model.browsePlate(node);
+                } else if (uo instanceof ImageData) {
+                        model.viewImage(node);
                 }
                 fireStateChange();

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

@@ -27 +27 @@
 //Java imports
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -37 +38 @@
 
 //Application-internal dependencies
+import org.openmicroscopy.shoola.agents.events.iviewer.ViewImage;
 import org.openmicroscopy.shoola.agents.treeviewer.ContainerCounterLoader;
 import org.openmicroscopy.shoola.agents.treeviewer.DataBrowserLoader;
@@ -52 +54 @@
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
 import org.openmicroscopy.shoola.env.LookupNames;
+
+import pojos.DataObject;
 import pojos.DatasetData;
 import pojos.ExperimenterData;
+import pojos.GroupData;
 import pojos.ImageData;
 import pojos.PlateData;
@@ -676 +681 @@
         }
 
+        /**
+         * Views the passed image.
+         * 
+         * @param node The node to handle
+         */
+        void viewImage(TreeImageDisplay node)
+        { 
+                if (node == null) return;
+                ImageData image = (ImageData) node.getUserObject();
+                TreeImageDisplay pNode = node.getParentDisplay();
+                DataObject pObject = null;
+                DataObject gpObject = null;
+                if (pNode != null) {
+                        Object p = pNode.getUserObject();
+                        if (p instanceof DataObject)
+                                pObject = (DataObject) p;
+                        TreeImageDisplay gpNode = pNode.getParentDisplay();
+                        if (gpNode != null) {
+                                p = gpNode.getUserObject();
+                                if (p instanceof DataObject) {
+                                        if (!((p instanceof ExperimenterData) ||
+                                                        (p instanceof GroupData)))
+                                                gpObject = (DataObject) p;
+                                }
+                                        
+                        }
+                }
+                Rectangle r = parent.getUI().getBounds();
+                ViewImage evt = new ViewImage(image, r);
+        evt.setContext(pObject, gpObject);
+                TreeViewerAgent.getRegistry().getEventBus().post(evt);
+        }
+        
 }

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

@@ -256 +256 @@
                 Object o = d.getUserObject();
                 if (o instanceof ImageData) {
-                        Rectangle r = model.getParentModel().getUI().getBounds();
-                                TreeViewerAgent.getRegistry().getEventBus().post(
-                                                new ViewImage((ImageData) o, r));
+                        model.viewImage(d);
                 }
             }

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewer.java

@@ -755 +755 @@
          * 
          * @param node The node holding the time information.
-         * @param set Tne 
+         * @param set  The elements to add.
          */
         public void browseTimeInterval(TreeImageTimeSet node, Set set);

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerControl.java

@@ -284 +284 @@
                 actionsMap.put(TAGS_EXPLORER, 
                                 new BrowserSelectionAction(model, Browser.TAGS_EXPLORER));
-                actionsMap.put(CATEGORY_EXPLORER, 
-                                new BrowserSelectionAction(model, Browser.CATEGORY_EXPLORER));
                 actionsMap.put(IMAGES_EXPLORER, 
                                 new BrowserSelectionAction(model, Browser.IMAGES_EXPLORER));