Changeset 671

Timestamp:

01/09/14 11:50:49 (10 years ago)

Author:

jts21

Message:

Fix frame attribute setting (was using item attribute list where frame list should have been used)

File:

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

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

@@ -340 +340 @@
                 ensureReady();
 
-                AttributeSet as = null;
+                AttributeSet attribSet = null;
                 if(toExtract instanceof Frame) {
-                        as = _FrameAttrib;
+                        attribSet = _FrameAttrib;
                 } else if(toExtract instanceof Item) {
-                        as = _Attrib;
+                        attribSet = _Attrib;
                 } else {
                         throw new IncorrectTypeException("toExtract", "Item | Frame");
@@ -353 +353 @@
 
                 // iterate through the list of methods
-                for (String prop : as.keys) {
-
-                        Attribute a = as.get(prop);
+                for (String prop : attribSet.keys) {
+
+                        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())) {
@@ -527 +527 @@
 
                 ensureReady();
+                
+                AttributeSet attribSet = null;
+                if(toSet instanceof Frame) {
+                        attribSet = _FrameAttrib;
+                } else if(toSet instanceof Item) {
+                        attribSet = _Attrib;
+                } else {
+                        throw new IncorrectTypeException("toExtract", "Item | Frame");
+                }
 
                 // if(attribs.isAnnotation())
@@ -585 +594 @@
                                                 return false;
                                         } else {
-                                                Attribute a = _Attrib.get(stripped);
+                                                Attribute a = attribSet.get(stripped);
                                                 if(a == null || a.setter == null) {
                                                         return false;
@@ -628 +637 @@
                 String value = avp.getValue();
                 assert (value != null);
+                
+                AttributeSet attribSet = null;
+                if(toSet instanceof Frame) {
+                        attribSet = _FrameAttrib;
+                } else if(toSet instanceof Item) {
+                        attribSet = _Attrib;
+                } else {
+                        throw new IncorrectTypeException("toExtract", "Item | Frame");
+                }
 
                 // Some properties are ignored when multiple attributes are being set on
@@ -638 +656 @@
                 // Separate multiple values if required
                 
-                Attribute a = _Attrib.get(attribute);
+                Attribute a = attribSet.get(attribute);
                 // if this is not the name of a method, it may be the name of an agent
                 if (a == null || a.setter == null) {
@@ -650 +668 @@
                         possibles.add(a.setter);
                 int i = 0;
-                while (_Attrib.containsKey(attribute + i)) {
-                        Method m = _Attrib.get(attribute + i).setter;
+                while (attribSet.containsKey(attribute + i)) {
+                        Method m = attribSet.get(attribute + i).setter;
                         if(m == null) {
                                 break;
@@ -699 +717 @@
         private static Object invokeAttributeGetMethod(String name, Object toSet) {
                 
-                Attribute a = _Attrib.get(name.toLowerCase());
+                AttributeSet attribSet = null;
+                if(toSet instanceof Frame) {
+                        attribSet = _FrameAttrib;
+                } else if(toSet instanceof Item) {
+                        attribSet = _Attrib;
+                } else {
+                        throw new IncorrectTypeException("toExtract", "Item | Frame");
+                }
+                
+                Attribute a = attribSet.get(name.toLowerCase());
                 if(a == null) {
                         return null;