Changeset 5610

Timestamp:

09/15/08 14:23:49 (2 months ago)

Author:

will

Message:

Template-Editing UI components for Table, Timer, DateTime?

Location:

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

Files:

• EditorAgent.java (modified) (1 diff)
• browser/BrowserControl.java (modified) (2 diffs)
• browser/BrowserUI.java (modified) (1 diff)
• browser/FieldEditorDisplay.java (modified) (1 diff)
• browser/paramUIs/editTemplate/AttributeEditArea.java (modified) (1 diff)
• browser/paramUIs/editTemplate/BooleanTemplate.java (modified) (2 diffs)
• browser/paramUIs/editTemplate/DateTimeTemplate.java (added)
• browser/paramUIs/editTemplate/EnumTemplate.java (modified) (1 diff)
• browser/paramUIs/editTemplate/FieldEditorPanel.java (modified) (1 diff)
• browser/paramUIs/editTemplate/ParamTemplateUIFactory.java (modified) (2 diffs)
• browser/paramUIs/editTemplate/TableTemplate.java (added)
• browser/paramUIs/editTemplate/TimerTemplate.java (added)
• graphx/eclipse_addTextLine16.png (moved) (moved from trunk/SRC/org/openmicroscopy/shoola/agents/editor/graphx/nuvola_addTextLine16.png)
• model/params/MutableTableModel.java (modified) (2 diffs)
• model/undoableEdits/AttributeEdit.java (modified) (1 diff)
• model/undoableEdits/ChangeParamEdit.java (added)
• model/undoableEdits/DeleteFieldsEdit.java (modified) (2 diffs)
• view/EditorComponent.java (modified) (1 diff)
• view/EditorFactory.java (modified) (1 diff)

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

@@ -155 +155 @@
            handleFileEdition((EditFileEvent) e);
     }
+    
+    /**
+     * This was an attempted shortcut to directly start OMERO.editor
+     * without Insight and a server connection.
+     * However, I get a NPE becuase there is no Registry! 
+     * 
+     * @param args
+     */
+    public static void main(String[] args) {
+        
+        File testFile = new File
+                ("/Users/will/xmlProtocols/demoForRelease/AllFields.pro.xml");
+                /*
+        Editor editor = EditorFactory.getEditor(testFile);
+        
+        if (editor != null) {
+                editor.setFileToEdit(testFile);
+        }
+        */
+
+    }
 }

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

@@ -51 +51 @@
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
 import org.openmicroscopy.shoola.agents.editor.model.IField;
+import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 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;
+import org.openmicroscopy.shoola.agents.editor.model.undoableEdits.ChangeParamEdit;
 
 
@@ -257 +259 @@
              }
           }
+        
+        /**
+         * 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 changeParam(IField field, IParam param, int index,
+                        JTree tree, TreeNode node) {
+                
+                UndoableEdit edit = new ChangeParamEdit(param, field, index, 
+                         tree, node);
+                undoSupport.postEdit(edit);
+        }
 }

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

@@ -130 +130 @@
         add(leftSplitPane, BorderLayout.CENTER);
         
-        //add(new ToolBar(controller, treeDisplay), BorderLayout.NORTH);
+        add(new ToolBar(controller, treeDisplay), BorderLayout.NORTH);
     }
     

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

@@ -48 +48 @@
 
 /** 
- * A container to display a FieldEditorPanel for the currently highlighted 
- * field of the JTree. 
+ * A container to display a {@link FieldEditorPanel} for the currently 
+ * highlighted field of the JTree. 
  *
  * @author  William Moore     

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

@@ -163 +163 @@
         }
         
+        /**
+         * This allows other classes to manipulate the text box, to set cols or
+         * set Text etc. 
+         * 
+         * @return              The Text Area used by this UI for editing text
+         */
+        public JTextArea getTextArea() { return textBox; }
         
         /**

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

@@ -74 +74 @@
         }
         
-        
+        /**
+         * Creates an instance.
+         * 
+         * @param param         The parameter in which to edit the default boolean value
+         */
         public BooleanTemplate(IAttributes param) 
         {
@@ -82 +86 @@
         }
         
-        
+        /**
+         * Implemented as specified by the {@link ITreeEditComp} interface. 
+         * 
+         * @see {@link ITreeEditComp#getEditDisplayName()
+         */
         public String getEditDisplayName() {
-                // TODO Auto-generated method stub
-                return null;
+                return "Checkbox default";
         }
 

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

@@ -110 +110 @@
         }
 
