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

Timestamp:

2009-12-20T16:19:03+01:00 (15 years ago)

Author:

jttt

Message:

Minor mappaint cleanup, use constants for colors

Location:

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

Files:

• . (added)
• MapPaintVisitor.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java ) (3 diffs)
• PaintColors.java (added)
• SimplePaintVisitor.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java ) (4 diffs)

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

@@ -1 +1 @@
 /* License: GPL. Copyright 2007 by Immanuel Scholz and others */
-package org.openstreetmap.josm.data.osm.visitor;
+package org.openstreetmap.josm.data.osm.visitor.paint;
 
 /* To enable debugging or profiling remove the double / signs */
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -41 +40 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
@@ -1248 +1248 @@
     {
         super.getColors();
-        untaggedColor = Main.pref.getColor(marktr("untagged"),Color.GRAY);
-        textColor = Main.pref.getColor (marktr("text"), Color.WHITE);
-        areaTextColor = Main.pref.getColor (marktr("areatext"), Color.LIGHT_GRAY);
+        untaggedColor = PaintColors.UNTAGGED.get();
+        textColor = PaintColors.TEXT.get();
+        areaTextColor = PaintColors.AREA_TEXT.get();
     }
 

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

@@ -1 +1 @@
 /* License: GPL. Copyright 2007 by Immanuel Scholz and others */
-package org.openstreetmap.josm.data.osm.visitor;
+package org.openstreetmap.josm.data.osm.visitor.paint;
 
 /* To enable debugging or profiling remove the double / signs */
-
-import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.BasicStroke;
@@ -26 +24 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 
@@ -35 +34 @@
  */
 public class SimplePaintVisitor extends AbstractVisitor {
-
-    public final static Color darkerblue = new Color(0,0,96);
-    public final static Color darkblue = new Color(0,0,128);
-    public final static Color darkgreen = new Color(0,128,0);
-    public final static Color teal = new Color(0,128,128);
-    public final static Color lightteal= new Color(0, 255, 186);
-
     /**
      * The environment to paint to.
@@ -92 +84 @@
     public void getColors()
     {
-        inactiveColor = Main.pref.getColor(marktr("inactive"), Color.darkGray);
-        selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
-        nodeColor = Main.pref.getColor(marktr("node"), Color.yellow);
-        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);
-        highlightColor = Main.pref.getColor(marktr("highlight"), lightteal);
+        inactiveColor = PaintColors.INACTIVE.get();
+        selectedColor = PaintColors.SELECTED.get();
+        nodeColor = PaintColors.NODE.get();
+        dfltWayColor = PaintColors.DEFAULT_WAY.get();
+        relationColor = PaintColors.RELATION.get();
+        untaggedWayColor = PaintColors.UNTAGGED_WAY.get();
+        incompleteColor = PaintColors.INCOMPLETE_WAY.get();
+        backgroundColor = PaintColors.BACKGROUND.get();
+        highlightColor = PaintColors.HIGHLIGHT.get();
     }