Changeset 10853 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

Timestamp:

2016-08-19T03:43:18+02:00 (10 years ago)

Author:

Don-vip

Message:

see #13309 - fix most of deprecation warnings

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -46 +46 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -158 +159 @@
     private class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
 
+        private final transient ColorProperty SHORTCUT_BACKGROUND_USER_COLOR = new ColorProperty(
+                marktr("Shortcut Background: User"),
+                new Color(200, 255, 200));
+        private final transient ColorProperty SHORTCUT_BACKGROUND_MODIFIED_COLOR = new ColorProperty(
+                marktr("Shortcut Background: Modified"),
+                new Color(255, 255, 200));
+
         private final boolean name;
 
@@ -175 +183 @@
             GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
             if (sc.isAssignedUser()) {
-                GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
-                        marktr("Shortcut Background: User"),
-                        new Color(200, 255, 200)));
+                GuiHelper.setBackgroundReadable(label, SHORTCUT_BACKGROUND_USER_COLOR.get());
             } else if (!sc.isAssignedDefault()) {
-                GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
-                        marktr("Shortcut Background: Modified"),
-                        new Color(255, 255, 200)));
+                GuiHelper.setBackgroundReadable(label, SHORTCUT_BACKGROUND_MODIFIED_COLOR.get());
             }
             return label;