Changeset 5680

Timestamp:

10/10/08 15:37:11 (6 weeks ago)

Author:

jburel

Message:

Cleaning

Location:

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

Files:

• DataObjectUpdater.java (modified) (1 diff)
• DataTreeViewerLoader.java (modified) (2 diffs)
• ExistingObjectsLoader.java (modified) (3 diffs)
• ExistingObjectsSaver.java (modified) (3 diffs)
• RndSettingsSaver.java (modified) (2 diffs)
• ScreenPlateLoader.java (modified) (1 diff)
• TreeViewerTranslator.java (modified) (11 diffs)
• actions/ActivationAction.java (modified) (2 diffs)
• actions/AddAction.java (modified) (4 diffs)
• actions/AddMetadataAction.java (modified) (3 diffs)
• actions/BrowserSelectionAction.java (modified) (3 diffs)
• actions/CopyAction.java (modified) (2 diffs)
• actions/CreateAction.java (modified) (4 diffs)
• actions/CutAction.java (modified) (2 diffs)
• actions/DeleteAction.java (modified) (1 diff)
• actions/ManagerAction.java (modified) (2 diffs)
• actions/PasteRndSettingsAction.java (modified) (2 diffs)
• actions/ResetRndSettingsAction.java (modified) (2 diffs)
• actions/SetRndSettingsAction.java (modified) (2 diffs)
• browser/BrowserComponent.java (modified) (2 diffs)
• browser/BrowserFactory.java (modified) (2 diffs)
• browser/ContainerFinder.java (modified) (2 diffs)
• browser/ContainersManager.java (modified) (3 diffs)
• browser/TreeImageDisplay.java (modified) (3 diffs)
• browser/TreeImageTimeSet.java (modified) (1 diff)
• cmd/AnnotateChildrenCmd.java (modified) (2 diffs)
• finder/RegExVisitor.java (modified) (3 diffs)
• util/TreeCellRenderer.java (modified) (4 diffs)
• view/DeleteDialog.java (modified) (4 diffs)
• view/EditorDialog.java (modified) (1 diff)
• view/TreeViewer.java (modified) (1 diff)
• view/TreeViewerComponent.java (modified) (4 diffs)
• view/TreeViewerControl.java (modified) (1 diff)
• view/TreeViewerModel.java (modified) (6 diffs)

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

