Changeset 976

Timestamp:

12/01/15 10:59:02 (8 years ago)

Author:

bln4

Message:

When deciding what action to run Actions.java now considers actions with the same parameter list by emphasising some parameter types over others. Integer -> Double -> Float -> String -> All others

Now doesn't try to map in a item if the item for some reason has a null bounding_rect. A error message is displayed if it finds a null.

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (4 diffs)
• io/flowlayout/XGroupItem.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Actions.java

@@ -24 +24 @@
 import java.lang.reflect.Modifier;
 import java.rmi.UnexpectedException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -42 +43 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
-import org.expeditee.items.Text;
 import org.expeditee.reflection.PackageLoader;
 import org.expeditee.simple.SString;
@@ -408 +408 @@
         public static Object PerformAction(final Frame source, final Item launcher,
                         final String command) throws Exception {
-                System.err.println("Running action: " + command + " with floating: " + launcher);
                 final String actionName = getName(command);
                 final String parameters = command.substring(actionName.length()).trim();
@@ -441 +440 @@
                         @Override
                         public int compare(final Method m1, final Method m2) {
-                                return m2.getParameterCount() - m1.getParameterCount();
+                                final int parameterCountDifference = m2.getParameterCount() - m1.getParameterCount();
+                                if(parameterCountDifference == 0) {
+                                        final Class<?>[] m1ParamTypes = m1.getParameterTypes();
+                                        final Class<?>[] m2ParamTypes = m2.getParameterTypes();
+                                        final List<Class<?>> typeOrder = Arrays.asList(Integer.TYPE, Double.TYPE, Float.TYPE, String.class);                                    
+                                        for(int i = 0,o = 0; i < m1ParamTypes.length && o < m2ParamTypes.length; i++,o++) {
+                                                final Class<?> m1ParamType = m1ParamTypes[i];
+                                                final Class<?> m2ParamType = m2ParamTypes[o];
+                                                final int m1ParamTypeIndex = typeOrder.indexOf(m1ParamType) != -1 ? 
+                                                                                typeOrder.indexOf(m1ParamType) : typeOrder.size();
+                                                final int m2ParamTypeIndex = typeOrder.indexOf(m2ParamType) != -1 ? 
+                                                                                typeOrder.indexOf(m2ParamType) : typeOrder.size();
+                                                final int paramMagnitude = m2ParamTypeIndex - m1ParamTypeIndex;
+                                                if(paramMagnitude != 0) return paramMagnitude;
+                                        }
+                                }
+                                return parameterCountDifference;
                         }
                 });

trunk/src/org/expeditee/io/flowlayout/XGroupItem.java

@@ -143 +143 @@
                         // overspill can occur (and is acceptable) when raw-text item spills
                         // out of enclosing shape (such as a rectangle)
-                        mapInItem(x_raw_item);
+                        if(x_raw_item.bounding_rect == null) {
+                                final StringBuilder errorMsg = 
+                                                new StringBuilder("Was about to try mapInItem(XRawItem) but found a null bounding_rect.  Item details: ");
+                                final String nl = System.getProperty("line.separator");
+                                errorMsg.append("\t Item parent: "                      + text_item.getParent() + nl);
+                                errorMsg.append("\t Item position: "            + text_item.getPosition() + nl);
+                                errorMsg.append("\t Item text content: "        + text_item.getText() + nl);
+                                System.err.println(errorMsg.toString());
+                        }
+                        else mapInItem(x_raw_item);
                 }