Changeset 2685 in osm for applications/editors/josm

Timestamp:

2007-04-29T23:35:57+02:00 (18 years ago)

Author:

damians

Message:

made it compile with new josm version, drawSegments with direction

Location:

applications/editors/josm/plugins/mappaint

Files:

• build.xml (modified) (1 diff)
• src/mappaint/MapPaintVisitor.java (modified) (5 diffs)

applications/editors/josm/plugins/mappaint/build.xml

@@ -2 +2 @@
 
         <!-- point to your JOSM directory -->
-        <property name="josm" location="../../../../editors/josm/dist/josm-custom.jar" />
+        <!-- <property name="josm" location="../../../../editors/josm/dist/josm-custom.jar" /> -->
+        <property name="josm" location="../josm/josm-latest.jar" ></property>
 
 

applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

@@ -1 +1 @@
 package mappaint;
+
+import java.util.Collection;
+import java.util.LinkedList;
 
 import java.awt.BasicStroke;
@@ -55 +58 @@
         @Override public void visit(Segment ls) {
                 if (isSegmentVisible(ls))
-                        drawSegment(ls, getPreferencesColor("untagged",Color.GRAY));
+                        drawSegment(ls, getPreferencesColor("untagged",Color.GRAY),Main.pref.getBoolean("draw.segment.direction"));
         }
 
@@ -183 +186 @@
          */
         // Altered - now specify width
-        @Override protected void drawSegment(Segment ls, Color col) {
+        @Override protected void drawSegment(Segment ls, Color col,boolean showDirection) {
                         drawSegment(ls,col,1);
         }
@@ -224 +227 @@
         // Shows areas before non-areas
         public void visitAll(DataSet data) {
+
+                Collection<Way> noAreaWays = new LinkedList<Way>();
                 for (final OsmPrimitive osm : data.segments)
                         if (!osm.deleted)
@@ -231 +236 @@
                         if (!osm.deleted && MapPaintPlugin.elemStyles.isArea(osm))
                                 osm.visit(this);
-
-                for (final OsmPrimitive osm : data.ways)
-                        if (!osm.deleted && !MapPaintPlugin.elemStyles.isArea(osm))
-                                osm.visit(this);
+                        else if (!osm.deleted)
+                                noAreaWays.add((Way)osm);
+
+                for (final OsmPrimitive osm : noAreaWays)
+                        osm.visit(this);
 
                 for (final OsmPrimitive osm : data.nodes)