@@ -37 +37 @@
 
 /** 
- * 
+ * Updates the data objects. 
+ * This class calls one of the <code>addExistingObjects</code>
+ * and <code>cutAndPaste</code> methods in the
+ * <code>DataManagerView</code>.
  *
  * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;

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

@@ -26 +26 @@
 
 
-
-
 //Java imports
 
@@ -40 +38 @@
 import org.openmicroscopy.shoola.env.data.views.DataManagerView;
 import org.openmicroscopy.shoola.env.log.LogMessage;
-
 import pojos.ExperimenterData;
 

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

@@ -34 +34 @@
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
 import org.openmicroscopy.shoola.env.data.views.CallHandle;
-import pojos.CategoryData;
-import pojos.CategoryGroupData;
 import pojos.DataObject;
 import pojos.DatasetData;
@@ -41 +39 @@
 
 /** 
- * 
+ * Loads existing objects of a given type.
+ * This class calls one of the <code>loadExistingObjects</code> method in the
+ * <code>DataManagerView</code>.
  *
  * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;
@@ -70 +70 @@
     private void checkObject(DataObject o)
     {
-        if ((o instanceof DatasetData) || (o instanceof ProjectData) ||
-            (o instanceof CategoryData) || (o instanceof CategoryGroupData))
+        if ((o instanceof DatasetData) || (o instanceof ProjectData))
             return;
         throw new IllegalArgumentException("Data type not supported.");

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

@@ -35 +35 @@
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
 import org.openmicroscopy.shoola.env.data.views.CallHandle;
-
-import pojos.CategoryGroupData;
 import pojos.DataObject;
 import pojos.DatasetData;
@@ -42 +40 @@
 
 /** 
- * 
+ * Loads existing objects of a given type.
+ * This class calls one of the <code>addExistingObjects</code> method in the
+ * <code>DataManagerView</code>.
  *
  * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;
@@ -74 +74 @@
     private void checkParent(DataObject o)
     {
-        if ((o instanceof ProjectData) || (o instanceof DatasetData) ||
-                (o instanceof CategoryGroupData))
+        if ((o instanceof ProjectData) || (o instanceof DatasetData))
             return;
         throw new IllegalArgumentException("Data object not supported.");   

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

@@ -35 +35 @@
 import org.openmicroscopy.shoola.env.data.model.TimeRefObject;
 import org.openmicroscopy.shoola.env.data.views.CallHandle;
-import pojos.CategoryData;
 import pojos.DatasetData;
 import pojos.ImageData;
 
 /** 
-* Pastes the rendering settings associated to the passed set of pixels
-* across a collection of images.
-* This class calls the <code>pasteRndSettings</code> method in the
-* <code>DataManagerView</code>.
-*
-* @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;
-* <a href="mailto:j.burel@dundee.ac.uk">j.burel@dundee.ac.uk</a>
-* @author Donald MacDonald &nbsp;&nbsp;&nbsp;&nbsp;
-* <a href="mailto:donald@lifesci.dundee.ac.uk">donald@lifesci.dundee.ac.uk</a>
-* @version 3.0
-* <small>
-* (<b>Internal version:</b> $Revision: $Date: $)
-* </small>
-* @since OME3.0
-*/
+ * Pastes the rendering settings associated to the passed set of pixels
+ * across a collection of images.
+ * This class calls the <code>pasteRndSettings</code> method in the
+ * <code>DataManagerView</code>.
+ *
+ * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;
+ * <a href="mailto:j.burel@dundee.ac.uk">j.burel@dundee.ac.uk</a>
+ * @author Donald MacDonald &nbsp;&nbsp;&nbsp;&nbsp;
+ * <a href="mailto:donald@lifesci.dundee.ac.uk">donald@lifesci.dundee.ac.uk</a>
+ * @version 3.0
+ * <small>
+ * (<b>Internal version:</b> $Revision: $Date: $)
+ * </small>
+ * @since OME3.0
+ */
 public class RndSettingsSaver 
         extends DataTreeViewerLoader
