Changeset 6315 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-10-07T20:04:50+02:00 (11 years ago)

Author:

simon04

Message:

fix #9068 - Don't warn about empty key and empty value in upload tags

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -457 +457 @@
             }
 
-            /* test for empty tags in the changeset metadata and proceed only after user's confirmation */
+            /* test for empty tags in the changeset metadata and proceed only after user's confirmation.
+             * though, accept if key and value are empty (cf. xor). */
             List<String> emptyChangesetTags = new ArrayList<String>();
             for (final Entry<String, String> i : pnlTagSettings.getTags(true).entrySet()) {
-                if (i.getKey() == null || i.getKey().trim().isEmpty()
-                        || i.getValue() == null || i.getValue().trim().isEmpty()) {
+                if ((i.getKey() == null || i.getKey().trim().isEmpty())
+                        ^ (i.getValue() == null || i.getValue().trim().isEmpty())) {
                     emptyChangesetTags.add(tr("{0}={1}", i.getKey(), i.getValue()));
                 }