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

Timestamp:

10/31/18 10:22:24 (6 years ago)

Author:

bln4

Message:

org.expeditee.gui.FrameIO ->

Added ability to specify were frames are being loaded from.

File:

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

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

@@ -392 +392 @@
                         Attribute a = attribSet.get(prop);
                         // Make sure the classes of the methods match the item
-                        if (a != null && a.getter != null && a.getter.getDeclaringClass().isAssignableFrom(toExtract.getClass())) {
-                                
+                        if (a != null && a.getter != null && a.getter.getDeclaringClass().isAssignableFrom(toExtract.getClass())) {     
                                 try {
                                         String s = getValue(prop, a, toExtract, true);
-                                        if (s == null)
+                                        if (s == null) {
                                                 continue;
+                                        }
                                         // Append the attributes
                                         attributes.append(a.displayName)
@@ -410 +410 @@
 
                 // if no attributes were extracted
-                if (attributes.length() <= 0)
+                if (attributes.length() <= 0) {
                         return null;
-
-                while (attributes.charAt(attributes.length() - 1) == '\n')
+                }
+
+                while (attributes.charAt(attributes.length() - 1) == '\n') {
                         attributes.delete(attributes.length() - 1, attributes.length());
+                }
 
                 // create the text Item
@@ -450 +452 @@
                         // are in the AllowNull list
                         if (_AllowNull.contains(a.getter)) {
-                                if (name.equals("color"))
+                                if (name.equals("color")) {
                                         o = "default";
-                                else if (name.equals("backgroundcolor"))
+                                } else if (name.equals("backgroundcolor")) {
                                         o = "transparent";
-                                else if (name.equals("foregroundcolor"))
+                                } else if (name.equals("foregroundcolor")) {
                                         o = "auto";
-                                else
+                                } else {
                                         o = "";
+                                }
                         } else {
                                 return null;
@@ -469 +472 @@
                 if (o instanceof Integer) {
                         Integer i = (Integer) o;
-                        if (i == Item.DEFAULT_INTEGER)
+                        if (i == Item.DEFAULT_INTEGER) {
                                 return null;
+                        }
                         if (a.getter.getName().endsWith("Justification")
-                                        && ((Justification) o).toString() != null)
+                                        && ((Justification) o).toString() != null) {
                                 o = ((Justification) o).toString();
                         // -1 indicates default value
-                        else
+                        } else {
                                 o = i;
+                        }
                 } else if (o instanceof Float) {
                         if (((Float) o) < -0.0001)
+                         {
                                 return null;
                         // Null indicates default
                         // o = Math.round((Float) o);
+                        }
                 } else if (o instanceof Double) {
                         // -1 indicates default value
-                        if (((Double) o) < 0.0001)
+                        if (((Double) o) < 0.0001) {
                                 return null;
+                        }
                 } else if (o instanceof Colour) {
                         // converts the color to the Expeditee code
                         o = Conversion.getExpediteeColorCode((Colour) o);
-                        if (o == null)
+                        if (o == null) {
                                 return null;
+                        }
                 } else if (o instanceof Point) {
                         Point p = (Point) o;
@@ -498 +507 @@
 
                         String s = f.getFamilyName() + "-";
-                        if (f.isPlain())
+                        if (f.isPlain()) {
                                 s += "Plain";
-
-                        if (f.isBold())
+                        }
+
+                        if (f.isBold()) {
                                 s += "Bold";
-
-                        if (f.isItalic())
+                        }
+
+                        if (f.isItalic()) {
                                 s += "Italic";
+                        }
 
                         s += "-" + f.getSize();
@@ -514 +526 @@
                         List list = (List) o;
                         StringBuffer sb = new StringBuffer();
-                        for (Object ob : list)
+                        for (Object ob : list) {
                                 // TODO check that this works ok
                                 if (sb.length() == 0) {
@@ -521 +533 @@
                                         sb.append('\n').append(a.displayName).append(AttributeValuePair.SEPARATOR_STRING).append(ob);
                                 }
+                        }
                         return sb.toString();
                 } else if (o instanceof int[]) {
@@ -532 +545 @@
                 } else if (o instanceof Boolean) {
                         // true is the default for boolean values
-                        if (((Boolean) o).booleanValue())
+                        if (((Boolean) o).booleanValue()) {
                                 return null;
+                        }
                 }
                 return o.toString();
@@ -557 +571 @@
                         int minAttributeLength) {
                 // error checking
-                if (toSet == null || attribs == null)
+                if (toSet == null || attribs == null) {
                         return false;
+                }
 
                 ensureReady();
@@ -589 +604 @@
                         // attribute merging
                         if (!avp.hasAttribute()
-                                        || avp.getAttribute().length() < minAttributeLength)
+                                        || avp.getAttribute().length() < minAttributeLength) {
                                 return false;
+                        }
 
                         // check if the next string is another attribute to merge or a
@@ -699 +715 @@
                 // if there are duplicate methods with the same name
                 List<Method> possibles = new LinkedList<Method>();
-                if (a.setter.getDeclaringClass().isInstance(toSet))
+                if (a.setter.getDeclaringClass().isInstance(toSet)) {
                         possibles.add(a.setter);
+                }
                 int i = 0;
                 while (attribSet.containsKey(attribute + i)) {
@@ -741 +758 @@
 
                 if(possibles.size() == 0){
-                        if(invokeAttributeGetMethod(avp.getAttribute(), toSet) == null)
+                        if(invokeAttributeGetMethod(avp.getAttribute(), toSet) == null) {
                                 throw new NoSuchAttributeException(avp.getAttribute(), toSet.getClass().getSimpleName());
+                        }
                         throw new ReadOnlyAttributeException(avp.getAttribute(), toSet.getClass().getSimpleName());
                 }