Changeset 5625

Timestamp:

09/23/08 16:35:30 (2 months ago)

Author:

will

Message:

Actions etc for Indenting nodes left and right.

Location:

trunk/SRC/org/openmicroscopy/shoola/agents/editor

Files:

• IconManager.java (modified) (3 diffs)
• actions/OpenLocalFileAction.java (modified) (1 diff)
• browser/BrowserControl.java (modified) (3 diffs)
• browser/ToolBar.java (modified) (1 diff)
• browser/actions/IndentLeftAction.java (added)
• browser/actions/IndentRightAction.java (added)
• graphx/nuvola_indent_left16.png (added)
• graphx/nuvola_indent_right16.png (added)
• model/TreeModelFactory.java (modified) (1 diff)
• model/TreeModelMethods.java (modified) (2 diffs)
• model/undoableEdits/DeleteFieldsEdit.java (modified) (1 diff)
• model/undoableEdits/IndentLeftEdit.java (added)
• model/undoableEdits/IndentRightEdit.java (added)

trunk/SRC/org/openmicroscopy/shoola/agents/editor/IconManager.java

@@ -224 +224 @@
     /** The <code>Open Folder</code> icon. */
     public  static int                  OPEN_FOLDER = 52;
+
+    /** The <code>Open Folder</code> icon. */
+    public  static int                  INDENT_RIGHT = 53;
+    
+    /** The <code>Open Folder</code> icon. */
+    public  static int                  INDENT_LEFT = 54;
+    
     
     /** 
@@ -229 +236 @@
      * Allows to correctly build arrays for direct indexing. 
      */
-    private static int          MAX_ID = 52;
+    private static int          MAX_ID = 54;
     
     /** Paths of the icon files. */
@@ -294 +301 @@
         relPaths[CONFIGURE_ICON] = "nuvola_package_utilities16.png";
         relPaths[OPEN_FOLDER] = "nuvola_folder_open16.png";
+        relPaths[INDENT_RIGHT] = "nuvola_indent_right16.png";
+        relPaths[INDENT_LEFT] = "nuvola_indent_left16.png";
     }
     

trunk/SRC/org/openmicroscopy/shoola/agents/editor/actions/OpenLocalFileAction.java

