Changeset 8423 in josm for trunk

Timestamp:

2015-05-23T20:08:47+02:00 (10 years ago)

Author:

wiktorn

Message:

Fix unit tests and findbugs warning. Closes: #11466

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -1014 +1014 @@
             }
         }
-        regactions.put(toolbar, action);
+        if (toolbar != null) {
+            regactions.put(toolbar, action);
+        }
         return action;
     }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java

@@ -14 +14 @@
 import org.junit.Test;
 import org.openstreetmap.josm.actions.ActionParameter;
+import org.openstreetmap.josm.actions.ActionParameter.StringActionParameter;
 import org.openstreetmap.josm.actions.ParameterizedAction;
-import org.openstreetmap.josm.actions.ActionParameter.StringActionParameter;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionDefinition;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionParser;
@@ -61 +61 @@
         checkAction(parser.loadAction("action(param1=value1,"), "param1", "value1");
         checkAction(parser.loadAction("action(param1=value1"), "param1", "value1");
-        checkAction(parser.loadAction("action(param1="), "param1", "");
-        checkAction(parser.loadAction("action(param1"), "param1", "");
+        checkAction(parser.loadAction("action(param1="));
+        checkAction(parser.loadAction("action(param1"));
         checkAction(parser.loadAction("action("));
         checkAction(parser.loadAction("action"));