Changeset 1865 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

Timestamp:

2009-07-28T19:48:39+02:00 (15 years ago)

Author:

Gubaer

Message:

replaced JOptionPane.show* by OptionPaneUtil.show*
ExtendeDialog now always on top, too

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) (6 diffs)

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

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.visitor.MapPaintVisitor;
 import org.openstreetmap.josm.gui.MapScaler;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -81 +82 @@
         Map<String, String> colorKeyList_layer = new TreeMap<String, String>();
         for(String key : colorMap.keySet()) {
-            if(key.startsWith("layer "))
+            if(key.startsWith("layer ")) {
                 colorKeyList_layer.put(getName(key), key);
-            else if(key.startsWith("mappaint."))
+            } else if(key.startsWith("mappaint.")) {
                 colorKeyList_mappaint.put(getName(key), key);
-            else
+            } else {
                 colorKeyList.put(getName(key), key);
+            }
         }
         for (Entry<String, String> k : colorKeyList.entrySet()) {
@@ -155 +157 @@
                 int sel = colors.getSelectedRow();
                 JColorChooser chooser = new JColorChooser((Color)colors.getValueAt(sel, 1));
-                int answer = JOptionPane.showConfirmDialog(gui, chooser,
-                tr("Choose a color for {0}", getName((String)colors.getValueAt(sel, 0))),
-                JOptionPane.OK_CANCEL_OPTION);
-                if (answer == JOptionPane.OK_OPTION)
+                int answer = OptionPaneUtil.showConfirmationDialog(
+                        gui, chooser,
+                        tr("Choose a color for {0}", getName((String)colors.getValueAt(sel, 0))),
+                        JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.PLAIN_MESSAGE);
+                if (answer == JOptionPane.OK_OPTION) {
                     colors.setValueAt(chooser.getColor(), sel, 1);
+                }
             }
         });
@@ -168 +173 @@
                 String name = (String)colors.getValueAt(sel, 0);
                 Color c = Main.pref.getDefaultColor(name);
-                if (c != null)
+                if (c != null) {
                     colors.setValueAt(c, sel, 1);
+                }
             }
         });
@@ -177 +183 @@
                 for(int i = 0; i < colors.getRowCount(); ++i)
                 {
-                  String name = (String)colors.getValueAt(i, 0);
-                  Color c = Main.pref.getDefaultColor(name);
-                  if (c != null)
-                      colors.setValueAt(c, i, 1);
+                    String name = (String)colors.getValueAt(i, 0);
+                    Color c = Main.pref.getDefaultColor(name);
+                    if (c != null) {
+                        colors.setValueAt(c, i, 1);
+                    }
                 }
             }
@@ -257 +264 @@
     public boolean ok() {
         Boolean ret = false;
-        for(String d : del)
+        for(String d : del) {
             Main.pref.put("color."+d, null);
+        }
         for (int i = 0; i < colors.getRowCount(); ++i) {
             String key = (String)colors.getValueAt(i, 0);
             if(Main.pref.putColor(key, (Color)colors.getValueAt(i, 1)))
             {
-                if(key.startsWith("mappaint."))
+                if(key.startsWith("mappaint.")) {
                     ret = true;
+                }
             }
         }