Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/gui/download

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/gui/download

Files:

• BookmarkSelection.java (modified) (5 diffs)
• BoundingBoxSelection.java (modified) (1 diff)
• PlaceSelection.java (modified) (3 diffs)
• SlippyMapChooser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 import javax.swing.DefaultListModel;
@@ -23 +23 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.BookmarkList;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -79 +78 @@
 
                 if (tempBookmark == null) {
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent,
                             tr("Please enter the desired coordinates first."),
@@ -87 +86 @@
                     return;
                 }
-                tempBookmark.name = OptionPaneUtil.showInputDialog(
+                tempBookmark.name = JOptionPane.showInputDialog(
                         Main.parent,tr("Please enter a name for the location."),
                         tr("Name of location"),
@@ -104 +103 @@
                 Object sel = bookmarks.getSelectedValue();
                 if (sel == null) {
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent,
                             tr("Select a bookmark first."),

trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -17 +17 @@
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.DocumentEvent;
 
 import org.openstreetmap.josm.data.Bounds;

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -32 +32 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
-import org.openstreetmap.josm.gui.download.DownloadDialog;
-import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.tools.GBC;
 import org.xml.sax.Attributes;
@@ -167 +164 @@
                     if(searchtext.length()==0)
                     {
-                        OptionPaneUtil.showMessageDialog(
+                        JOptionPane.showMessageDialog(
                                 Main.parent,
                                 tr("Please enter a search string"),
@@ -191 +188 @@
                 {
                     x.printStackTrace();
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent,
                             tr("Cannot read place search results from server"),

trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

@@ -13 +13 @@
 import java.awt.Rectangle;
 import java.awt.Toolkit;
-import java.awt.geom.Point2D;
 import java.util.Vector;