Changeset 5608

Timestamp:

09/12/08 12:16:56 (2 months ago)

Author:

will

Message:

Template Editing UI components for more Parameters

Location:

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

Files:

• browser/BrowserControl.java (modified) (2 diffs)
• browser/paramUIs/BooleanEditor.java (modified) (6 diffs)
• browser/paramUIs/editTemplate/AddParamActions.java (modified) (4 diffs)
• browser/paramUIs/editTemplate/BooleanTemplate.java (added)
• browser/paramUIs/editTemplate/EnumTemplate.java (modified) (3 diffs)
• browser/paramUIs/editTemplate/FieldEditorPanel.java (modified) (3 diffs)
• browser/paramUIs/editTemplate/NumberTemplate.java (added)
• browser/paramUIs/editTemplate/ParamTemplateUIFactory.java (modified) (2 diffs)
• model/undoableEdits/AddParamEdit.java (added)
• model/undoableEdits/AttributesEdit.java (modified) (1 diff)

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

@@ -50 +50 @@
 import org.openmicroscopy.shoola.agents.editor.browser.undo.ObservableUndoManager;
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
+import org.openmicroscopy.shoola.agents.editor.model.IField;
+import org.openmicroscopy.shoola.agents.editor.model.undoableEdits.AddParamEdit;
 import org.openmicroscopy.shoola.agents.editor.model.undoableEdits.AttributeEdit;
 import org.openmicroscopy.shoola.agents.editor.model.undoableEdits.AttributesEdit;
+
 
 
@@ -226 +229 @@
         
         /**
+         * Edits a field by creating and adding a new Parameter.
+         * 
+         * @param field         The field to add a new parameter to.
+         * @param paramType             A string defining the type of parameter to add.
+         * @param tree                  The JTree to refresh with undo/redo
+         * @param node          The node to highlight / refresh with undo/redo. 
+         */
+        public void addParamToField(IField field, String paramType, 
+                        JTree tree, TreeNode node) {
+                
+                UndoableEdit edit = new AddParamEdit(field, paramType, tree, node);
+                undoSupport.postEdit(edit);
+        }
+        
+        /**
           * An undo/redo adpater. The adpater is notified when
           * an undo edit occur(e.g. add or remove from the list)

trunk/SRC/org/openmicroscopy/shoola/agents/editor/browser/paramUIs/BooleanEditor.java

@@ -30 +30 @@
 import javax.swing.JCheckBox;
 
-import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
-import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
-
 //Third-party libraries
 
 //Application-internal dependencies
 
+import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
+import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
 
 /** 
@@ -59 +58 @@
          * A JCheckBox for editing the boolean value 
          */
-        private JCheckBox checkBox;
+        private JCheckBox               checkBox;
         
         /**
@@ -65 +64 @@
          * value of the boolean parameter we're editing.
          */
-        private String valueAttribute = SingleParam.PARAM_VALUE;
+        private String                  attributeName;
         
         /**
@@ -79 +78 @@
                 checkBox.setBorderPaintedFlat(true);
                 
-                boolean checked = getParameter().isAttributeTrue(valueAttribute);
+                boolean checked = getParameter().isAttributeTrue(attributeName);
                 
                 checkBox.setSelected(checked);
@@ -87 +86 @@
          * Creates an instance.
          * 
-         * @param param
+         * @param param                         The IAttributes collection we're editing
+         * @param attributeName         The name of the attribute we're editing
          */
