Changeset 19597 in josm for trunk

Timestamp:

2026-07-23T18:26:32+02:00 (37 hours ago)

Author:

stoecker

Message:

fix #24693 - Allow values_from in presets to use plugin classes - patch by Zverikk

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/autofilter/AutoFilterRule.java (modified) (4 diffs)
• gui/tagging/presets/items/ComboMultiSelect.java (modified) (2 diffs)
• tools/ReflectionUtils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java

@@ -83 +83 @@
     /**
      * Returns true if there should be a filter button for OSM primitives which have no value for the key.
-     * @since xxx
+     * @since 19592
      */
     public boolean getNoValueFilter() {
@@ -93 +93 @@
      * @param value the numeric value to format
      * @return the formatted value
-     * @since xxx
+     * @since 19592
      */
     public String formatValue(Integer value) {
@@ -147 +147 @@
      * @return {@code this}
      * @throws NullPointerException if {@code extraKeys} is null
-     * @since xxx
+     * @since 19592
      */
     public AutoFilterRule setExtraKeys(List<String> extraKeys) {
@@ -161 +161 @@
      * @param directValuesOnly whether "inner" values from ranges (such as 6 and 7 for 5-8) should be omitted
      * @return a stream of numeric values
-     * @since xxx
+     * @since 19592
      */
     public IntStream getTagValuesForPrimitive(OsmPrimitive osm, boolean directValuesOnly) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -31 +31 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 
 /**
@@ -232 +233 @@
         if (classMethod.length == 2) {
             try {
-                Method method = Class.forName(classMethod[0]).getMethod(classMethod[1]);
+                Class<?> cl = ReflectionUtils.findClass(classMethod[0]);
+                if (cl == null) {
+                    Logging.error(tr("Broken tagging preset \"{0}-{1}\" - Java class {2} given in ''values_from'' was not found",
+                            key, text, classMethod[0]));
+                    return null;
+                }
+                Method method = cl.getMethod(classMethod[1]);
                 // Check method is public static String[] methodName()
                 int mod = method.getModifiers();
                 if (Modifier.isPublic(mod) && Modifier.isStatic(mod)
-                        && method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0) {
-                    return Arrays.asList((String[]) method.invoke(null));
-                } else {
-                    Logging.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is not \"{2}\"", key, text,
-                            "public static String[] methodName()"));
+                        && method.getReturnType().equals(String[].class)) {
+                    if (method.getParameterTypes().length == 0) {
+                        return Arrays.asList((String[]) method.invoke(null));
+                    } else if (method.getParameterTypes().length == 1 && method.getParameterTypes()[0].equals(String.class)) {
+                        return Arrays.asList((String[]) method.invoke(key));
+                    } else if (method.getParameterTypes().length == 2
+                            && method.getParameterTypes()[0].equals(String.class)
+                            && method.getParameterTypes()[1].equals(String.class)) {
+                        return Arrays.asList((String[]) method.invoke(key, originalValue));
+                    } else {
+                        Logging.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is not \"{2}\"", key, text,
+                                "public static String[] methodName()"));
+                    }
                 }
             } catch (ReflectiveOperationException e) {

trunk/src/org/openstreetmap/josm/tools/ReflectionUtils.java

@@ -61 +61 @@
     }
 
+    /**
+     * Find a class either in the default class loader or in plugins.
+     * @param name class name to search
+     * @return found class object, or null if it was not found
+     * @since 19597
+     */
+    public static Class<?> findClass(String name) {
+        try {
+            return Class.forName(name);
+        } catch (ClassNotFoundException e) {
+            Logging.trace(e);
+            for (ClassLoader cl : PluginHandler.getPluginClassLoaders()) {
+                try {
+                    return Class.forName(name, true, cl);
+                } catch (ClassNotFoundException ex) {
+                    Logging.trace(e);
+                }
+            }
+            return null;
+        }
+    }
+
     private static <T> T findCaller(Function<StackTraceElement, T> getter, Collection<T> exclusions) {
         StackTraceElement[] stack = Thread.currentThread().getStackTrace();