Changeset 5614

Timestamp:

09/16/08 13:04:22 (2 months ago)

Author:

will

Message:

Can open the Editor with no file, using ShowEditorEvent?.

Location:

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

Files:

• EditorAgent.java (modified) (2 diffs)
• browser/paramUIs/EnumEditor.java (modified) (1 diff)
• browser/paramUIs/NumberEditor.java (modified) (1 diff)
• browser/paramUIs/TextBoxEditor.java (modified) (1 diff)
• browser/paramUIs/editTemplate/AttributeEditArea.java (modified) (2 diffs)
• browser/paramUIs/editTemplate/AttributeEditLine.java (modified) (1 diff)
• browser/paramUIs/editTemplate/EnumTemplate.java (modified) (3 diffs)
• browser/paramUIs/editTemplate/FieldEditorPanel.java (modified) (1 diff)
• browser/paramUIs/editTemplate/ParamTemplateUIFactory.java (modified) (2 diffs)
• view/EditorComponent.java (modified) (1 diff)
• view/EditorControl.java (modified) (3 diffs)
• view/EditorFactory.java (modified) (3 diffs)
• view/EditorModel.java (modified) (2 diffs)
• view/EditorUI.java (modified) (2 diffs)

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

@@ -100 +100 @@
         
         /**
-         * Creates or recycles an editor.
-         * @param event The event to handle.
+         * Creates a {@link Editor#NEW} editor with no file, or recycles an editor.
          */
-        private void handleShowEditor(ShowEditorEvent event)
+        private void handleShowEditor()
         {
+                Editor editor = EditorFactory.getEditor();
+                if (editor != null) {
+                        editor.activate();
+                }
         }
         
@@ -166 +169 @@
        
        if (e instanceof ShowEditorEvent)
-           handleShowEditor((ShowEditorEvent) e);
+           handleShowEditor();
     }
     

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

@@ -36 +36 @@
 
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
-import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomComboBox;

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

