Changeset 10853 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

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

Author:

Don-vip

Message:

see #13309 - fix most of deprecation warnings

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -77 +77 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
@@ -135 +136 @@
     public static final StringProperty PROPERTY_SAVE_EXTENSION = new StringProperty("save.extension.osm", "osm");
 
+    private static final ColorProperty PROPERTY_BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK);
+    private static final ColorProperty PROPERTY_OUTSIDE_COLOR = new ColorProperty(marktr("outside downloaded area"), Color.YELLOW);
 
     /** List of recent relations */
@@ -320 +323 @@
      */
     public static Color getBackgroundColor() {
-        return Main.pref != null ? Main.pref.getColor(marktr("background"), Color.BLACK) : Color.BLACK;
+        return PROPERTY_BACKGROUND_COLOR.get();
     }
 
@@ -328 +331 @@
      */
     public static Color getOutsideColor() {
-        return Main.pref != null ? Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW) : Color.YELLOW;
+        return PROPERTY_OUTSIDE_COLOR.get();
     }