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

trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -25 +23 @@
 import javax.swing.JList;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.GBC;
@@ -140 +137 @@
             iconadd.addActionListener(new ActionListener(){
                 public void actionPerformed(ActionEvent e) {
-                    String source = OptionPaneUtil.showInputDialog(
+                    String source = JOptionPane.showInputDialog(
                             Main.parent,
                             tr("Icon paths"),
@@ -156 +153 @@
                 public void actionPerformed(ActionEvent e) {
                     if (sourcesList.getSelectedIndex() == -1) {
-                        OptionPaneUtil.showMessageDialog(
+                        JOptionPane.showMessageDialog(
                                 Main.parent,
                                 tr("Please select the row to edit."),
@@ -163 +160 @@
                         );
                     } else {
-                        String source = (String)OptionPaneUtil.showInputDialog(
+                        String source = (String)JOptionPane.showInputDialog(
                                 Main.parent,
                                 tr("Icon paths"),
@@ -183 +180 @@
                 public void actionPerformed(ActionEvent e) {
                     if (iconsList.getSelectedIndex() == -1) {
-                        OptionPaneUtil.showMessageDialog(
+                        JOptionPane.showMessageDialog(
                                 Main.parent, tr("Please select the row to delete."),
                                 tr("Warning"),
@@ -197 +194 @@
         add.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
-                String source = OptionPaneUtil.showInputDialog(
+                String source = JOptionPane.showInputDialog(
                         Main.parent,
                         name,
@@ -212 +209 @@
             public void actionPerformed(ActionEvent e) {
                 if (sourcesList.getSelectedIndex() == -1) {
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent, tr("Please select the row to edit."),
                             tr("Warning"), JOptionPane.WARNING_MESSAGE);
                 } else {
-                    String source = (String)OptionPaneUtil.showInputDialog(
+                    String source = (String)JOptionPane.showInputDialog(
                             Main.parent,
                             name,
@@ -236 +233 @@
             public void actionPerformed(ActionEvent e) {
                 if (sourcesList.getSelectedIndex() == -1) {
-                    OptionPaneUtil.showMessageDialog(Main.parent, tr("Please select the row to delete."),
+                    JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."),
                             tr("Warning"), JOptionPane.WARNING_MESSAGE);
                 } else {
@@ -248 +245 @@
             public void actionPerformed(ActionEvent e) {
                 if (sourcesDefaults.getSelectedIndex() == -1) {
-                    OptionPaneUtil.showMessageDialog(
+                    JOptionPane.showMessageDialog(
                             Main.parent, tr("Please select the row to copy."),
                             tr("Warning"), JOptionPane.WARNING_MESSAGE);