Changeset 203 in josm for src

Timestamp:

2007-02-17T17:09:49+01:00 (18 years ago)

Author:

imi

Message:

• Fixed a bug in the Merger/Conflict to auto-resolve marked changes without real changes
• Fixed bug in split way, that reversed the order of segments in one way.
• Fixed bug where dialogs did not update anymore after loading a dataset twice

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/AutoScaleAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (7 diffs)
• actions/mapmode/AddWayAction.java (modified) (1 diff)
• data/conflict/Merger.java (deleted)
• data/osm/DataSet.java (modified) (3 diffs)
• data/osm/Node.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Segment.java (modified) (1 diff)
• data/osm/Way.java (modified) (1 diff)
• data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• gui/MapView.java (modified) (2 diffs)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/HistoryDialog.java (modified) (1 diff)
• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -160 +160 @@
         public final void removeLayer(final Layer layer) {
                 map.mapView.removeLayer(layer);
-                if (layer instanceof OsmDataLayer)
-                        ds = new DataSet();
+                if (layer instanceof OsmDataLayer) {
+                        DataSet newDs = new DataSet();
+                        newDs.listeners.addAll(ds.listeners);
+                        ds = newDs;
+                }
                 if (map.mapView.getAllLayers().isEmpty())
                         setMapFrame(null);

src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -60 +60 @@
                 setCurrent(0);
                 this.mapFrame = mapFrame;
-                Main.ds.addSelectionChangedListener(new SelectionChangedListener(){
+                Main.ds.listeners.add(new SelectionChangedListener(){
                         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                                 if (mode.equals("selection"))

src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -98 +98 @@
         public SplitWayAction() {
                 super(tr("Split Way"), "splitway", tr("Split a way at the selected node."), KeyEvent.VK_P, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, true);
-                Main.ds.addSelectionChangedListener(this);
+                Main.ds.listeners.add(this);
         }
 
@@ -230 +230 @@
 
                 // finally check if the selected way is complete.
-                for (Segment s : selectedWay.segments) {
-                        if (s.incomplete) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("Warning: This way is incomplete. Try to download it before splitting."));
-                                return;
-                        }
+                if (selectedWay.isIncomplete()) {
+                        JOptionPane.showMessageDialog(Main.parent, tr("Warning: This way is incomplete. Try to download it before splitting."));
+                        return;
                 }
 
@@ -311 +309 @@
                                 // the moveSegments method.
                                 if (split) {
-                                        ArrayList<Segment> subSegments = new ArrayList<Segment>();
+                                        LinkedList<Segment> subSegments = new LinkedList<Segment>();
                                         moveSegments(allSegments, subSegments, splitSeg, selectedNodes);
                                         segmentSets.add(subSegments);
@@ -356 +354 @@
                         partThatContainsSegments.removeAll(selectedSegments);
                         if (!partThatContainsSegments.isEmpty()) {
-                                ArrayList<Segment> contiguousSubpart = new ArrayList<Segment>();
+                                LinkedList<Segment> contiguousSubpart = new LinkedList<Segment>();
                                 moveSegments(partThatContainsSegments, contiguousSubpart, partThatContainsSegments.get(0), null);
                                 // if partThatContainsSegments was contiguous before, it will now be empty as all segments
@@ -380 +378 @@
 
                         while (!allSegments.isEmpty()) {
-                                List<Segment> subSegments = new LinkedList<Segment>();
+                                LinkedList<Segment> subSegments = new LinkedList<Segment>();
                                 moveSegments(allSegments, subSegments, allSegments.get(0), null);
                                 segmentSets.add(subSegments);
@@ -465 +463 @@
          * @param stopNodes collection of nodes which should be considered end points for moving (may be null).
          */
-        private void moveSegments(Collection<Segment> source, Collection<Segment> destination, Segment start, Collection<Node> stopNodes) {
+        private void moveSegments(Collection<Segment> source, LinkedList<Segment> destination, Segment start, Collection<Node> stopNodes) {
                 source.remove(start);
-                destination.add(start);
+                if (destination.isEmpty() || destination.iterator().next().from.equals(start.to))
+                        destination.addFirst(start);
+                else
+                        destination.addLast(start);
                 Segment moveSeg = start;
                 while(moveSeg != null) {
@@ -473 +474 @@
 
                         for (Node node : new Node[] { start.from, start.to }) {
-                                if (stopNodes != null && stopNodes.contains(node)) continue;
+                                if (stopNodes != null && stopNodes.contains(node))
+                                        continue;
                                 for (Segment sourceSeg : source) {
                                         if (sourceSeg.from.equals(node) || sourceSeg.to.equals(node)) {

src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java

@@ -60 +60 @@
         public AddWayAction(MapFrame mapFrame) {
                 super(tr("Add Way"), "addway", tr("Add a new way to the data."), KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way"));
-                
-                Main.ds.addSelectionChangedListener(this);
+                Main.ds.listeners.add(this);
         }
 

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -5 +5 @@
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -47 +46 @@
          * A list of listeners to selection changed events.
          */
-        transient Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
+        transient public Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
 
         /**
@@ -143 +142 @@
                         l.selectionChanged(sel);
         }
-
-        /**
-         * Add a listener to the selection changed listener list. If <code>null</code>
-         * is passed, nothing happens.
-         * @param listener The listener to add to the list.
-         */
-        public void addSelectionChangedListener(SelectionChangedListener listener) {
-                if (listener != null)
-                        listeners.add(listener);
-        }
-
-        /**
-         * Remove a listener from the selection changed listener list.
-         * If <code>null</code> is passed, nothing happens.
-         * @param listener The listener to remove from the list.
-         */
-        public void removeSelectionChangedListener(SelectionChangedListener listener) {
-                if (listener != null)
-                        listeners.remove(listener);
-        }
-
-        public void addAllSelectionListener(DataSet ds) {
-                listeners.addAll(ds.listeners);
-        }
-
-        /**
-         * Compares this and the parameter dataset and return <code>true</code> if both
-         * contain the same data primitives (ignoring the selection)
-         */
-        public boolean realEqual(Collection<OsmPrimitive> other) {
-                Collection<OsmPrimitive> my = allPrimitives();
-
-                if (my.size() != other.size())
-                        return false;
-
-                Iterator<OsmPrimitive> it = other.iterator();
-                for (OsmPrimitive osm : my)
-                        if (!osm.realEqual(it.next()))
-                                return false;
-
-                return true;
-        }
 }

src/org/openstreetmap/josm/data/osm/Node.java

@@ -43 +43 @@
         }
 
-        @Override public boolean realEqual(OsmPrimitive osm) {
-                return osm instanceof Node ? super.realEqual(osm) && coor.equals(((Node)osm).coor) : false;
+        @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
+                return osm instanceof Node ? super.realEqual(osm, semanticOnly) && coor.equals(((Node)osm).coor) : false;
     }
 

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -166 +166 @@
         /**
          * Perform an equality compare for all non-volatile fields not only for the id 
-         * but for the whole object (for conflict resolving etc)
+         * but for the whole object (for conflict resolving)
+         * @param semanticOnly if <code>true</code>, modified flag and timestamp are not compared
          */
-        public boolean realEqual(OsmPrimitive osm) {
+        public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
                 return
-                id == osm.id && 
-                modified == osm.modified && 
-                deleted == osm.deleted &&
-                (timestamp == null ? osm.timestamp==null : timestamp.equals(osm.timestamp)) &&
-                (keys == null ? osm.keys==null : keys.equals(osm.keys));
+                        id == osm.id && 
+                        (semanticOnly || (modified == osm.modified)) && 
+                        deleted == osm.deleted &&
+                        (semanticOnly || (timestamp == null ? osm.timestamp==null : timestamp.equals(osm.timestamp))) &&
+                        (keys == null ? osm.keys==null : keys.equals(osm.keys));
         }
         

src/org/openstreetmap/josm/data/osm/Segment.java

@@ -79 +79 @@
         }
 
-        @Override public boolean realEqual(OsmPrimitive osm) {
+        @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
                 if (!(osm instanceof Segment))
-                        return super.realEqual(osm); 
+                        return super.realEqual(osm, semanticOnly); 
                 if (incomplete)
                         return ((Segment)osm).incomplete;
-                return super.realEqual(osm) && from.equals(((Segment)osm).from) && to.equals(((Segment)osm).to);
+                return super.realEqual(osm, semanticOnly) && from.equals(((Segment)osm).from) && to.equals(((Segment)osm).to);
         }
 

src/org/openstreetmap/josm/data/osm/Way.java

@@ -43 +43 @@
     }
 
-        @Override public boolean realEqual(OsmPrimitive osm) {
-                return osm instanceof Way ? super.realEqual(osm) && segments.equals(((Way)osm).segments) : false;
+        @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
+                return osm instanceof Way ? super.realEqual(osm, semanticOnly) && segments.equals(((Way)osm).segments) : false;
     }
 

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

@@ -295 +295 @@
 
         /**
-         * @return <code>true</code>, if no merge is needed.
+         * @return <code>true</code>, if no merge is needed or merge is performed already.
          */
         private <P extends OsmPrimitive> boolean mergeAfterId(Map<P,P> merged, Collection<P> primitives, P other) {
                 for (P my : primitives) {
-                        if (my.realEqual(other))
+                        Date d1 = my.timestamp == null ? new Date(0) : my.timestamp;
+                        Date d2 = other.timestamp == null ? new Date(0) : other.timestamp;
+                        if (my.realEqual(other, false))
                                 return true; // no merge needed.
+                        if (my.realEqual(other, true)) {
+                                // they differ in modified/timestamp combination only. Auto-resolve it.
+                                if (merged != null)
+                                        merged.put(other, my);
+                                if (d1.before(d2)) {
+                                        my.modified = other.modified;
+                                        my.timestamp = other.timestamp;
+                                }
+                                return true; // merge done.
+                        }
                         if (my.id == other.id && my.id != 0) {
                                 if (my instanceof Segment && ((Segment)my).incomplete)
                                         return false; // merge always over an incomplete
-                                Date d1 = my.timestamp == null ? new Date(0) : my.timestamp;
-                                Date d2 = other.timestamp == null ? new Date(0) : other.timestamp;
                                 if (my.modified && other.modified) {
                                         conflicts.put(my, other);

src/org/openstreetmap/josm/gui/MapView.java

@@ -89 +89 @@
 
                 // listend to selection changes to redraw the map
-                Main.ds.addSelectionChangedListener(new SelectionChangedListener(){
+                Main.ds.listeners.add(new SelectionChangedListener(){
                         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                                 repaint();
@@ -119 +119 @@
                         }
                         editLayer = dataLayer;
-                        dataLayer.data.addAllSelectionListener(Main.ds);
+                        dataLayer.data.listeners.addAll(Main.ds.listeners);
                         Main.ds = dataLayer.data;
                         dataLayer.listenerModified.add(new ModifiedChangedListener(){

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

@@ -86 +86 @@
                 add(buttonPanel, BorderLayout.SOUTH);
 
-                Main.ds.addSelectionChangedListener(new SelectionChangedListener(){
+                Main.ds.listeners.add(new SelectionChangedListener(){
                         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
                                 displaylist.clearSelection();

src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

@@ -143 +143 @@
         @Override public void setVisible(boolean b) {
                 if (b) {
-                        Main.ds.addSelectionChangedListener(this);
+                        Main.ds.listeners.add(this);
                         selectionChanged(Main.ds.getSelected());
                 } else {
-                        Main.ds.removeSelectionChangedListener(this);
+                        Main.ds.listeners.remove(this);
                 }
                 super.setVisible(b);

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -328 +328 @@
         @Override public void setVisible(boolean b) {
                 if (b) {
-                        Main.ds.addSelectionChangedListener(this);
+                        Main.ds.listeners.add(this);
                         selectionChanged(Main.ds.getSelected());
                 } else {
-                        Main.ds.removeSelectionChangedListener(this);
+                        Main.ds.listeners.remove(this);
                 }
                 super.setVisible(b);

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -89 +89 @@
         @Override public void setVisible(boolean b) {
                 if (b) {
-                        Main.ds.addSelectionChangedListener(this);
+                        Main.ds.listeners.add(this);
                         selectionChanged(Main.ds.getSelected());
                 } else {
-                        Main.ds.removeSelectionChangedListener(this);
+                        Main.ds.listeners.remove(this);
                 }
                 super.setVisible(b);

src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -74 +74 @@
                         }
                 } catch (RuntimeException e) {
+                        e.printStackTrace();
                         throw new SAXException("An error occoured: "+e.getMessage());
                 }