Changeset 14319 in josm for trunk/src

Timestamp:

2018-10-13T02:11:26+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16831 - disable "Apply preset" button when no matching object is selected

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (2 diffs)

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

@@ -483 +483 @@
             return DIALOG_ANSWER_CANCEL;
         } else if (p.getComponentCount() != 0 && (sel.isEmpty() || p.hasElements)) {
-            String title = trn("Change {0} object", "Change {0} objects", sel.size(), sel.size());
-            if (!showNewRelation && sel.isEmpty()) {
+            int size = sel.size();
+            String title = trn("Change {0} object", "Change {0} objects", size, size);
+            if (!showNewRelation && size == 0) {
                 if (originalSelectionEmpty) {
                     title = tr("Nothing selected!");
@@ -492 +493 @@
             }
 
-            boolean disableApply = false;
-            if (!sel.isEmpty()) {
+            boolean disableApply = size == 0;
+            if (!disableApply) {
                 OsmData<?, ?, ?, ?> ds = sel.iterator().next().getDataSet();
                 disableApply = ds != null && ds.isLocked();