Changeset 2039 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-09-03T15:13:20+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #3377: patch by xeen: Less warnings for JOSM

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• MergeNodesAction.java (modified) (1 diff)
• ShowStatusReportAction.java (modified) (3 diffs)

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

@@ -155 +155 @@
         for (HashSet<Node> nodelinks : backlinks.values()) {
             if (!nodelinks.containsAll(allNodes)) {
-                int option = new ExtendedDialog(Main.parent,
+                ExtendedDialog ed = 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();
-                if (option == 1) {
+                        new String[] {tr("Merge Anyway"), tr("Cancel")});
+                ed.setButtonIcons(new String[] {"mergenodes.png", "cancel.png"});
+                ed.setContent(tr("The selected nodes have differing relation memberships.  "
+                        + "Do you still want to merge them?"));
+                ed.showDialog();
+
+                if (ed.getValue() == 1) {
                     break;
                 }

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

@@ -73 +73 @@
                 while ((line = input.readLine()) != null) {
                     // Skip potential private information
-                    if (line.trim().toLowerCase().startsWith("osm-server.username"))
+                    if (line.trim().toLowerCase().startsWith("osm-server.username")) {
                         continue;
-                    if (line.trim().toLowerCase().startsWith("osm-server.password"))
+                    }
+                    if (line.trim().toLowerCase().startsWith("osm-server.password")) {
                         continue;
-                    if (line.trim().toLowerCase().startsWith("marker.show"))
+                    }
+                    if (line.trim().toLowerCase().startsWith("marker.show")) {
                         continue;
+                    }
 
                     text.append(line);
@@ -97 +100 @@
         sp.setPreferredSize(new Dimension(600, 500));
 
-        int result = new ExtendedDialog(Main.parent, tr(tr("Status Report")), sp,
-                new String[] {tr("Copy to clipboard and close"), tr("Close") },
-                new String[] {"copy.png", "cancel.png" }).getValue();
+        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+                tr("Status Report"),
+                new String[] {tr("Copy to clipboard and close"), tr("Close") });
+        ed.setButtonIcons(new String[] {"copy.png", "cancel.png" });
+        ed.setContent(sp);
+        ed.showDialog();
 
-        if(result != 1) return;
+        if(ed.getValue() != 1) return;
         try {
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
@@ -107 +113 @@
                         public void lostOwnership(Clipboard clipboard, Transferable contents) {}
                     }
-             );
+            );
         }
         catch (RuntimeException x) {}