Changeset 608 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

Timestamp:

2008-04-17T03:03:28+02:00 (16 years ago)

Author:

framm

Message:

• new extrude mode allows creation of rectangular shapes
• new AlignInRectangle function
• additional information in status bar about length, heading, and angle of segment being drawn
• helper line from last node to mouse cursor (disable with edit.helper-line=false)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.util.Iterator;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -68 +69 @@
 
         public void visitAll(DataSet data) {
-                inactiveColor = getPreferencesColor("inactive", Color.DARK_GRAY);
-                selectedColor = getPreferencesColor("selected", Color.WHITE);
-                nodeColor = getPreferencesColor("node", Color.RED);
-                dfltWayColor = getPreferencesColor("way", darkblue);
-                untaggedWayColor = getPreferencesColor("untagged way", darkgreen);
-                incompleteColor = getPreferencesColor("incomplete way", darkerblue);
-                backgroundColor = getPreferencesColor("background", Color.BLACK);
+                inactiveColor = Preferences.getPreferencesColor("inactive", Color.DARK_GRAY);
+                selectedColor = Preferences.getPreferencesColor("selected", Color.WHITE);
+                nodeColor = Preferences.getPreferencesColor("node", Color.RED);
+                dfltWayColor = Preferences.getPreferencesColor("way", darkblue);
+                untaggedWayColor = Preferences.getPreferencesColor("untagged way", darkgreen);
+                incompleteColor = Preferences.getPreferencesColor("incomplete way", darkerblue);
+                backgroundColor = Preferences.getPreferencesColor("background", Color.BLACK);
                 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
                 showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");
@@ -226 +227 @@
                 return screen.intersects(bbox);
         }
-
-        public static Color getPreferencesColor(String colName, Color def) {
-                String colStr = Main.pref.get("color."+colName);
-                if (colStr.equals("")) {
-                        Main.pref.put("color."+colName, ColorHelper.color2html(def));
-                        return def;
-                }
-                return ColorHelper.html2color(colStr);
-        }
         
         public void setGraphics(Graphics g) {