Changeset 1677 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

Timestamp:

17.06.2009 10:04:22 (3 years ago)

Author:

stoecker

Message:

remove all these ugly tab stops introduced in the last half year

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -145 +145 @@
         for (HashSet<Node> nodelinks : backlinks.values()) {
             if (!nodelinks.containsAll(allNodes)) {
-                int option = new ExtendedDialog(Main.parent, 
-                        tr("Merge nodes with different memberships?"), 
+                int option = new ExtendedDialog(Main.parent,
+                        tr("Merge nodes with different memberships?"),
                         tr("The selected nodes have differing relation memberships.  "
                             + "Do you still want to merge them?"),
-                        new String[] {tr("Merge Anyway"), tr("Cancel")}, 
-                        new String[] {"mergenodes.png", "cancel.png"}).getValue();  
+                        new String[] {tr("Merge Anyway"), tr("Cancel")},
+                        new String[] {"mergenodes.png", "cancel.png"}).getValue();
                 if (option == 1) break;
                 return null;
@@ -186 +186 @@
 
         if (!components.isEmpty()) {
-            int answer = new ExtendedDialog(Main.parent, 
-                tr("Enter values for all conflicts."), 
+            int answer = new ExtendedDialog(Main.parent,
+                tr("Enter values for all conflicts."),
                 p,
-                new String[] {tr("Solve Conflicts"), tr("Cancel")}, 
-                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();  
+                new String[] {tr("Solve Conflicts"), tr("Cancel")},
+                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
             if (answer != 1)
                 return null;