Changeset 97 for trunk/src/org/expeditee/gui/AttributeUtils.java

Timestamp:

06/10/08 10:03:03 (16 years ago)

Author:

ra33

Message:

Lots of changes!!

File:

• trunk/src/org/expeditee/gui/AttributeUtils.java (modified) (20 diffs)

trunk/src/org/expeditee/gui/AttributeUtils.java

@@ -12 +12 @@
 import org.expeditee.io.Conversion;
 import org.expeditee.items.Item;
+import org.expeditee.items.Justification;
 import org.expeditee.items.Text;
 
@@ -57 +58 @@
 
                 try {
+                        // TODO load these in with reflection...
+                        // Set the shortcuts with annotation tags on the methods
                         _Ignore = new LinkedList<String>();
                         _Ignore.add("date");
@@ -140 +143 @@
                         Class[] pList = { List.class };
                         Class[] pIntArray = { int[].class };
+                        Class[] pJustification = { Justification.class };
 
                         _SetMethods = new HashMap<String, Method>();
-                        _SetMethods.put("x", Item.class.getMethod("setX", pInt));
-                        _SetMethods.put("y", Item.class.getMethod("setY", pInt));
+                        _SetMethods.put("x", Item.class.getMethod("setX", pFloat));
+                        _SetMethods.put("y", Item.class.getMethod("setY", pFloat));
                         _SetMethods.put("position", Item.class.getMethod("setPosition",
                                         pPoint));
@@ -222 +226 @@
                                         pString));
                         _SetMethods.put("justification", Text.class.getMethod(
-                                        "setJustification", pInt));
+                                        "setJustification", pJustification));
                         _SetMethods.put("width", Text.class.getMethod("setWidth", pInt));
                         _SetMethods.put("size", Item.class.getMethod("setSize", pInt));
@@ -259 +263 @@
          * @return A Text Item containing the extracted Attributes.
          */
