Changeset 804 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2008-08-17T14:45:48+02:00 (17 years ago)

Author:

stoecker

Message:

cleanup color preferences a lot

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor

Files:

• MapPaintVisitor.java (modified) (1 diff)
• SimplePaintVisitor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -370 +370 @@
     // Shows areas before non-areas
     public void visitAll(DataSet data) {
-        inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY);
-        selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.YELLOW);
-        nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED);
-        dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue);
-        incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue);
-        backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK);
-        untaggedColor = Preferences.getPreferencesColor(marktr("untagged"),Color.GRAY);
-        textColor = Preferences.getPreferencesColor (marktr("text"), Color.WHITE);
+        inactiveColor = Main.pref.getColor(marktr("inactive"), Color.DARK_GRAY);
+        selectedColor = Main.pref.getColor(marktr("selected"), Color.YELLOW);
+        nodeColor = Main.pref.getColor(marktr("node"), Color.RED);
+        dfltWayColor = Main.pref.getColor(marktr("way"), darkblue);
+        incompleteColor = Main.pref.getColor(marktr("incomplete way"), darkerblue);
+        backgroundColor = Main.pref.getColor(marktr("background"), Color.BLACK);
+        untaggedColor = Main.pref.getColor(marktr("untagged"),Color.GRAY);
+        textColor = Main.pref.getColor (marktr("text"), Color.WHITE);
         showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
         showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -92 +92 @@
 
         public void visitAll(DataSet data) {
-                inactiveColor = Preferences.getPreferencesColor(marktr("inactive"), Color.DARK_GRAY);
-                selectedColor = Preferences.getPreferencesColor(marktr("selected"), Color.WHITE);
-                nodeColor = Preferences.getPreferencesColor(marktr("node"), Color.RED);
-                dfltWayColor = Preferences.getPreferencesColor(marktr("way"), darkblue);
-                relationColor = Preferences.getPreferencesColor(marktr("relation"), teal);
-                untaggedWayColor = Preferences.getPreferencesColor(marktr("untagged way"), darkgreen);
-                incompleteColor = Preferences.getPreferencesColor(marktr("incomplete way"), darkerblue);
-                backgroundColor = Preferences.getPreferencesColor(marktr("background"), Color.BLACK);
+                inactiveColor = Main.pref.getColor(marktr("inactive"), Color.DARK_GRAY);
+                selectedColor = Main.pref.getColor(marktr("selected"), Color.WHITE);
+                nodeColor = Main.pref.getColor(marktr("node"), Color.RED);
+                dfltWayColor = Main.pref.getColor(marktr("way"), darkblue);
+                relationColor = Main.pref.getColor(marktr("relation"), teal);
+                untaggedWayColor = Main.pref.getColor(marktr("untagged way"), darkgreen);
+                incompleteColor = Main.pref.getColor(marktr("incomplete way"), darkerblue);
+                backgroundColor = Main.pref.getColor(marktr("background"), Color.BLACK);
                 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
                 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");
@@ -344 +344 @@
          */
         public static Color getPreferencesColor(String name, Color dflt) {
-                return Preferences.getPreferencesColor(name, dflt);
+                return Main.pref.getColor(name, dflt);
         }
 }