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

Timestamp:

01/26/21 09:45:54 (3 years ago)

Author:

bnemhaus

Message:

With a Item under your cursor, pressing left and right mouse buttons at the same time, extracts the properties of that item. (No change)
However, if an Item is attached to the users cursor when doing this, nothing happens. Now, instead of nothing happening, all attached Items are checked to see if they are in the format of "Property:". If they are then those specified properties are extracted.

File:

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

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

@@ -22 +22 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -427 +428 @@
                         throw new IncorrectTypeException("toExtract", "Item | Frame");
                 }
-
+                
+                // If there are Items attached to cursor, extract only those properties being asked for
+                if (FreeItems.hasItemsAttachedToCursor()) {
+                        extractSpecifiedAttributes(toExtract, attribSet);
+                        return null;
+                }
+                
                 // StringBuffer to store all the extracted Attribute:Value pairs
                 StringBuffer attributes = new StringBuffer();
@@ -468 +475 @@
         }
 
+        /**
+         * Extracts only the attributes specified by the FreeItems.  
+         * Designed to be called exclusively from AttributeUtils::extractAttributes
+         * @param toExtract The Item or Frame to extract attributes from
+         * @param attributes The set of attributes to consult
+         */
+        private static void extractSpecifiedAttributes(Object toExtract, AttributeSet attributes) {
+                Collection<Text> textItemsOnCursor = FreeItems.getTextItems();
+                List<String> keys = attributes.keys;
+                
+                for (Text canditate: textItemsOnCursor) {
+                        String canditateContent = canditate.getText().trim();
+                        if (canditateContent.charAt(canditateContent.length() - 1) == ':') {
+                                String attributeName = canditateContent.substring(0, canditateContent.length() - 1);
+                                String attributeNameLower = attributeName.toLowerCase();
+                                if (keys.contains(attributeNameLower)) {
+                                        Attribute a = attributes.get(attributeNameLower);
+                                        // Make sure the classes of the methods match the item
+                                        if (a != null && a.getter != null && a.getter.getDeclaringClass().isAssignableFrom(toExtract.getClass())) {     
+                                                String value = getValue(attributeNameLower, a, toExtract, true);
+                                                if (value == null) {
+                                                        continue;
+                                                }
+                                                canditate.setText(attributeName + ": " + value);
+                                        }
+                                }
+                        }
+                }
+        }
+                
         /**
          * Gets a string form of the value for a given item get method.