Changeset 18283 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

Timestamp:

2021-10-17T15:17:42+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21427 - further simplify UploadDialog (patch by marcello, modified)

• The dialog was simplified by combining the function of two radiobuttons and one combobox into one combobox.
• When an open changeset was selected on tab 2, existing tags on the open changeset could overwrite the data the user entered on tab 1. The user might spot this by looking closely at the tag table on tab 2, but then he may not. This non-obvious behaviour was removed.
• The exception thrown when closing an already closed changeset was fixed.
• More cosmetic changes to the dialog.
• Maybe also a solution to #19319, #21387 (added revalidate()).

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -36 +36 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -89 +90 @@
                 // we are at the end. Append an empty row and move the focus to its second column
                 String key = ((TagModel) model.getValueAt(row, 0)).getName();
-                if (!key.trim().isEmpty()) {
+                if (!Utils.isStripEmpty(key)) {
                     model.appendNewTag();
                     col = 0;
@@ -243 +244 @@
             }
             final int rowIdx = model.getRowCount()-1;
-            if (rowIdx < 0 || !((TagModel) model.getValueAt(rowIdx, 0)).getName().trim().isEmpty()) {
+            if (rowIdx < 0 || !Utils.isStripEmpty(((TagModel) model.getValueAt(rowIdx, 0)).getName())) {
                 model.appendNewTag();
             }