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

Timestamp:

06/05/08 10:11:18 (16 years ago)

Author:

ra33

Message:

Added DebugFrame action
Added GetCometStats
Lots of bug fixes

File:

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

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

@@ -77 +77 @@
                         _AllowNull = new LinkedList<Method>();
                         _AllowNull.add(Item.class.getMethod("getColor", param));
+                        _AllowNull.add(Item.class.getMethod("getBackgroundColor", param));
 
                         _AllowNull.add(Frame.class.getMethod("getBackgroundColor", param));
@@ -273 +274 @@
 
                         // Make sure the classes of the methods match the item
-                        if (m.getDeclaringClass() == toExtract.getClass()
-                                        || m.getDeclaringClass() == toExtract.getClass()
-                                                        .getSuperclass()) {
+                        if (m.getDeclaringClass().isAssignableFrom(toExtract.getClass())) {
                                 try {
                                         Object o = m.invoke(toExtract, (Object[]) null);
@@ -440 +439 @@
                 // if no paris exist, we are done
                 if (values.size() == 0
-                                || (values.size() == 1 && values.get(0).length() == 0))
+                                || (values.size() == 1 && values.get(0).length() == 0)) {
                         return false;
+                }
 
                 // loop through all attribute: value pairs
@@ -553 +553 @@
                 int i = 0;
                 while (_SetMethods.containsKey(attribute + i)) {
-                        if (_SetMethods.get(attribute + i).getDeclaringClass() == toSet
-                                        .getClass()
-                                        || _SetMethods.get(attribute + i).getDeclaringClass() == toSet
-                                                        .getClass().getSuperclass())
+                        if (_SetMethods.get(attribute + i).getDeclaringClass().isAssignableFrom(toSet.getClass()))
                                 possibles.add(_SetMethods.get(attribute + i));
                         i++;
@@ -564 +561 @@
                         Object current = null;
                         Object[] param = {};
-                        Class toSetClass = toSet.getClass();
-                        Class toSetSuperClass = toSetClass.getSuperclass();
                         // find the corresponding get method for this set method
                         // and get the current value of the attribute
                         for (Method m : _GetMethods) {
-                                if ((m.getDeclaringClass() == toSetClass || m
-                                                .getDeclaringClass() == toSetSuperClass)
+                                if (m.getDeclaringClass().isAssignableFrom(toSet.getClass())
                                                 && m.getName().substring(GET_LENGTH).equals(
                                                                 possible.getName().substring(SET_LENGTH))) {