Changeset 329 in josm for branch/0.5/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2007-09-24T01:36:24+02:00 (17 years ago)

Author:

framm

Message:

This commit is a manual merge of all changes that have been made to
the intermediate "core_0.5" branch on the main OSM repository,
bevore JOSM was moved to openstreetmap.de.

Changes incorporated here:

r4464@svn.openstreetmap.org
r4466@svn.openstreetmap.org
r4468@svn.openstreetmap.org
r4469@svn.openstreetmap.org
r4479@svn.openstreetmap.org

File:

• branch/0.5/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (4 diffs)

branch/0.5/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
@@ -88 +89 @@
                 add(buttonPanel, BorderLayout.SOUTH);
 
-                DataSet.listeners.add(new SelectionChangedListener(){
+                DataSet.selListeners.add(new SelectionChangedListener(){
                         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                                 displaylist.clearSelection();
@@ -130 +131 @@
                                 model.addElement(osm);
                 for (OsmPrimitive osm : this.conflicts.keySet())
-                        if (osm instanceof Segment)
-                                model.addElement(osm);
-                for (OsmPrimitive osm : this.conflicts.keySet())
                         if (osm instanceof Way)
                                 model.addElement(osm);
@@ -155 +153 @@
                                 g.drawRect(p.x-1, p.y-1, 2, 2);
                         }
-                        public void visit(Segment ls) {
-                                if (ls.incomplete)
-                                        return;
-                                Point p1 = nc.getPoint(ls.from.eastNorth);
-                                Point p2 = nc.getPoint(ls.to.eastNorth);
+                        public void visit(Node n1, Node n2) {
+                                Point p1 = nc.getPoint(n1.eastNorth);
+                                Point p2 = nc.getPoint(n2.eastNorth);
                                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
                         }
                         public void visit(Way w) {
-                                for (Segment ls : w.segments)
-                                        visit(ls);
+                                Node lastN = null;
+                                for (Node n : w.nodes) {
+                                        if (lastN == null) {
+                                                lastN = n;
+                                                continue;
+                                        }
+                                        visit(lastN, n);
+                                        lastN = n;
+                                }
+                        }
+                        public void visit(Relation e) {
+                                for (RelationMember em : e.members)
+                                        em.member.visit(this);
                         }
                 };