Changeset 10899 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-08-25T23:21:10+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #13318 - Clean up program startup (parameters, logging) - patch by michael2402 - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Logging.java (added)
• bugreport/BugReport.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReport.java

@@ -6 +6 @@
 import java.io.StringWriter;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
@@ -185 +186 @@
      */
     public static String getCallingMethod(int offset) {
+        String className = BugReport.class.getName();
+        String methodName = "getCallingMethod";
+        StackTraceElement found = getCallingMethod(offset, className, methodName::equals);
+        if (found != null) {
+            return found.getClassName().replaceFirst(".*\\.", "") + '#' + found.getMethodName();
+        } else {
+            return "?";
+        }
+    }
+
+    /**
+     * Find the method that called the given method on the current stack trace.
+     * @param offset
+     *           How many methods to look back in the stack trace. 1 gives the method calling this method, 0 gives you getCallingMethod().
+     * @param className The name of the class to search for
+     * @param methodName The name of the method to search for
+     * @return The class and method name or null if it is unknown.
+     */
+    public static StackTraceElement getCallingMethod(int offset, String className, Predicate<String> methodName) {
         StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-        String className = BugReport.class.getName();
         for (int i = 0; i < stackTrace.length - offset; i++) {
             StackTraceElement element = stackTrace[i];
-            if (className.equals(element.getClassName()) && "getCallingMethod".equals(element.getMethodName())) {
+            if (className.equals(element.getClassName()) && methodName.test(element.getMethodName())) {
                 StackTraceElement toReturn = stackTrace[i + offset];
-                return toReturn.getClassName().replaceFirst(".*\\.", "") + '#' + toReturn.getMethodName();
+                return toReturn;
             }
         }
-        return "?";
+        return null;
     }