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

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

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

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

@@ -6 +6 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.LineSegment;
+import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
@@ -32 +32 @@
          */
         private final NavigatableComponent nc;
-        
+
         /**
          * Construct the painter visitor.
@@ -42 +42 @@
                 this.nc = mv;
         }
-        
+
         /**
          * Draw a small rectangle. 
@@ -50 +50 @@
          */
         public void visit(Node n) {
-                drawNode(n, n.isSelected() ? getPreferencesColor("selected", Color.WHITE)
+                drawNode(n, n.selected ? getPreferencesColor("selected", Color.WHITE)
                                 : getPreferencesColor("node", Color.RED));
         }
@@ -58 +58 @@
          * White if selected (as always) or green otherwise.
          */
-        public void visit(LineSegment ls) {
-                drawLineSegment(ls, getPreferencesColor("segment", darkgreen));
+        public void visit(Segment ls) {
+                drawSegment(ls, getPreferencesColor("segment", darkgreen));
         }
 
         /**
-         * Draw a darkblue line for all line segments.
-         * @param t The way to draw.
+         * Draw a darkblue line for all segments.
+         * @param w The way to draw.
          */
-        public void visit(Way t) {
+        public void visit(Way w) {
                 // only to overwrite with blue
                 Color wayColor = getPreferencesColor("way", darkblue);
-                for (LineSegment ls : t.segments) {
+                for (Segment ls : w.segments) {
                         if (ls.incomplete) {
                                 wayColor = getPreferencesColor("incomplete way", darkerblue);
@@ -75 +75 @@
                         }
                 }
-                for (LineSegment ls : t.segments)
-                        if (!ls.isSelected()) // selected already in good color
-                                drawLineSegment(ls, t.isSelected() ? getPreferencesColor("selected", Color.WHITE) : wayColor);
+                for (Segment ls : w.segments)
+                        if (!ls.selected) // selected already in good color
+                                drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.WHITE) : wayColor);
         }
 
@@ -95 +95 @@
          * Draw a line with the given color.
          */
-        private void drawLineSegment(LineSegment ls, Color col) {
+        private void drawSegment(Segment ls, Color col) {
                 if (ls.incomplete)
                         return;
-                if (ls.isSelected())
+                if (ls.selected)
                         col = getPreferencesColor("selected", Color.WHITE);
                 g.setColor(col);
@@ -105 +105 @@
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
         }
-        
-        private Color getPreferencesColor(String colName, Color def) {
+
+        public static Color getPreferencesColor(String colName, Color def) {
                 String colStr = Main.pref.get("color."+colName);
                 if (colStr.equals(""))