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

Timestamp:

30.08.2009 19:07:24 (3 years ago)

Author:

Gubaer

Message:

removed OptionPaneUtil
cleanup of deprecated Layer API
cleanup of deprecated APIs in OsmPrimitive and Way
cleanup of imports

File:

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

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

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Pair;
@@ -74 +73 @@
 
         if (selectedNodes.size() < 2) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Please select at least two nodes to merge."),
@@ -250 +249 @@
                 w.visit(backRefs);
                 if (!backRefs.data.isEmpty()) {
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent,
                             tr("Cannot merge nodes: " +