Changeset 5546 for branches/OmeroEditor/src/fields/FieldPanel.java

Timestamp:

07/23/08 15:32:07 (4 months ago)

Author:

will

Message:

Actions and UndoableEdit? framework setup.
Can open Beta 3.0 XML files (not all fields rendered yet)

Files:

• branches/OmeroEditor/src/fields/FieldPanel.java (modified) (9 diffs)

branches/OmeroEditor/src/fields/FieldPanel.java

@@ -204 +204 @@
         Border imageBorderHighlight;
         
-        /**
-         * A flag used to toggle the display of the description. 
-         */
-        boolean showDescription = false;
-        
         
         /**
@@ -259 +254 @@
                 descriptionButton.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent event) {
-                                showDescription = !showDescription;
-                                descriptionLabel.setVisible(showDescription);
+                                // TODO
+                                // Need to set an attribute in the dataField such as 
+                                // descriptionVisible = true / false
                         }
                 });
@@ -326 +322 @@
                 horizontalBox.add(defaultButton);
                 horizontalBox.add(requiredFieldButton);
+                horizontalBox.add(descriptionLabel);
                 horizontalBox.add(Box.createHorizontalStrut(10));
                 
@@ -337 +334 @@
                 contentsPanel.add(nameLabel, BorderLayout.WEST);
                 contentsPanel.add(horizontalBox, BorderLayout.CENTER);
-                contentsPanel.add(descriptionLabel, BorderLayout.SOUTH);
+                //contentsPanel.add(descriptionLabel, BorderLayout.SOUTH);
                 
                 contentsPanel.setBorder(imageBorder);
@@ -349 +346 @@
                  */
                 setNameText(addHtmlTagsForNameLabel(
-                                dataField.getAttribute(DataFieldConstants.ELEMENT_NAME)));
+                                dataField.getAttribute(Field.FIELD_NAME)));
                 setDescriptionText(
-                                dataField.getAttribute(DataFieldConstants.DESCRIPTION));
-                setURL(dataField.getAttribute(DataFieldConstants.URL));
+                                dataField.getAttribute(Field.FIELD_DESCRIPTION));
+                setURL(dataField.getAttribute(Field.FIELD_URL));
                 
                 refreshBackgroundColour();
@@ -358 +355 @@
                 refreshDefaultValue();
                 
-                /*
-                 * Add additional UI components for editing the value of this field.
-                 * Use a Factory to create the UI components, depending on the value type
-                 */
-                IFieldValue valueObject = ((Field)field).getValueObject();
-                JComponent edit = EditingComponentFactory.getEditingComponent(valueObject);
-                addFieldComponent(edit);
+                buildParamComponents();
+        }
+        
+        /**
+         * Add additional UI components for editing the value of this field.
+         * Use a Factory to create the UI components, depending on the value type
+         */
+        public void buildParamComponents() {
+
+                int paramCount = dataField.getParamCount();
+                
+                for (int i=0; i<paramCount; i++) {
+                        IParam param = dataField.getParamAt(i);
+                        JComponent edit = EditingComponentFactory.getEditingComponent(param);
+                        if (edit != null)
+                                addFieldComponent(edit);
+                }
+                
         }
         
@@ -440 +448 @@
         }
         
+
+        
         public void setDescriptionText(String description) {
                 if ((description != null) && (description.trim().length() > 0)) {
@@ -445 +455 @@
                         descriptionButton.setToolTipText(htmlDescription);
                         descriptionButton.setVisible(true);
-                        descriptionLabel.setVisible(showDescription);
+                        // TODO setVisibility of label based on dataField attribute 
+                        //descriptionLabel.setVisible(showDescription);
                         descriptionLabel.setFont(XMLView.FONT_TINY);
                         descriptionLabel.setText(htmlDescription);
@@ -552 +563 @@
 
 
+        /**
+         * If the size of a sub-component of this panel changes, 
+         * the JTree in which it is contained must be required to 
+         * re-draw the panel. 
+         */
         public void propertyChange(PropertyChangeEvent evt) {
                 
                 if (SIZE_CHANGED_PROPERTY.equals(evt.getPropertyName())) {
                 
-                        if ((tree != null) && (treeNode !=null)) {
-                                
-                                TreePath path = new TreePath(treeNode.getPath());
-                                
-                                tree.getUI().startEditingAtPath(tree, path);
-                        }
-                }
-        }
-
+                        refreshSizeOfPanel();
+                }
+        }
+
+        
+        /**
+         * This method is used to refresh the size of this panel in the JTree.
+         * It must also remain in the editing mode, otherwise the user who
+         * is currently editing it will be required to click again to 
+         * continue editing.
+         * This can be achieved by calling startEditingAtPath(tree, path)
+         */
+        public void refreshSizeOfPanel() {
+                if ((tree != null) && (treeNode !=null)) {
+                        
+                        TreePath path = new TreePath(treeNode.getPath());
+                        
+                        tree.getUI().startEditingAtPath(tree, path);
+                }
+        }