Changeset 5546 for branches/OmeroEditor/src/fields/Field.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/Field.java (modified) (5 diffs)

branches/OmeroEditor/src/fields/Field.java

@@ -24 +24 @@
 package fields;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import tree.DataFieldConstants;
 
-
+/**
+ * 
+ * 
+ * @author  William Moore     
+ * <a href="mailto:will@lifesci.dundee.ac.uk">will@lifesci.dundee.ac.uk</a>
+ * @version 3.0
+ * <small>
+ * (<b>Internal version:</b> $Revision: $Date: $)
+ * </small>
+ * @since OME3.0
+ */
 public class Field 
         implements IField {
+        
+        public static final String FIELD_NAME = "fieldName";
+        
+        public static final String FIELD_DESCRIPTION = "fieldDescription";
+        
+        public static final String FIELD_URL = "fieldUrl";
+        
+        
+        private List<IParam> fieldParams;
 
         HashMap<String, String> allAttributesMap;
@@ -40 +61 @@
          * field. 
          */
-        private IFieldValue fieldValue;
+        //private IFieldValue fieldValue;
         
         public Field() {
-                this("untitled", null, DataFieldConstants.FIXED_PROTOCOL_STEP);
+                this("untitled");
         }
         
-        public Field(String name, String value, String fieldType) {
+        public Field(String name) {
                 
                 allAttributesMap = new HashMap<String, String>();
+                fieldParams = new ArrayList<IParam>();
                 
-                fieldValue = FieldValueFactory.getFieldValue(fieldType);
+                setAttribute(FIELD_NAME, name);
                 
-                setAttribute(DataFieldConstants.ELEMENT_NAME, name);
-                setAttribute(DataFieldConstants.VALUE, value);
         }
         
         public String getAttribute(String name) {
                 //System.out.println("Field getAttribute()");
-                if (fieldValue.isValueAttribute(name)) {
-                        return fieldValue.getAttribute(name);
-                }
                 
                 return allAttributesMap.get(name);
@@ -66 +83 @@
         
         public void setAttribute(String name, String value) {
-                System.out.println("Field setAttribute() " + name + " = " + value);
-                if (fieldValue.isValueAttribute(name)) {
-                        fieldValue.setAttribute(name, value);
-                }
+                
                 allAttributesMap.put(name, value);
         }
         
         public String toString() {
-                return getAttribute(DataFieldConstants.ELEMENT_NAME) + ": " + 
-                getAttribute(DataFieldConstants.VALUE);
+                return getAttribute(DataFieldConstants.ELEMENT_NAME);
         }
 
+        
         public boolean isAttributeTrue(String attributeName) {
                 String value = getAttribute(attributeName);
@@ -83 +97 @@
         }
         
-        public IFieldValue getValueObject() {
-                return fieldValue;
-        }
-        
-        /**
-         * Gets the names of the attributes where this field stores its "value"s.
-         * This is used eg. (if a single value is returned)
-         * as the destination to copy the default value when defaults are loaded.
-         * Also used by EditClearFields to set all values back to null. 
-         * This method delegates to the Value object for this field.
-         *  
-         * @return      the names of the attributes that holds the "value" of this field
-         */
-        public String[] getValueAttributes() {
-                return fieldValue.getValueAttributes();
-        }
+
         
         /**
@@ -113 +112 @@
          */
         public boolean isFieldFilled() {
-                return fieldValue.isFieldFilled();
+                
+                for (IParam param : fieldParams) {
+                        if (! param.isParamFilled()) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+
+        public int getParamCount() {
+                return fieldParams.size();
+        }
+
+        public IParam getParamAt(int index) {
+                return fieldParams.get(index);
+        }
+
+        public void addParam(IParam param) {
+                fieldParams.add(param);
+        }
+
+        public boolean removeParam(IParam param) {
+                return fieldParams.remove(param);
         }
 }