Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.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/gui/layer/GpxLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -59 +59 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -135 +134 @@
                     group.setSelected(r[0].getModel(), true);
                 }
-                int answer = OptionPaneUtil.showConfirmationDialog(Main.parent, panel,
+                int answer = JOptionPane.showConfirmDialog(Main.parent, panel,
                         tr("Select line drawing options"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
                 switch (answer) {
@@ -159 +158 @@
                 JColorChooser c = new JColorChooser(getColor(getName()));
                 Object[] options = new Object[] { tr("OK"), tr("Cancel"), tr("Default") };
-                int answer = OptionPaneUtil.showOptionDialog(
+                int answer = JOptionPane.showOptionDialog(
                         Main.parent,
                         c,
@@ -165 +164 @@
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.PLAIN_MESSAGE,
+                        null,
                         options, options[0]
                 );
@@ -782 +782 @@
             msg.add(maxRect, GBC.eol());
 
-            int ret = OptionPaneUtil.showConfirmationDialog(
+            int ret = JOptionPane.showConfirmDialog(
                     Main.parent,
                     msg,
@@ -880 +880 @@
 
             if (toDownload.size() > 1) {
-                ret = OptionPaneUtil.showConfirmationDialog(
+                ret = JOptionPane.showConfirmDialog(
                         Main.parent,
                         msg,
@@ -970 +970 @@
         }
         if (firstTime < 0.0) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("No GPX track available in layer to associate audio with."),