Changeset 13496 in josm

Timestamp:

2018-03-04T14:19:16+01:00 (7 years ago)

Author:

Don-vip

Message:

minor fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -495 +495 @@
             if (!sel.isEmpty()) {
                 DataSet ds = sel.iterator().next().getDataSet();
-                if (ds != null) {
-                    disableApply = ds.isLocked();
-                }
+                disableApply = ds != null && ds.isLocked();
             }
             answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),

trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java

@@ -21 +21 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().fakeAPI().timeout(20000);
+    public JOSMTestRules test = new JOSMTestRules().platform().fakeAPI().timeout(30000);
 
     /**