Changeset 13509 in josm

Timestamp:

2018-03-06T23:51:12+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16060 - NPE + minor fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/I18n.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java

@@ -55 +55 @@
 
     protected final boolean canDownload() {
+        if (editor.getRelation() == null)
+            return false;
         DataSet ds = editor.getRelation().getDataSet();
         return !Main.isOffline(OnlineResource.OSM_API)

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

@@ -10 +10 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.text.MessageFormat;

trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java

@@ -31 +31 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().devAPI().timeout(20000);
+    public JOSMTestRules test = new JOSMTestRules().preferences().devAPI().timeout(30000);
 
     /**