Changeset 987

Timestamp:

12/18/15 14:30:10 (8 years ago)

Author:

davidb

Message:

Changed to 'lower-tech' way of doing this, as the line that had to be commented out was causing a syntax error about type-casting

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (2 diffs)

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

@@ -20 +20 @@
 
 import java.awt.GraphicsEnvironment;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.rmi.UnexpectedException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -444 +446 @@
                                         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 ArrayList<Class<?>> typeOrder = Arrays.asList(Integer.TYPE, Double.TYPE, Float.TYPE, String.class);
+                                        // The above line doesn't compile in Eclipse Mars with the compile set to v1.8
+                                        // So changed to the following (low-tech) way:
+                                        ArrayList<Class<?>> typeOrder = new ArrayList<Class<?>>();
+                                        typeOrder.add(Integer.TYPE);
+                                        typeOrder.add(Double.TYPE);
+                                        typeOrder.add(Float.TYPE);
+                                        typeOrder.add(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];