-        public static Item ExtractAttributes(Object toExtract) {
+        public static Item extractAttributes(Object toExtract) {
                 if (toExtract == null)
                         return null;
@@ -282 +286 @@
                                                 // are in the AllowNull list
                                                 if (_AllowNull.contains(m)) {
-                                                        String name = m.getName().substring(
-                                                                        GET_LENGTH).toLowerCase();
+                                                        String name = m.getName().substring(GET_LENGTH)
+                                                                        .toLowerCase();
                                                         if (name.equals("color"))
                                                                 o = "default";
@@ -303 +307 @@
 
                                         if (o instanceof Integer) {
-                                                Integer i =  (Integer)o;
+                                                Integer i = (Integer) o;
                                                 if (i == Item.DEFAULT_INTEGER)
                                                         continue;
                                                 if (m.getName().endsWith("Justification")
-                                                                && convertJustificationToString((Integer) o) != null)
-                                                        o = convertJustificationToString((Integer) o);
+                                                                && ((Justification) o).toString() != null)
+                                                        o = ((Justification) o).toString();
                                                 // -1 indicates default value
-                                                else 
+                                                else
                                                         o = i;
                                         } else if (o instanceof Float) {
@@ -366 +370 @@
                                                         continue;
                                         }
-                                        //Append the attributes
+                                        // Append the attributes
                                         attributes.append(m.getName().substring(GET_LENGTH))
                                                         .append(SEPARATOR_STRING).append(o).append("\n");
@@ -388 +392 @@
                 return attribs;
         }
-
-        /**
-         * Returns the String name of the justification value given. just should
-         * correspond to one of the Item.JUSTIFICATION constants, if it does not
-         * then null is returned.
-         * 
-         * @param just
-         *            The justification level as defined by the Item.JUSTIFICATION
-         *            constants.
-         * @return The String name (i.e. "Center") of the justification given, or
-         *         null if no match is found.
-         */
-        private static String convertJustificationToString(int just) {
-                switch (just) {
-                case Item.JUSTIFICATION_CENTER:
-                        return "Center";
-                case Item.JUSTIFICATION_FULL:
-                        return "Full";
-                case Item.JUSTIFICATION_LEFT:
-                        return "Left";
-                case Item.JUSTIFICATION_RIGHT:
-                        return "Right";
-                default:
-                        return null;
-                }
-        }
-
+        
         /**
          * Attempts to set the attribute in the given attribute: value pair. The
@@ -422 +400 @@
          * 
          * @param toSet
-         *            The Item to set the attribute of
+         *            The Item or Frame to set the attribute of
          * @param attribs
          *            The Text item that contains the list of attributes to set
          * @return True if the attribute(s) were sucessfully set, false otherwise
          */
-        public static boolean SetAttribute(Object toSet, Text attribs) {
+        public static boolean setAttribute(Object toSet, Text attribs) {
                 // error checking
                 if (toSet == null || attribs == null)
@@ -437 +415 @@
                 // get the list of attribute: value pairs
                 List<String> values = attribs.getTextList();
-                // if no paris exist, we are done
+                // if no pairs exist, we are done
                 if (values.size() == 0
                                 || (values.size() == 1 && values.get(0).length() == 0)) {
@@ -479 +457 @@
 
                         if (v.length() > 0
-                                        && !SetAttribute(toSet, v.toString(), values.size() > 1)) {
+                                        && !setAttribute(toSet, v.toString(), values.size() > 1)) {
                                 // if no other attributes have been set
                                 if (i == 0)
@@ -516 +494 @@
         }
 
-        private static boolean SetAttribute(Object toSet, String value,
+        private static boolean setAttribute(Object toSet, String value,
                         boolean isAttributeList) {
                 // separate attribute and value from string
-                String attribute = getAttribute(value);
+                String attribute = getAttribute(value).toLowerCase();
+                //Check that an attribute was found
+                if(attribute == null)
+                        return false;
+                
                 value = getValue(value);
-
-                // if there was no colon
-                if (value == null || attribute == null)
-                        return false;
-
-                if (value.length() == 0)
-                        value = "";
-
-                attribute = attribute.toLowerCase();
+                assert(value != null);
 
                 // Some properties are ignored when multiple attributes are being set on
@@ -538 +512 @@
                 }
 
-                // separate multiple values if required
-                Method toRun = _SetMethods.get(attribute);
+                // Separate multiple values if required
+                Method toRun = _SetMethods.get( attribute);
 
                 // if this is not the name of a method, it may be the name of an agent
@@ -553 +527 @@
                 int i = 0;
                 while (_SetMethods.containsKey(attribute + i)) {
-                        if (_SetMethods.get(attribute + i).getDeclaringClass().isAssignableFrom(toSet.getClass()))
+                        if (_SetMethods.get(attribute + i).getDeclaringClass()
+                                        .isAssignableFrom(toSet.getClass()))
                                 possibles.add(_SetMethods.get(attribute + i));
                         i++;
@@ -608 +583 @@
 
                 return false;
-
         }
 
         /**
          * Returns the part of the given string that is after the attribute value
-         * pair separator. If that character is not there it returns the empty
-         * string if it is an annotation item or the entire string if it is not.
+         * pair separator. If that character is not there it returns empty
+         * if it is an annotation item or the entire string if it is not.
          * 
          * @param attributeValuePair
@@ -622 +596 @@
         public static String getValue(String toStrip) {
                 assert (toStrip != null);
+
+                toStrip = toStrip.trim();
                 if (toStrip.length() == 0)
                         return "";
 
-                int lineSeparator = toStrip.indexOf(Character.LINE_SEPARATOR);
-                if(lineSeparator > 0){
-                        toStrip = toStrip.substring(0,lineSeparator);
-                }
-                
                 int ind = toStrip.lastIndexOf(SEPARATOR_CHAR);
-
-                if (ind < 0) {
-                        // If it is an annotation item return the empty string
-                        // Annotation items can not be values only
-                        if (toStrip.charAt(0) == '@') {
-                                return "";
-                        }
-                        // It is a value with no attribute.
-                        return toStrip.trim();
-                }
-
-                return toStrip.substring(ind + 1).trim();
+                int lineSeparator = toStrip.indexOf(Character.LINE_SEPARATOR, ind);
+                // If it is an annotation item return the empty string
+                // Annotation items can not be values only
+                if (ind < 0 && toStrip.charAt(0) == '@') {
+                        return "";
+                }
+                //If its one line then our value goes to the end of the string
+                if(lineSeparator < 0)
+                        lineSeparator = toStrip.length();
+
+                return toStrip.substring(ind + 1, lineSeparator).trim();
         }
 
@@ -655 +625 @@
          */
         public static String getAttribute(String attributeValuePair) {
+                attributeValuePair = attributeValuePair.trim();
+
                 int ind = attributeValuePair.indexOf(SEPARATOR_CHAR);
-                if (ind < 0)
+                if (ind < 1)
                         return null;
-
-                attributeValuePair = attributeValuePair.substring(0, ind);
-                attributeValuePair = attributeValuePair.trim();
-
-                if (attributeValuePair.length() == 0)
-                        return null;
+                // If its an annotation there must be no space between the @ and colon
+                // and the first character after the annotation must be a letter
+                if (attributeValuePair.charAt(0) == '@') {
+                        if (!Character.isLetter(attributeValuePair.charAt(1)))
+                                return null;
+                        for (int i = 2; i < ind; i++) {
+                                if (!Character.isLetterOrDigit(attributeValuePair.charAt(i)))
+                                        return null;
+                        }
+                }
+
+                attributeValuePair = attributeValuePair.substring(0, ind).trim();
 
                 return attributeValuePair;
@@ -669 +647 @@
 
         /**
+         * Replaces the current value for the text item with the new value.
          * 
          * @param text
-         * @param value
+         *            the item whos value is to be changed
+         * @param newValue
+         *            the new value for the item
          */
-        public static void setSingleValue(Text text, String value) {
-                assert (value != null);
-
-                String oldText = text.getText();
+        public static void replaceValue(Text text, String newValue) {
+                assert (newValue != null);
+
+                String oldText = text.getFirstLine();
+                String restOfText = text.getText().substring(oldText.length());
                 String attribute = getAttribute(oldText);
 
@@ -682 +664 @@
                         attribute = text.getText().trim();
 
-                text.setText(attribute + SEPARATOR_STRING + value);
-        }
-
+                text.setText(attribute + SEPARATOR_STRING + newValue + restOfText);
+        }
+
+        /**
+         * Gets the value from an attribute value pair as a double.
+         * 
+         * @param attributeValuePair
+         *            the text to get the value from
+         * @return the double value or null if there is none
+         */
         public static Double getDoubleValue(String attributeValuePair) {
                 String value = getValue(attributeValuePair);
 
-                if (value == null)
-                        return null;
+                assert (value != null);
 
                 try {