@@ -94 +94 @@
    {
            FileChooser chooser = new FileChooser(null, FileChooser.LOAD, 
-                                "Browse File", "Attach a file to the selected element", 
+                                "Open File", "Choose a file to open in the Editor", 
                                 filters);
                 chooser.addPropertyChangeListener(

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

@@ -46 +46 @@
 import org.openmicroscopy.shoola.agents.editor.browser.actions.DeleteFieldsAction;
 import org.openmicroscopy.shoola.agents.editor.browser.actions.EditAction;
+import org.openmicroscopy.shoola.agents.editor.browser.actions.IndentLeftAction;
+import org.openmicroscopy.shoola.agents.editor.browser.actions.IndentRightAction;
 import org.openmicroscopy.shoola.agents.editor.browser.actions.RedoEditAction;
 import org.openmicroscopy.shoola.agents.editor.browser.actions.UndoEditAction;
@@ -90 +92 @@
         static final Integer    DELETE_FIELD_ACTION = new Integer(4);
         
+        /** Identifies the <code>Indent Right</code> action. */
+        static final Integer    INDENT_RIGHT_ACTION = new Integer(5);
+        
+        /** Identifies the <code>Indent Left</code> action. */
+        static final Integer    INDENT_LEFT_ACTION = new Integer(6);
+        
         /** 
      * Reference to the {@link Browser} component, which, in this context,
@@ -124 +132 @@
        actionsMap.put(ADD_FIELD_ACTION, new AddFieldAction(undoSupport, model));
        actionsMap.put(DELETE_FIELD_ACTION, new DeleteFieldsAction
+                   (undoSupport, model));
+       actionsMap.put(INDENT_RIGHT_ACTION, new IndentRightAction
+                   (undoSupport, model));
+       actionsMap.put(INDENT_LEFT_ACTION, new IndentLeftAction
                    (undoSupport, model));
     }

trunk/SRC/org/openmicroscopy/shoola/agents/editor/browser/ToolBar.java

@@ -79 +79 @@
                 add(createButton(BrowserControl.ADD_FIELD_ACTION));
                 add(createButton(BrowserControl.DELETE_FIELD_ACTION));
+                add(createButton(BrowserControl.INDENT_LEFT_ACTION));
+                add(createButton(BrowserControl.INDENT_RIGHT_ACTION));
         }
         

trunk/SRC/org/openmicroscopy/shoola/agents/editor/model/TreeModelFactory.java

@@ -354 +354 @@
         }
 
+        public static void saveTreeToFile(File file, TreeModel treeModel) {
+                
+        }
 
         /**

trunk/SRC/org/openmicroscopy/shoola/agents/editor/model/TreeModelMethods.java

@@ -126 +126 @@
         }
         
+        /**
+         * Sets the selected nodes in the tree.
+         * Delegates to {@link #selectNodes(List, JTree)}
+         * 
+         * @param nodes         The List of nodes to select     
+         * @param tree          The JTree in which these nodes exist
+         */
+        public static void selectDNodes(List<DefaultMutableTreeNode> nodes, JTree tree) 
+        {
+                ArrayList<MutableTreeNode> mtNodes = new ArrayList<MutableTreeNode>();
+                for (MutableTreeNode node : nodes) {
+                        mtNodes.add(node);
+                }
+                selectNodes(mtNodes, tree);
+        }
         
         /**
@@ -174 +189 @@
         }
         
+        /**
+         * This method 'indents' the nodes to the right, by
+         * making them all children of the first node's previous sibling. 
+         * It is intended that all the nodes
+         * in the list are contiguous siblings. 
+         * If the first node has no previous sibling, nothing happens. 
+         * 
+         * @param nodes         The list of nodes to move.
+         * @param treeModel             The treeModel being edited. Will notify JTree of update
+         * 
+         */
+        public static void indentNodesRight(List<DefaultMutableTreeNode> nodes,
+                        DefaultTreeModel treeModel)
+        {
+                if (nodes == null)              return;
+                if (nodes.isEmpty())    return;
+                
+                DefaultMutableTreeNode firstNode = nodes.get(0);
+                
+                // fields need to become children of their preceding sibling 
+                DefaultMutableTreeNode previousSibling = firstNode.getPreviousSibling();
+                
+                // if no previous sibling, can't indent
+                if (previousSibling == null) return;
+                
+                // move each node to be a child of the previous sibling
+                for (DefaultMutableTreeNode node: nodes) {
+                        previousSibling.add(node);
+                }
+                treeModel.nodeStructureChanged(previousSibling.getParent());
+        }
+        
+        /**
+         * Indents nodes to the left in the tree structure (move to a higher level).
+         * Nodes become siblings of their parent.
+         * Siblings of the nodes stay at the same level in the tree:
+         *  - Previous siblings are not moved
+         *  - Subsequent siblings become children of the last node before it is 
+         *      promoted (indented left)
+         * 
+         * @param nodes         The list of nodes to indent left (move to a higher 
+         *                                      level in the tree hierarchy). 
+         * @param treeModel             The treeModel being edited. Will notify JTree of update
+         */
+        public static void indentNodesLeft(List<DefaultMutableTreeNode> nodes,
+                        DefaultTreeModel treeModel) 
+        {
+                if (nodes == null)              return;
+                if (nodes.isEmpty())    return;
+                
+                DefaultMutableTreeNode firstNode = nodes.get(0);
+                DefaultMutableTreeNode parentNode = (DefaultMutableTreeNode)
+                                                                                                        firstNode.getParent();
+                if (parentNode == null) return;
+                DefaultMutableTreeNode grandParentNode = (DefaultMutableTreeNode)
+                                                                                                        parentNode.getParent();
+
+                // if parent is root (grandparent null) then can't promote
+                if (grandParentNode == null)    return;
+                
+                // any fields that are subsequent siblings of the last to be promoted, 
+                // must first become children of that node. 
+                DefaultMutableTreeNode lastNode = nodes.get(nodes.size()-1);
+                DefaultMutableTreeNode lastNodeSibling = lastNode.getNextSibling();
+                while (lastNodeSibling != null) {
+                        lastNode.add(lastNodeSibling);
+                        lastNodeSibling = lastNode.getNextSibling();
+                }
+                
+                // now you can indent nodes left
+                for (DefaultMutableTreeNode node: nodes) {
+                        indentNodeLeft(node);
+                }
+                treeModel.nodeStructureChanged(grandParentNode);
+        }
+        
+        /**
+         * Indents a single node to the left (one level higher in the tree 
+         * hierarchy). 
+         * The node will become the next sibling of it's parent.
+         * If the node has no grandparent, nothing happens.
+         * 
+         * @param node          The node to indent (promote to sibling of it's parent)
+         * @param treeModel             The treeModel being edited. Will notify JTree of update
+         */
+        public static void indentNodeLeft(DefaultMutableTreeNode node)
+        {
+                if (node == null)       return;
+                DefaultMutableTreeNode parentNode = (DefaultMutableTreeNode)
+                                                                                                node.getParent();
+                if (parentNode == null)         return;
+                DefaultMutableTreeNode grandParentNode = (DefaultMutableTreeNode)
+                                                                                                        parentNode.getParent();
+                if (grandParentNode == null)            return;
+                
+                int indexOfParent = grandParentNode.getIndex(parentNode);
+                
+                // adds after parent
+                grandParentNode.insert(node, indexOfParent + 1);
+        }
+        
 }

trunk/SRC/org/openmicroscopy/shoola/agents/editor/model/undoableEdits/DeleteFieldsEdit.java

@@ -131 +131 @@
                          * Keep a list of references to the Nodes to be deleted
                          */
+                        DefaultMutableTreeNode currentNode;
+                        MutableTreeNode parent;
                         for (int i=0; i<selectedPaths.length; i++) {
-                                DefaultMutableTreeNode currentNode = (DefaultMutableTreeNode)
+                                currentNode = (DefaultMutableTreeNode)
                                                 selectedPaths[i].getLastPathComponent();
-                                MutableTreeNode parent = (MutableTreeNode)(currentNode.getParent());
+                                parent = (MutableTreeNode)(currentNode.getParent());
                     if (parent != null) {
                         treeModel.removeNodeFromParent(currentNode);