-        public BooleanEditor(IParam param) {
+        public BooleanEditor(IAttributes param, String attributeName) {
                 
                 super(param);
                 
+                this.attributeName = attributeName;
+                
+                initialise();
+                
+                this.add(checkBox);
+        }
+        
+        /**
+         * Creates an instance, which will edit the 
+         * {@link SingleParam#PARAM_VALUE} attribute of the 
+         * {@link IAttributes} parameter. 
+         * 
+         * @param param         The IAttributes collection we're editing
+         */
+        public BooleanEditor(IAttributes param) {
+                
+                super(param);
+                
+                attributeName = SingleParam.PARAM_VALUE;
                 initialise();
                 
@@ -104 +123 @@
          */
         public void actionPerformed(ActionEvent e) {
-                attributeEdited(valueAttribute, checkBox.isSelected() + "");
+                attributeEdited(attributeName, checkBox.isSelected() + "");
         }
         

trunk/SRC/org/openmicroscopy/shoola/agents/editor/browser/paramUIs/editTemplate/AddParamActions.java

@@ -43 +43 @@
 import org.openmicroscopy.shoola.agents.editor.browser.BrowserControl;
 import org.openmicroscopy.shoola.agents.editor.model.IField;
+import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.PopupMenuButton;
 
@@ -188 +189 @@
                 {
                         // TODO         implement this method in controller.
-                        //controller.addParamToField(field, SingleParam.TEXT_LINE_PARAM, 
-                        //              tree, node);
+                        controller.addParamToField(field, SingleParam.TEXT_LINE_PARAM, 
+                                        tree, node);
                 }
                 
@@ -222 +223 @@
                 public void actionPerformed(ActionEvent e) 
                 {
-                        // TODO         implement this method in controller.
-                        //controller.addParamToField(field, SingleParam.NUMBER_PARAM, 
-                        //              tree, node);
+                        controller.addParamToField(field, SingleParam.NUMBER_PARAM, 
+                                        tree, node);
                 }
         
@@ -256 +256 @@
                 public void actionPerformed(ActionEvent e) 
                 {
-                        // TODO         implement this method in controller.
-                        //controller.addParamToField(field, SingleParam.BOOLEAN_PARAM, 
-                        //              tree, node);
+                        controller.addParamToField(field, SingleParam.BOOLEAN_PARAM, 
+                                        tree, node);
                 }
                 

trunk/SRC/org/openmicroscopy/shoola/agents/editor/browser/paramUIs/editTemplate/EnumTemplate.java

@@ -23 +23 @@
 package org.openmicroscopy.shoola.agents.editor.browser.paramUIs.editTemplate;
 
+import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -94 +95 @@
         private void buildUI()
         {
-                setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-                add(optionsFieldEditor);
-                add(new CustomLabel("Default Value: "));
-                add(defaultValueComboBox);
+                setLayout(new BorderLayout());
+                add(optionsFieldEditor, BorderLayout.NORTH);
+                add(new CustomLabel("Default Value: "), BorderLayout.WEST);
+                add(defaultValueComboBox, BorderLayout.CENTER);
                 
         }
@@ -123 +124 @@
                 if (ITreeEditComp.VALUE_CHANGED_PROPERTY.equals(evt.getPropertyName())){
                         if (evt.getSource().equals(defaultValueComboBox)) {
-                                String newDefault = evt.getNewValue().toString();
+                                String newDefault = null;
+                                if (evt.getNewValue() != null)
+                                        newDefault = evt.getNewValue().toString();
                                 // simply change the new value of default attribute
                                 attributeEdited(SingleParam.DEFAULT_VALUE, newDefault);
                         }
                         
+                        // if the drop-down options have changed, need to check that
+                        // the value and default value are in the new options. 
                         if (evt.getSource().equals(optionsFieldEditor)) {
-                                String newOptions = evt.getNewValue().toString();
+                                String newOptions = null;
+                                if(evt.getNewValue() != null) 
+                                        newOptions = evt.getNewValue().toString();
                                 
                                 String defaultValue = getParameter().getAttribute

trunk/SRC/org/openmicroscopy/shoola/agents/editor/browser/paramUIs/editTemplate/FieldEditorPanel.java

@@ -64 +64 @@
 import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomComboBox;
+import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomLabel;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.ImageBorderFactory;
 
@@ -198 +199 @@
                 //JLabel paramLabel = new CustomLabel("Parameters:");
                 JPanel paramHeader = new JPanel(new BorderLayout());
-                paramHeader.setBackground(null);
-                
-                // Add the JComboBox for changing parameter type
-                paramHeader.add(paramTypeChooser, BorderLayout.WEST);
-                
-                JButton addParamsButton = new AddParamActions(field, tree, 
-                                treeNode, controller).getButton();
-                addParamsButton.addPropertyChangeListener(
-                                AddParamActions.PARAM_ADDED_PROPERTY, this);
-                paramHeader.add(addParamsButton, BorderLayout.EAST);
-                
+                Border emptyB = new EmptyBorder(4, 4, 4,4);
+                Border lineB = BorderFactory.createMatteBorder(
+                1, 1, 1, 1, new Color(200,200,200));
+                Border compoundBorder = BorderFactory.createCompoundBorder
+                        (lineB, emptyB);
+                paramHeader.setBorder(compoundBorder);
+                paramHeader.setBackground(Color.white);
+                
+                // Add the JComboBox for changing type of FIRST parameter
+                paramHeader.add(paramTypeChooser, BorderLayout.CENTER);
+                paramHeader.add(new CustomLabel("Parameter type: "), BorderLayout.WEST);                
                 attributeFieldsPanel.add(paramHeader);
+                
+                if (field.getParamCount() > 0) {
+                        IParam param = field.getParamAt(0);
+                        JComponent edit = ParamTemplateUIFactory.
+                                                                getEditDefaultComponent(param);
+                        if (edit != null) {
+                                edit.addPropertyChangeListener( 
+                                                ITreeEditComp.VALUE_CHANGED_PROPERTY, this);
+                                paramHeader.add(edit, BorderLayout.SOUTH);
+                        }
+                }
                 
                 // For each parameter of this field, add the components for
                 // editing their default or template values. 
-                buildParamComponents();
+                addAdditionalParams();
                 
                 this.setLayout(new BorderLayout());
@@ -239 +251 @@
         /**
          * Add additional UI components for editing the value of this field.
-         * Use a Factory to create the UI components, depending on the value type
-         */
-        private void buildParamComponents() 
+         * This deals with "Additional" parameters, not the first one, which
+         * is a special case (added earlier). 
+         * Uses the {@link ParamTemplateUIFactory} to create the UI components,
+         * depending on the value type
+         */
+        private void addAdditionalParams() 
         {
+                addFieldComponent(createAdditionalParamsHeader());
+                
                 int paramCount = field.getParamCount();
-                
-                for (int i=0; i<paramCount; i++) {
+                if (paramCount < 2) { return; }
+                
+                for (int i=1; i<paramCount; i++) {
                         IParam param = field.getParamAt(i);
                         JComponent edit = ParamTemplateUIFactory.
                                                                         getEditDefaultComponent(param);
-                        if (edit != null)
+                        if (edit != null) {
                                 addFieldComponent(edit);
-                }
+                        }
+                }
+        }
+        
+        private JComponent createAdditionalParamsHeader() {
+                JPanel addParamsHeader = new JPanel(new BorderLayout());
+                addParamsHeader.setBackground(null);
+                JButton addParamsButton = new AddParamActions(field, tree, 
+                                treeNode, controller).getButton();
+                addParamsButton.addPropertyChangeListener(
+                                AddParamActions.PARAM_ADDED_PROPERTY, this);
+                addParamsHeader.add(addParamsButton, BorderLayout.EAST);
+                
+                addParamsHeader.add(
+                                new CustomLabel("Additional Parameters:"), BorderLayout.WEST);
+                
+                return addParamsHeader;
         }
 

trunk/SRC/org/openmicroscopy/shoola/agents/editor/browser/paramUIs/editTemplate/ParamTemplateUIFactory.java

@@ -68 +68 @@
                 }
                 String inputType = paramObject.getAttribute(AbstractParam.PARAM_TYPE);
-                
+
                 if (inputType == null) {
                         return null;
@@ -80 +80 @@
                 if (inputType.equals(SingleParam.ENUM_PARAM)) {
                         return new EnumTemplate(paramObject);
+                }
+                
+                if (inputType.equals(SingleParam.BOOLEAN_PARAM)) {
+                        return new BooleanTemplate(paramObject);
+                }
+                
+                if (inputType.equals(SingleParam.NUMBER_PARAM)) {
+                        return new NumberTemplate(paramObject);
                 }
                 

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

@@ -148 +148 @@
                                 oldValues.put(key, attributes.getAttribute(key));
                                 attributes.setAttribute(key, newValues.get(key));
-                                System.out.println("AttributesEdit " + key + " " + 
-                                                attributes.getAttribute(key) + " " + newValues.get(key));
                         }
                         // if node changed (eg template edited), need to notify