Changeset 7103 in josm for trunk/src/org

Timestamp:

2014-05-11T01:32:10+02:00 (10 years ago)

Author:

Don-vip

Message:

fix potential exception in ExpressionFactory initialization (not sure if this is the root cause of tests failing since r7099 with a NoClassDefFoundError)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -45 +45 @@
     static @interface NullableArguments {}
 
-    private static final List<Method> arrayFunctions;
-    private static final List<Method> parameterFunctions;
-    private static final List<Method> parameterFunctionsEnv;
+    private static final List<Method> arrayFunctions = new ArrayList<>();
+    private static final List<Method> parameterFunctions = new ArrayList<>();
+    private static final List<Method> parameterFunctionsEnv = new ArrayList<>();
 
     static {
-        arrayFunctions = new ArrayList<>();
-        parameterFunctions = new ArrayList<>();
-        parameterFunctionsEnv = new ArrayList<>();
         for (Method m : Functions.class.getDeclaredMethods()) {
             Class<?>[] paramTypes = m.getParameterTypes();
             if (paramTypes.length == 1 && paramTypes[0].isArray()) {
                 arrayFunctions.add(m);
+            } else if (paramTypes.length >= 1 && paramTypes[0].equals(Environment.class)) {
+                parameterFunctionsEnv.add(m);
             } else {
-                if (paramTypes[0].equals(Environment.class)) {
-                    parameterFunctionsEnv.add(m);
-                } else {
-                    parameterFunctions.add(m);
-                }
+                parameterFunctions.add(m);
             }
         }
@@ -98 +93 @@
     /**
      * List of functions that can be used in MapCSS expressions.
-     * 
+     *
      * First parameter can be of type {@link Environment} (if needed). This is
      * automatically filled in by JOSM and the user only sees the remaining
@@ -280 +275 @@
             return Utils.color_int2float(c.getAlpha());
         }
-        
+
         /**
          * Assembles the strings to one.
@@ -736 +731 @@
         }
     }
-    
+
     /**
      * Function that takes a certain number of argument with specific type.
@@ -762 +757 @@
         public Object evaluate(Environment env) {
             Object[] convertedArgs;
-            
+
             if (needsEnvironment) {
                 convertedArgs = new Object[args.size()+1];