Changeset 33118 in osm for applications/editors/josm/plugins

Timestamp:

2017-01-19T00:08:10+01:00 (8 years ago)

Author:

donvip

Message:

see #josm13302 - potential fix, unable to test for sure

Location:

applications/editors/josm/plugins/print

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintDialog.java (modified) (5 diffs)
• test (added)
• test/unit (added)
• test/unit/org (added)
• test/unit/org/openstreetmap (added)
• test/unit/org/openstreetmap/josm (added)
• test/unit/org/openstreetmap/josm/plugins (added)
• test/unit/org/openstreetmap/josm/plugins/print (added)
• test/unit/org/openstreetmap/josm/plugins/print/PrintDialogTest.java (added)

applications/editors/josm/plugins/print/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="test/unit"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java

@@ -15 +15 @@
 import java.awt.print.PrinterException;
 import java.awt.print.PrinterJob;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.text.ParseException;
@@ -58 +60 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -490 +493 @@
 
     @SuppressWarnings("unchecked")
-    protected Attribute unmarshallPrintSetting(Collection<String> setting) throws
+    static Attribute unmarshallPrintSetting(Collection<String> setting) throws
         ClassNotFoundException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
 
@@ -505 +508 @@
         } else if (syntax.equals(EnumSyntax.class)) {
             int intValue = Integer.parseInt(value);
+            // First method - access static enum fields by reflection for classes that do not implement getEnumValueTable
             for (Field f : realClass.getFields()) {
                 if (Modifier.isStatic(f.getModifiers()) && category.isAssignableFrom(f.getType())) {
@@ -513 +517 @@
                 }
             }
-            throw new IllegalArgumentException("Invalid enum: "+realClass+" - "+value);
+            // Second method - get instance from getEnumValueTable by reflection
+            try {
+                Method getEnumValueTable = realClass.getDeclaredMethod("getEnumValueTable");
+                Constructor<? extends Attribute> constructor = realClass.getDeclaredConstructor(int.class);
+                Utils.setObjectsAccessible(getEnumValueTable, constructor);
+                Attribute fakeInstance = constructor.newInstance(Integer.MAX_VALUE);
+                EnumSyntax[] enumTable = (EnumSyntax[]) getEnumValueTable.invoke(fakeInstance);
+                return (Attribute) enumTable[intValue];
+            } catch (ReflectiveOperationException | ArrayIndexOutOfBoundsException e) {
+                throw new IllegalArgumentException("Invalid enum: "+realClass+" - "+value, e);
+            }
         } else if (syntax.equals(IntegerSyntax.class)) {
             return realClass.getConstructor(int.class).newInstance(Integer.parseInt(value));