Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-08-30T19:07:24+02:00 (15 years ago)

Author:

Gubaer

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (4 diffs)
• SelectionWebsiteLoader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -48 +47 @@
             return;
         if (Main.map == null) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Can't search because there is no loaded data."),
@@ -200 +199 @@
                 }
                 Main.map.statusLine.setHelpText(msg);
-                OptionPaneUtil.showMessageDialog(
+                JOptionPane.showMessageDialog(
                         Main.parent,
                         msg,
@@ -210 +209 @@
             }
         } catch (SearchCompiler.ParseError e) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     e.getMessage(),

trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java

@@ -20 +20 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmIdReader;
@@ -60 +59 @@
         } catch (IOException e) {
             e.printStackTrace();
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Could not read from URL: \"{0}\"",url),
@@ -68 +67 @@
         } catch (SAXException e) {
             e.printStackTrace();
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Parsing error in URL: \"{0}\"",url),
@@ -78 +77 @@
             if (e.getCause() != null) {
                 if (e.getCause() instanceof IOException ) {
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent, tr("Could not read from URL: \"{0}\"",url),
                             tr("Error"), JOptionPane.ERROR_MESSAGE);
                 } else if (e.getCause() instanceof SAXException) {
-                    OptionPaneUtil.showMessageDialog(Main.parent,tr("Parsing error in URL: \"{0}\"",url),
+                    JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in URL: \"{0}\"",url),
                             tr("Error"), JOptionPane.ERROR_MESSAGE);
                 }
             } else {
-                OptionPaneUtil.showMessageDialog(Main.parent,tr("Error while communicating with server.",url),
+                JOptionPane.showMessageDialog(Main.parent,tr("Error while communicating with server.",url),
                         tr("Error"), JOptionPane.ERROR_MESSAGE);
             }