@@ -97 +96 @@
         private void checkRootType(Class type)
         {
-                if (ImageData.class.equals(type) || DatasetData.class.equals(type) ||
-                                CategoryData.class.equals(type))
+                if (ImageData.class.equals(type) || DatasetData.class.equals(type))
                         return;
                 throw new IllegalArgumentException("Type not supported.");

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

@@ -38 +38 @@
 
 /** 
- * 
+ * Loads the screen/plate.
+ * This class calls the <code>loadScreenPlates</code> method in the
+ * <code>DataManagerView</code>. 
  *
  * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;

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

@@ -46 +46 @@
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
 import org.openmicroscopy.shoola.util.ui.clsf.TreeCheckNode;
-import pojos.CategoryData;
-import pojos.CategoryGroupData;
 import pojos.DataObject;
 import pojos.DatasetData;
@@ -111 +109 @@
     
     /**
-     * Transforms a {@link CategoryData} into a visualisation object i.e.
-     * a {@link TreeCheckNode}.
-     * 
-     * @param data  The {@link CategoryData} to transform.
-     *              Mustn't be <code>null</code>.
-     * @return See above.
-     */
-    private static TreeCheckNode transformCategoryCheckNode(CategoryData data)
-    {
-        if (data == null)
-            throw new IllegalArgumentException("Cannot be null");
-        IconManager im = IconManager.getInstance();      
-        TreeCheckNode category =  new TreeCheckNode(data, 
-                                    im.getIcon(IconManager.CATEGORY),
-                                    data.getName(), true);
-        return category;
-    }
-    
-    /**
      * Transforms a {@link DatasetData} into a visualisation object i.e.
      * a {@link TreeCheckNode}.
@@ -166 +145 @@
         return node;
     }
-    
-    /**
-     * Transforms a {@link CategoryGroupData} into a visualisation object i.e.
-     * a {@link TreeCheckNode}. The {@link CategoryData categories} are also
-     * transformed and linked to the newly created {@link TreeCheckNode}.
-     * 
-     * @param data      The {@link CategoryGroupData} to transform.
-     *                  Mustn't be <code>null</code>.
-     * @param userID    The id of the current user.
-     * @param groupID   The id of the group the current user selects when 
-     *                      retrieving the data.             
-     * @return See above.
-     */
-    private static TreeCheckNode transformCategoryGroupCheckNode(
-                                CategoryGroupData data, long userID, 
-                                long groupID)
-    {
-        if (data == null)
-            throw new IllegalArgumentException("Cannot be null");
-        IconManager im = IconManager.getInstance();
-        TreeCheckNode group = new TreeCheckNode(data, 
-                                im.getIcon(IconManager.CATEGORY_GROUP), 
-                                data.getName(), false);
-        Set categories = data.getCategories();
-        Iterator i = categories.iterator();
-        CategoryData child;
-        while (i.hasNext()) {
-            child = (CategoryData) i.next();
-            if (EditorUtil.isWritable(child, userID, groupID))
-                group.addChildDisplay(transformCategoryCheckNode(child));
-        }
-            
-        return group;
-    }  
     
     /**
@@ -451 +396 @@
     
     /**
-     * Transforms a {@link CategoryData} into a visualisation object i.e.
-     * a {@link TreeImageSet}.
-     * 
-     * @param data      The {@link CategoryData} to transform.
-     *                  Mustn't be <code>null</code>.
-     * @param userID    The id of the current user.
-     * @param groupID   The id of the group the current user selects when 
-     *                      retrieving the data.                
-     * @return See above.
-     */
-    private static TreeImageDisplay transformCategory(CategoryData data, 
-                                                long userID, long groupID)
-    {
-        if (data == null)
-            throw new IllegalArgumentException("Cannot be null");
-        TreeImageSet category =  new TreeImageSet(data);
-        Set images = data.getImages();
-        if (images == null) category.setNumberItems(-1);
-        else {
-            category.setChildrenLoaded(Boolean.TRUE);
-            category.setNumberItems(images.size());
-            Iterator i = images.iterator();
-            ImageData child;
-            while (i.hasNext()) {
-                child = (ImageData) i.next();
-                if (EditorUtil.isReadable(child, userID, groupID))
-                    category.addChildDisplay(transformImage(child));
-            }
-        }
-        return category;
-    } 
-    
-    /**
-     * Transforms a {@link CategoryGroupData} into a visualisation object i.e.
-     * a {@link TreeImageSet}. The {@link CategoryData categories} are also
-     * transformed and linked to the newly created {@link TreeImageSet}.
-     * 
-     * @param data          The {@link CategoryGroupData} to transform.
-     *                      Mustn't be <code>null</code>.
-     * @param categories    The categories to add.
-     * @param userID        The id of the current user.
-     * @param groupID       The id of the group the current user selects when 
-     *                      retrieving the data.                    
-     * @return See above.
-     */
-    private static TreeImageDisplay transformCategoryGroup(
-            CategoryGroupData data, Set categories, long userID, long groupID)
-    {
-        if (data == null)
-            throw new IllegalArgumentException("Cannot be null");
-        TreeImageSet group = new TreeImageSet(data);
-        if (categories != null) {
-            group.setChildrenLoaded(Boolean.TRUE);
-            Iterator i = categories.iterator();
-            CategoryData child;
-            while (i.hasNext())  {
-                child = (CategoryData) i.next();
-                if (EditorUtil.isReadable(child, userID, groupID))
-                    group.addChildDisplay(transformCategory(child, userID, 
-                                                            groupID));
-            }   
-            group.setNumberItems(categories.size());
-        } else {
-            //categories not loaded.
-            group.setChildrenLoaded(Boolean.TRUE);
-            group.setNumberItems(0);
-        }
-        return group;
-    }
-    
-    /**
      * Transforms a {@link ImageData} into a visualisation object i.e.
      * a {@link TreeImageNode}.
@@ -567 +441 @@
                             ((ProjectData) ho).getDatasets(), userID, 
                                                 groupID));
-                else if (ho instanceof CategoryGroupData)
-                    results.add(transformCategoryGroup((CategoryGroupData) ho, 
-                            ((CategoryGroupData) ho).getCategories(),
-                            userID, groupID));
                 else if (ho instanceof ImageData) 
                     results.add(transformImage((ImageData) ho));        
@@ -585 +455 @@
                         child = transformDataset((DatasetData) ho, userID, groupID);
                         results.add(child);
-                } else if (ho instanceof CategoryData) {
-                        if (orphan == null) {
-                                orphan = new TreeImageSet(ORPHANED_CATEGORIES);
-                                orphan.setChildrenLoaded(Boolean.TRUE);
-                                results.add(orphan);
-                        }
-                        child = transformCategory((CategoryData) ho, userID, 
-                                                                                groupID);
-                        orphan.addChildDisplay(child);
                 } else if (ho instanceof TagAnnotationData) {
                         child = transformTag((TagAnnotationData) ho, userID, 
@@ -651 +512 @@
                                         expanded.contains(new Long(ho.getId())));
                     results.add(display);
-                } else if (ho instanceof CategoryGroupData) {
-                        if (expandedTopNodes != null)
-                                expanded = (List) 
-                                                expandedTopNodes.get(CategoryGroupData.class);
-                    display = transformCategoryGroup((CategoryGroupData) ho, 
-                                                    (Set) nodes.get(ho), 
-                                                    userID, groupID);
-                    if (expanded != null)
-                            display.setExpanded(
-                                        expanded.contains(new Long(ho.getId())));
-                    results.add(display); 
                 } else if (ho instanceof DatasetData) {
                         /*
@@ -701 +551 @@
                                 results.add(display); 
                         }
-                } else if (ho instanceof CategoryData) {
-                        if (orphan == null) {
-                                orphan = new TreeImageSet(ORPHANED_CATEGORIES);
-                                orphan.setChildrenLoaded(true);
-                                results.add(orphan); 
-                        }
-                        if (expandedTopNodes != null)
-                                expanded = 
-                                                (List) expandedTopNodes.get(CategoryData.class);
-                        Set r = (Set) nodes.get(ho); //should only have one element
-                        if (r != null) {  //shouldn't happen
-                                Iterator k = r.iterator();
-                        while (k.hasNext()) {
-                                CategoryData element = (CategoryData) k.next();
-                                                display = transformCategory(element, userID, 
-                                                                                                        groupID);
-                                                if (expanded != null)
-                                    display.setExpanded(
-                                        expanded.contains(new Long(ho.getId())));
-                                                orphan.addChildDisplay(display);
-                                        }
-                        }
                 } else if (ho instanceof ScreenData) {
                         if (expandedTopNodes != null)
@@ -770 +598 @@
         else if (object instanceof DatasetData)
             return transformDataset((DatasetData) object, userID, groupID);
-        else if (object instanceof CategoryData)
-            return transformCategory((CategoryData) object, userID, groupID);
-        else if (object instanceof CategoryGroupData)
-            return transformCategoryGroup((CategoryGroupData) object, 
-                    ((CategoryGroupData) object).getCategories(),
-                                        userID, groupID);
         else if (object instanceof ImageData)
             return transformImage((ImageData) object);
@@ -811 +633 @@
             ho = (DataObject) i.next();
             if (EditorUtil.isWritable(ho, userID, groupID)) {
-                if (ho instanceof CategoryGroupData) {
-                    Set categories = ((CategoryGroupData) ho).getCategories();
-                    if (categories != null && categories.size() != 0)
-                        results.add(transformCategoryGroupCheckNode(
-                                (CategoryGroupData) ho, userID, groupID));
-                } else if (ho instanceof CategoryData)
-                    results.add(transformCategoryCheckNode((CategoryData) ho));
-                else if (ho instanceof DatasetData) 
+                if (ho instanceof DatasetData) 
                     results.add(transformDatasetCheckNode((DatasetData) ho));
             }  
@@ -849 +664 @@
                 if (ho instanceof DatasetData)
                     results.add(transformDatasetCheckNode((DatasetData) ho));
-                else if (ho instanceof CategoryData)
-                    results.add(transformCategoryCheckNode((CategoryData) ho));
                 else if (ho instanceof ImageData)
                     results.add(transformImageCheckNode((ImageData) ho));

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/actions/ActivationAction.java

@@ -26 +26 @@
 
 //Java imports
+import java.awt.event.ActionEvent;
+import javax.swing.Action;
 
 //Third-party libraries
 
 //Application-internal dependencies
-import java.awt.event.ActionEvent;
-
-import javax.swing.Action;
-
 import org.openmicroscopy.shoola.agents.treeviewer.IconManager;
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
@@ -55 +53 @@
     extends TreeViewerAction
 {
-
-    /** The name of the action. */
-    //private static final String NAME = "DataManager";
-    
+        
     /** The description of the action. */
     private static final String DESCRIPTION = "Bring up the DataManager for" +

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/actions/AddAction.java

@@ -35 +35 @@
 import org.openmicroscopy.shoola.agents.treeviewer.browser.Browser;
 import org.openmicroscopy.shoola.agents.treeviewer.browser.TreeImageDisplay;
-import org.openmicroscopy.shoola.agents.treeviewer.cmd.ClassifyCmd;
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
-import pojos.CategoryData;
-import pojos.CategoryGroupData;
 import pojos.DataObject;
 import pojos.DatasetData;
@@ -68 +65 @@
     private static final String NAME_DATASET = "Add existing Dataset...";
     
-    /** The name of the action to add existing <code>Categories</code>. */
-    private static final String NAME_CATEGORY = "Add existing Tag...";
-    
     /** The name of the action to add existing <code>Images</code>. */
     private static final String NAME_IMAGE = "Add existing Image...";
@@ -97 +91 @@
             setEnabled(model.isObjectWritable(ho));
             putValue(Action.NAME, NAME_DATASET); 
-        } else if (ho instanceof CategoryGroupData) {
-            setEnabled(model.isObjectWritable(ho));
-            putValue(Action.NAME, NAME_CATEGORY);
-        } else if (ho instanceof CategoryData) {
-            setEnabled(model.isObjectWritable(ho));
-            putValue(Action.NAME, NAME_IMAGE);
         } else if (ho instanceof DatasetData) {
             setEnabled(model.isObjectWritable(ho));
@@ -140 +128 @@
         if (d == null) return;
         Object ho = d.getUserObject();
-        if ((ho instanceof ProjectData) || (ho instanceof CategoryGroupData) ||
-            (ho instanceof DatasetData))
+        if ((ho instanceof ProjectData) || (ho instanceof DatasetData))
             model.addExistingObjects((DataObject) ho);
-        else if (ho instanceof CategoryData) {
-            ClassifyCmd cmd = new ClassifyCmd(model, ClassifyCmd.CLASSIFY);
-            cmd.execute();
-        }
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/actions/AddMetadataAction.java

@@ -39 +39 @@
 import org.openmicroscopy.shoola.agents.treeviewer.view.TreeViewer;
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
-import pojos.CategoryData;
 import pojos.DatasetData;
 import pojos.ImageData;
@@ -98 +97 @@
                                 return;
                         }
-                        setEnabled(((ho instanceof DatasetData) || 
-                                        (ho instanceof CategoryData)));
+                        setEnabled(ho instanceof DatasetData);
                         return;
                 }
@@ -124 +122 @@
          * @see java.awt.event.ActionListener#actionPerformed(ActionEvent)
          */
-        public void actionPerformed(ActionEvent e)
-        {
-                //AnnotateChildrenCmd cmd = new AnnotateChildrenCmd(model);
-                //cmd.execute();
-                model.addMetadata();
-