@@ -64 +64 @@
         private void buildUI()
         {
-                TextFieldEditor numberField = new TextFieldEditor((IParam)getParameter(), 
+                TextFieldEditor numberField = new TextFieldEditor(getParameter(), 
                                 SingleParam.PARAM_VALUE);
                 numberField.addPropertyChangeListener(ITreeEditComp.VALUE_CHANGED_PROPERTY, 

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

@@ -40 +40 @@
 
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
-import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomLabel;

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

@@ -26 +26 @@
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 
 import javax.swing.BorderFactory;
-import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.border.Border;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.text.BadLocationException;
 
 //Third-party libraries
@@ -43 +40 @@
 import org.openmicroscopy.shoola.agents.editor.browser.paramUIs.AttributeEditListeners;
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
-import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
 import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomLabel;

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

@@ -41 +41 @@
 import org.openmicroscopy.shoola.agents.editor.browser.paramUIs.TextFieldEditor;
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
-import org.openmicroscopy.shoola.agents.editor.model.params.IParam;
-import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomLabel;
 

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

@@ -23 +23 @@
 package org.openmicroscopy.shoola.agents.editor.browser.paramUIs.editTemplate;
 
+//Java imports
+
 import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.HashMap;
 
-import javax.swing.BoxLayout;
-import javax.swing.JComboBox;
+//Third-party libraries
+
+//Application-internal dependencies
 
 import org.openmicroscopy.shoola.agents.editor.browser.paramUIs.AbstractParamEditor;
@@ -38 +39 @@
 import org.openmicroscopy.shoola.agents.editor.model.IAttributes;
 import org.openmicroscopy.shoola.agents.editor.model.params.SingleParam;
-import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomComboBox;
 import org.openmicroscopy.shoola.agents.editor.uiComponents.CustomLabel;
 
-//Java imports
-
-//Third-party libraries
-
-//Application-internal dependencies
-
 /** 
- * 
+ * This is the UI component for editing the "Template" of an Enumeration 
+ * Parameter. 
+ * It includes a text box for entering a comma-delimited list of options, and
+ * a comboBox for choosing the default option. 
  *
  * @author  William Moore     
@@ -63 +60 @@
 {
 
+        /**
+         * The text box for entering a list of comma-delimited options.
+         */
         private AttributeEditArea                       optionsFieldEditor;
         
+        /**
+         * A comboBox for selecting the default option.
+         */
         private AbstractParamEditor                     defaultValueComboBox;
         

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

@@ -377 +377 @@
                                 
                                 else if (newVal instanceof HashMap) {
-                                        HashMap newVals = (HashMap)newVal;
+                                        HashMap<String,String> newVals = (HashMap)newVal;
                                          controller.editAttributes(param, displayName, newVals, 
                                                         tree, treeNode);

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

@@ -27 +27 @@
 
 import javax.swing.JComponent;
-import javax.swing.JPanel;
 
 //Third-party libraries
@@ -33 +32 @@
 //Application-internal dependencies
 
-import org.openmicroscopy.shoola.agents.editor.browser.paramUIs.DateTimeField;
-import org.openmicroscopy.shoola.agents.editor.browser.paramUIs.TextBoxEditor;
 import org.openmicroscopy.shoola.agents.editor.model.DataFieldConstants;
 import org.openmicroscopy.shoola.agents.editor.model.params.AbstractParam;

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

@@ -107 +107 @@
                 switch (state) {
                         case NEW:
-                                model.fireFileLoading();
-                                fireStateChange();
-                                //view.setOnScreen();   // called by EditorUI initialize()
+                                if (model.getFileID() != 0) {
+                                        model.fireFileLoading();
+                                        fireStateChange();
+                                        //view.setOnScreen();   // called by EditorUI initialize()
+                                }
+                                else {
+                                        view.deIconify();
+                                }
                                 break;
                         case DISCARDED:

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

@@ -22 +22 @@
  */
 package org.openmicroscopy.shoola.agents.editor.view;
-
-
 
 //Java imports
@@ -47 +45 @@
 import org.openmicroscopy.shoola.agents.editor.actions.EditorAction;
 import org.openmicroscopy.shoola.agents.editor.actions.OpenLocalFileAction;
-import org.openmicroscopy.shoola.agents.editor.browser.Browser;
 
 /** 
@@ -224 +221 @@
          */
         public void propertyChange(PropertyChangeEvent evt) {
-                String name = evt.getPropertyName();
+                //String name = evt.getPropertyName();
                 
                 

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

@@ -22 +22 @@
  */
 package org.openmicroscopy.shoola.agents.editor.view;
-
-
 
 //Java imports
@@ -87 +85 @@
         {
                 EditorModel model = new EditorModel(file);
+                
                 return singleton.getEditor(model);
+        }
+        
+        /**
+         * If no editors exist, this returns a new {@link Editor}, 
+         * with an {@link EditorModel} that has no file.
+         * Otherwise, it simply returns the first editor in the {@link #editors} list. 
+         * 
+         * @return See above.
+         */
+        public static Editor getEditor()
+        {
+                EditorModel model;
+                Editor editor;
+                if (singleton.editors.isEmpty()) {
+                        model = new EditorModel();
+                        editor = singleton.getEditor(model);
+                        editor.setStatus("", true);
+                } else {
+                        Editor e = singleton.editors.iterator().next();
+                        model = ((EditorComponent)e).getModel();
+                        editor = singleton.getEditor(model);
+                }
+                return editor;
         }
         
@@ -158 +180 @@
                                         (comp.getModel().getFileName().equals(model.getFileName())))
                                 return comp;
+                        if (comp.getModel().getFileName().equals("")) {
+                                return comp;
+                        }
                 }
                 comp = new EditorComponent(model);      // creates View and Controller

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

@@ -107 +107 @@
          * Creates a new instance and sets the state to {@link Editor#NEW}.
          * {@link #fileSize} and {@link #fileID} are not set.
+         * File is not opened. To do this, call {@link Editor#setFileToEdit(File)}
          * 
          * @param file          The file to open. Sets the {@link #fileName} to the 
-         *                                      name of this file. 
+         *                                      name of this file but does not open file. 
          */
         EditorModel(File file) 
         {
                 if (file == null) throw new NullPointerException("No file.");
-                if (! file.exists()) return;
                 
                 state = Editor.NEW;
                 this.fileName = file.getName();
+        }
+        
+        /**
+         * Creates a new instance and sets the state to {@link Editor#NEW}.
+         * {@link #fileSize} and {@link #fileID} are not set.
+         *  
+         */
+        EditorModel() 
+        {
+                state = Editor.NEW;
+                this.fileName = "";
         }
         
@@ -201 +212 @@
         {
                 fileToEdit = file;
+                fileName = file.getName();
                 TreeModel treeModel = TreeModelFactory.getTree(file);
                 browser.setTreeModel(treeModel);

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

@@ -26 +26 @@
 import java.awt.BorderLayout;
 import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Toolkit;
 
 import javax.swing.JMenu;
@@ -100 +98 @@
                 Container c = getContentPane();
                 c.setLayout(new BorderLayout(0, 0));
-                // c.add(toolBar, BorderLayout.NORTH);
+                //c.add(toolBar, BorderLayout.NORTH);
                 
                 c.add(statusBar, BorderLayout.SOUTH);