-        public String getEditDisplayName() {
-                return "Drop-down options";
-        }
+        /**
+         * Implemented as specified by the {@link ITreeEditComp} interface. 
+         * 
+         * @see {@link ITreeEditComp#getEditDisplayName()
+         */
+        public String getEditDisplayName() { return "Drop-down options"; }
 
         /**

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

@@ -297 +297 @@
         private void paramTypeChanged(String newType) {
                 
-                if (field.getParamCount() > 0) {
-                        IParam oldParam = field.getParamAt(0);
-                        field.removeParam(oldParam);
-                }
-                IParam newParam = FieldParamsFactory.getFieldParam(newType);
-                field.addParam(0, newParam);
-                
-                /* refresh this node in the JTree, and rebuild this panel*/
-                updateEditingOfTreeNode();
-                rebuildEditorPanel();
+                int paramIndex = 0;
+                
+                IParam newParam = null;
+                if (newType != null) 
+                        newParam = FieldParamsFactory.getFieldParam(newType);
+                
+                // if newParam is null, this will simply remove first parameter
+                controller.changeParam(field, newParam, paramIndex,
+                                 tree, treeNode);
         }
 

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

@@ -37 +37 @@
 import org.openmicroscopy.shoola.agents.editor.model.DataFieldConstants;
 import org.openmicroscopy.shoola.agents.editor.model.params.AbstractParam;
+import org.openmicroscopy.shoola.agents.editor.model.params.DateTimeParam;
 import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
+import org.openmicroscopy.shoola.agents.editor.model.params.TableParam;
+import org.openmicroscopy.shoola.agents.editor.model.params.TimeParam;
 
 /** 
@@ -86 +89 @@
                 }
                 
+                if (inputType.equals(DateTimeParam.DATE_TIME_PARAM)) {
+                        return new DateTimeTemplate(paramObject);
+                }
+                
+                if (inputType.equals(TableParam.TABLE_PARAM)) {
+                        return new TableTemplate(paramObject);
+                }
+                
+                if (inputType.equals(TimeParam.TIME_PARAM)) {
+                        return new TimerTemplate(paramObject);
+                }
+                
                 if (inputType.equals(SingleParam.NUMBER_PARAM)) {
                         return new NumberTemplate(paramObject);

trunk/SRC/org/openmicroscopy/shoola/agents/editor/model/params/MutableTableModel.java

@@ -75 +75 @@
         return columnNames.get(column);
     }
+    
+    /**
+     * Sets the name of the column at the specified index. 
+     * If the column index is too high (too few columns) then
+     * a new column is created. 
+     * Either way, {@link #fireTableStructureChanged()} is called
+     * to notify the Table that the model has changed.
+     * 
+     * @param columnIndex               The index of the column         
+     * @param name                      The new name for the column
+     */
+    public void setColumnName(int columnIndex, String name)
+    {
+        if (columnIndex >= getColumnCount()) {
+                addEmptyColumn(name);
+        } else {
+                columnNames.remove(columnIndex);
+                columnNames.add(columnIndex, name);
+        }
+    }
 
     /**
@@ -231 +251 @@
         for (int i=rowIndecies.length-1; i>-1; i--) {
                 int rowToRemove = rowIndecies[i];
-                System.out.println("InteractiveTableModel Removing row " + rowToRemove);
                 data.remove(rowToRemove);
                 fireTableRowsDeleted(rowToRemove, rowToRemove);

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

@@ -128 +128 @@
                 if ((tree != null) && (node != null)) {
                         
-                        DefaultMutableTreeNode dmtNode = (DefaultMutableTreeNode)node;
-                        
                         DefaultTreeModel treeModel = (DefaultTreeModel)tree.getModel();
                         treeModel.nodeChanged(node);

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

@@ -32 +32 @@
 import javax.swing.tree.TreePath;
 
-import org.openmicroscopy.shoola.agents.editor.model.TreeModelMethods;
-
 //Third-party libraries
 
 //Application-internal dependencies
+
+import org.openmicroscopy.shoola.agents.editor.model.TreeModelMethods;
 
 /** 
@@ -51 +51 @@
  */
 public class DeleteFieldsEdit 
-        extends UndoableTreeEdit {
+        extends UndoableTreeEdit 
+{
 
         /**

trunk/SRC/org/openmicroscopy/shoola/agents/editor/view/EditorComponent.java

@@ -166 +166 @@
         public void setFileToEdit(File file)
         {
-                if (model.getState() != LOADING)
+                if ((model.getState() != LOADING) && (model.getState() != NEW))
                         throw new IllegalStateException("This method should only be " +
-                                        "invoked in the LOADING state.");
+                                        "invoked in the LOADING or NEW states.");
                                         
                 model.setFileToEdit(file);

trunk/SRC/org/openmicroscopy/shoola/agents/editor/view/EditorFactory.java

@@ -75 +75 @@
         {
                 EditorModel model = new EditorModel(fileName, fileID, fileSize);
+                return singleton.getEditor(model);
+        }
+        
+        /**
+         * Returns the {@link Editor}.
+         * 
+         * @param file          The file to open in Editor. 
+         * @return See above.
+         */
+        public static Editor getEditor(File file)
+        {
+                EditorModel model = new EditorModel(file);
                 return singleton.getEditor(model);
         }