Changeset 2814 in josm

Timestamp:

2010-01-11T17:15:10+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #4347 - merging 2 nodes produces ERROR

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

@@ -47 +47 @@
         gc.weighty = 0.0;
         pnl.add(cbShowTagsWithConflictsOnly = new JCheckBox(tr("Show tags with conflicts only")), gc);
+        pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc);
         cbShowTagsWithConflictsOnly.addChangeListener(
                 new ChangeListener() {
@@ -58 +59 @@
                 Main.pref.getBoolean(getClass().getName() + ".showTagsWithConflictsOnly", false)
         );
-        pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc);
         cbShowTagsWithMultiValuesOnly.addChangeListener(
                 new ChangeListener() {