Changeset 6535 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-26T10:09:54+01:00 (11 years ago)

Author:

simon04

Message:

fix #9475 see #9470 - NPE on startup - java.lang.reflect.InvocationTargetException

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (6 diffs)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -255 +255 @@
 
     /**
-     * Prints a formated error message if logging is on. Calls {@link MessageFormat#format}
+     * Prints a formatted error message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
-     * @param msg The formated message to print.
+     * @param msg The formatted message to print.
      * @param objects The objects to insert into format string.
      * @since 6248
@@ -266 +266 @@
 
     /**
-     * Prints a formated warning message if logging is on. Calls {@link MessageFormat#format}
+     * Prints a formatted warning message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
-     * @param msg The formated message to print.
+     * @param msg The formatted message to print.
      * @param objects The objects to insert into format string.
      */
@@ -276 +276 @@
 
     /**
-     * Prints a formated informational message if logging is on. Calls {@link MessageFormat#format}
+     * Prints a formatted informational message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
-     * @param msg The formated message to print.
+     * @param msg The formatted message to print.
      * @param objects The objects to insert into format string.
      */
@@ -286 +286 @@
 
     /**
-     * Prints a formated debug message if logging is on. Calls {@link MessageFormat#format}
+     * Prints a formatted debug message if logging is on. Calls {@link MessageFormat#format}
      * function to format text.
-     * @param msg The formated message to print.
+     * @param msg The formatted message to print.
      * @param objects The objects to insert into format string.
      */
@@ -302 +302 @@
     public static void error(Throwable t) {
         error(getErrorMessage(t));
+        t.printStackTrace();
     }
 
@@ -311 +312 @@
     public static void warn(Throwable t) {
         warn(getErrorMessage(t));
+        t.printStackTrace();
     }
 

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

@@ -79 +79 @@
     }
 
+    @SuppressWarnings("UnusedDeclaration")
     public static class Functions {
 
@@ -270 +271 @@
          */
         public String tag(String key) {
-            return env.osm.get(key);
+            return env.osm == null ? null : env.osm.get(key);
         }
 
@@ -278 +279 @@
         public String parent_tag(String key) {
             if (env.parent == null) {
-                // we don't have a matched parent, so just search all referrers
-                for (OsmPrimitive parent : env.osm.getReferrers()) {
-                    String value = parent.get(key);
-                    if (value != null) {
-                        return value;
+                if (env.osm != null) {
+                    // we don't have a matched parent, so just search all referrers
+                    for (OsmPrimitive parent : env.osm.getReferrers()) {
+                        String value = parent.get(key);
+                        if (value != null) {
+                            return value;
+                        }
                     }
                 }