Changeset 5660

Timestamp:

10/09/08 10:36:27 (6 weeks ago)

Author:

will

Message:

Background colour of a Field is inherited from it's nearest coloured ancestor.
Fixed bug in NavTree?.

Location:

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

Files:

• browser/FieldPanel.java (modified) (2 diffs)
• browser/NavTree.java (modified) (2 diffs)
• model/TreeModelMethods.java (modified) (1 diff)

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

@@ -63 +63 @@
 import org.openmicroscopy.shoola.agents.editor.model.IField;
 import org.openmicroscopy.shoola.agents.editor.model.Lock;
+import org.openmicroscopy.shoola.agents.editor.model.TreeModelMethods;
 import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomButton;
@@ -506 +507 @@
                 paintedColour = getColorFromString(field.getAttribute(
                                 Field.BACKGROUND_COLOUR));
+        
+                if (paintedColour == null) {
+                        String ancestorColour = TreeModelMethods.getAttributeFromAncestor
+                                        (Field.BACKGROUND_COLOUR, treeNode);
+                        paintedColour = getColorFromString(ancestorColour);
+                }
                 
                 refreshHighlighted();

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

@@ -70 +70 @@
         /**
          * Creates an instance of the Navigation tree, based on the model 
-         * from mainTree. Also calls initialise() to add treeSelectionListeners and
+         * from mainTree. Also calls #initialise() to add treeSelectionListeners and
          * mouseListeners. 
          * 
@@ -115 +115 @@
                         {
                                 TreePath path = navTree.getSelectionPath();
+                                // path could be null if user double-clicks on expand-collapse
+                                if (path == null)       return;
                                 
                                 mainTree.expandPath(path.getParentPath());

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

@@ -290 +290 @@
         }
         
+        /**
+         * This method progressively checks the ancestors of the given node,
+         * looking for the closest ancestor that has a non-null value for
+         * the named attribute. 
+         * The value of this attribute is returned for the closest ancestor.
+         * If the root node is reached (parent == null) then null is returned. 
+         * 
+         * @param attributeName         The name of the attribute to query
+         * @param node                          The node to start at.
+         * 
+         * @return      String                  The value of the attribute from closest 
+         *                                              ancestor where this is not null.
+         */
+        public static String getAttributeFromAncestor(String attributeName,
+                        TreeNode node)
+        {
+                DefaultMutableTreeNode parent;
+                Object userObject;
+                IAttributes field;
+                String value;
+                
+                parent = (DefaultMutableTreeNode)node.getParent();
+                while(parent != null) {
+                        userObject = parent.getUserObject();
+                        if (userObject instanceof IAttributes) {
+                                field = (IAttributes)userObject;
+                                value = field.getAttribute(attributeName);
+                                if (value != null) {
+                                        return value;
+                                }
+                        }
+                        parent = (DefaultMutableTreeNode)parent.getParent();
+                }
+                
+                return null;
+        }
 }