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

Timestamp:

08/19/08 14:12:52 (16 years ago)

Author:

ra33

Message:

Refactored the way attribute value pairs work...
Moved static methods into attributeValuePairs class

File:

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

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

@@ -25 +25 @@
  */
 public class AttributeUtils {
-
-        public static final char SEPARATOR_CHAR = ':';
-
-        private static final String SEPARATOR_STRING = SEPARATOR_CHAR + " ";
 
         private static final int GET_LENGTH = "get".length();
@@ -393 +389 @@
                                                         attributes
                                                                         .append(m.getName().substring(GET_LENGTH))
-                                                                        .append(SEPARATOR_STRING).append(ob)
-                                                                        .append('\n');
+                                                                        .append(AttributeValuePair.SEPARATOR_STRING)
+                                                                        .append(ob).append('\n');
                                                 continue;
                                         } else if (o instanceof int[]) {
@@ -411 +407 @@
                                         // Append the attributes
                                         attributes.append(m.getName().substring(GET_LENGTH))
-                                                        .append(SEPARATOR_STRING).append(o).append('\n');
+                                                        .append(AttributeValuePair.SEPARATOR_STRING)
+                                                        .append(o).append('\n');
                                 } catch (Exception e) {
                                         // TODO Auto-generated catch block
@@ -455 +452 @@
                 List<String> values = attribs.getTextList();
                 // if no pairs exist, we are done
-                if (values == null || values.size() == 0
-                                || (values.size() == 1 && values.get(0).length() == 0)) {
+                if (values == null || values.size() == 0) {
                         return false;
                 }
@@ -462 +458 @@
                 // loop through all attribute: value pairs
                 for (int i = 0; i < values.size(); i++) {
-                        StringBuffer v = new StringBuffer(values.get(i));
-
-                        // remove the annotation mark (if applicable)
-                        if (v.indexOf("@") == 0)
-                                v = v.deleteCharAt(0);
+                        AttributeValuePair avp = new AttributeValuePair(values.get(i));
+
+                        // If the first is not an attribute value pair then dont do
+                        // attrubute merging
+                        if (!avp.hasAttribute())
+                                return false;
 
                         // check if the next string is another attribute to merge or a
                         // continuation
-                        while (i < values.size() - 1) {
-                                StringBuffer next = new StringBuffer(values.get(i + 1));
+                        for (; i < values.size() - 1; i++) {
+                                AttributeValuePair nextAvp = new AttributeValuePair(values
+                                                .get(i + 1));
 
                                 // if the next String has a colon, then it may be another
                                 // attribute
-                                if (next.indexOf("" + SEPARATOR_CHAR) >= 0) {
+                                if (nextAvp.hasAttribute()) {
                                         // if the attribute is the same as v, then it is a
                                         // continuation
-                                        if (v.indexOf(getAttribute(next.toString())) == 0) {
+                                        if (nextAvp.getAttribute().equals(avp.getAttribute())) {
                                                 // strip the attribute from next
-                                                next = new StringBuffer(getValue(next.toString()));
+                                                avp.appendValue(nextAvp.getValue());
+
                                                 // if the attribute is not the same, then it may be a
                                                 // new method
                                         } else {
-                                                // if this is indeed a method, then leave the while loop
-                                                // if(_SetMethods.containsKey(StripFromColon(next.toString()).toLowerCase())){
                                                 break;
-                                                // }
                                         }
                                 }
 
-                                v.append("\n").append(next);
-                                i++;
+                                // v.append("\n").append(next);
                         }
 
-                        if (v.length() > 0
-                                        && !setAttribute(toSet, v.toString(), values.size() > 1)) {
-                                // if no other attributes have been set
-                                if (i == 0)
+                        if (!setAttribute(toSet, avp, values.size() > 1)) {
+
+                                String stripped = avp.getAttribute();
+                                if (stripped == null) {
+                                        // This happens when there is an attribute at the start
+                                        // Then a bunch of plain text
                                         return false;
-                                // otherwise, this is a list of attributes, so continue
-                                else {
-                                        String stripped = getAttribute(v.toString());
-                                        if (stripped == null) {
-                                                // This happens when there is an attribute at the start
-                                                // Then a bunch of plain text
-                                                return false;
-                                        } else if (_Ignore.contains(stripped)) {
-                                                return false;
-                                        } else if (!(_SetMethods.containsKey(stripped))) {
-                                                // Display an error message if its not in our list of
-                                                // attributes to ignore when copying
-                                                MessageBay.warningMessage("Attribute: '"
-                                                                + getAttribute(v.toString())
-                                                                + "' does not exist.");
-                                        } else {
-                                                String types = "";
-                                                for (Class c : _SetMethods.get(stripped)
-                                                                .getParameterTypes())
-                                                        types += c.getSimpleName() + " ";
-                                                MessageBay.warningMessage("Wrong arguments for: '"
-                                                                + getAttribute(v.toString()) + "' expecting "
-                                                                + types.trim() + " found '"
-                                                                + getValue(v.toString()) + "'");
-                                        }
+                                } else if (_Ignore.contains(stripped)) {
+                                        return false;
+                                } else if (!(_SetMethods.containsKey(stripped))) {
+                                        // Display an error message if its not in our list of
+                                        // attributes to ignore when copying
+                                        MessageBay.warningMessage("Attribute: '"
+                                                        + avp.getAttribute() + "' does not exist.");
+                                } else {
+                                        String types = "";
+                                        for (Class c : _SetMethods.get(stripped)
+                                                        .getParameterTypes())
+                                                types += c.getSimpleName() + " ";
+                                        MessageBay.warningMessage("Wrong arguments for: '"
+                                                        + avp.getAttribute() + "' expecting "
+                                                        + types.trim() + " found '" + avp.getValue() + "'");
                                 }
-                        } else if (v.length() == 0)
-                                return false;
+                        }
                 }
 
@@ -533 +519 @@
         }
 
-        private static boolean setAttribute(Object toSet, String value,
+        /**
+         * Sets a single attrubute of a frame or item.
+         * 
+         * @param toSet
+         * @param avp
+         * @param isAttributeList
+         *            some properties are ignored when attribute list are injected
+         *            into an item. These properties are ignored if this param is
+         *            true
+         * @return
+         */
+        private static boolean setAttribute(Object toSet, AttributeValuePair avp,
                         boolean isAttributeList) {
+
+                assert (avp.hasAttribute());
+
                 // separate attribute and value from string
-                String attribute = getAttribute(value);
-                // Check that an attribute was found
-                if (attribute == null)
-                        return false;
-                attribute = attribute.toLowerCase();
-
-                value = getValue(value);
+                String attribute = avp.getAttribute().toLowerCase();
+
+                String value = avp.getValue();
                 assert (value != null);
 
@@ -625 +621 @@
 
         /**
-         * Returns the part of the given string that is after the attribute value
-         * 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
-         *            the string to get the value from.
-         * @return the value from the attribute value pair.
-         */
-        public static String getValue(String toStrip) {
-                assert (toStrip != null);
-
-                toStrip = toStrip.trim();
-                if (toStrip.length() == 0)
-                        return "";
-
-                int ind = toStrip.lastIndexOf(SEPARATOR_CHAR);
-                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();
-        }
-
-        /**
-         * Returns the part of the given string that is before the attribute value
-         * pair separator, or null if the given String does not include the
-         * separator.
-         * 
-         * @param attributeValuePair
-         *            The String to strip
-         * @return the attribute if there is one or null if there is not
-         */
-        public static String getAttribute(String attributeValuePair) {
-                if (attributeValuePair.length() <= 1)
-                        return null;
-
-                attributeValuePair = attributeValuePair.trim();
-
-                if (attributeValuePair.length() == 0)
-                        return null;
-
-                int ind = attributeValuePair.indexOf(SEPARATOR_CHAR);
-                // 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;
-                        }
-                        if (ind < 1)
-                                return attributeValuePair.substring(0);
-                } else if (ind < 1) {
-                        return null;
-                }
-
-                return attributeValuePair.substring(0, ind).trim();
-        }
-
-        /**
          * Replaces the current value for the text item with the new value.
          * 
@@ -702 +631 @@
                 assert (newValue != null);
 
-                String oldText = text.getFirstLine();
-                String restOfText = text.getText().substring(oldText.length());
-                String attribute = getAttribute(oldText);
-
-                if (attribute == null)
-                        attribute = text.getText().trim();
-
-                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);
-
-                assert (value != null);
-
-                try {
-                        return Double.parseDouble(value);
-                } catch (Exception e) {
-                }
-                return null;
-        }
-
-        public static AttributeValuePair getPair(String text) {
-                // TODO Make this more efficient
-                String attribute = AttributeUtils.getAttribute(text);
-                String value = AttributeUtils.getValue(text);
-                if (attribute == null || value == null)
-                        return null;
-                return new AttributeValuePair(attribute, value);
+                AttributeValuePair avp = new AttributeValuePair(text.getText());
+
+                if (avp.getAttribute() == null) {
+                        avp.setAttribute(avp.getValue());
+                }
+                avp.setValue(newValue);
+                text.setText(avp.toString());
         }
 }