Changeset 976 for trunk/src/org/expeditee
- Timestamp:
- 12/01/15 10:59:02 (9 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/Actions.java
r975 r976 24 24 import java.lang.reflect.Modifier; 25 25 import java.rmi.UnexpectedException; 26 import java.util.Arrays; 26 27 import java.util.Collection; 27 28 import java.util.Comparator; … … 42 43 import org.expeditee.items.Item; 43 44 import org.expeditee.items.ItemUtils; 44 import org.expeditee.items.Text;45 45 import org.expeditee.reflection.PackageLoader; 46 46 import org.expeditee.simple.SString; … … 408 408 public static Object PerformAction(final Frame source, final Item launcher, 409 409 final String command) throws Exception { 410 System.err.println("Running action: " + command + " with floating: " + launcher);411 410 final String actionName = getName(command); 412 411 final String parameters = command.substring(actionName.length()).trim(); … … 441 440 @Override 442 441 public int compare(final Method m1, final Method m2) { 443 return m2.getParameterCount() - m1.getParameterCount(); 442 final int parameterCountDifference = m2.getParameterCount() - m1.getParameterCount(); 443 if(parameterCountDifference == 0) { 444 final Class<?>[] m1ParamTypes = m1.getParameterTypes(); 445 final Class<?>[] m2ParamTypes = m2.getParameterTypes(); 446 final List<Class<?>> typeOrder = Arrays.asList(Integer.TYPE, Double.TYPE, Float.TYPE, String.class); 447 for(int i = 0,o = 0; i < m1ParamTypes.length && o < m2ParamTypes.length; i++,o++) { 448 final Class<?> m1ParamType = m1ParamTypes[i]; 449 final Class<?> m2ParamType = m2ParamTypes[o]; 450 final int m1ParamTypeIndex = typeOrder.indexOf(m1ParamType) != -1 ? 451 typeOrder.indexOf(m1ParamType) : typeOrder.size(); 452 final int m2ParamTypeIndex = typeOrder.indexOf(m2ParamType) != -1 ? 453 typeOrder.indexOf(m2ParamType) : typeOrder.size(); 454 final int paramMagnitude = m2ParamTypeIndex - m1ParamTypeIndex; 455 if(paramMagnitude != 0) return paramMagnitude; 456 } 457 } 458 return parameterCountDifference; 444 459 } 445 460 }); -
trunk/src/org/expeditee/io/flowlayout/XGroupItem.java
r975 r976 143 143 // overspill can occur (and is acceptable) when raw-text item spills 144 144 // out of enclosing shape (such as a rectangle) 145 mapInItem(x_raw_item); 145 if(x_raw_item.bounding_rect == null) { 146 final StringBuilder errorMsg = 147 new StringBuilder("Was about to try mapInItem(XRawItem) but found a null bounding_rect. Item details: "); 148 final String nl = System.getProperty("line.separator"); 149 errorMsg.append("\t Item parent: " + text_item.getParent() + nl); 150 errorMsg.append("\t Item position: " + text_item.getPosition() + nl); 151 errorMsg.append("\t Item text content: " + text_item.getText() + nl); 152 System.err.println(errorMsg.toString()); 153 } 154 else mapInItem(x_raw_item); 146 155 } 147 156
Note:
See TracChangeset
for help on using the changeset viewer.