Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

23.06.2009 22:03:37 (3 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -245 +245 @@
     public void mergeFrom(final DataSet from) {
         final MergeVisitor visitor = new MergeVisitor(data,from);
-        for (final OsmPrimitive osm : from.allPrimitives()) {
-            osm.visit(visitor);
-        }
-        visitor.fixReferences();
+        visitor.merge();
 
         Area a = data.getDataSourceArea();
@@ -274 +271 @@
         Main.map.mapView.repaint();
 
-        if (visitor.conflicts.isEmpty())
+        if (visitor.getConflicts().isEmpty())
             return;
         final ConflictDialog dlg = Main.map.conflictDialog;
-        dlg.add(visitor.conflicts);
-        JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", visitor.conflicts.size()));
+        dlg.add(visitor.getConflicts());
+        JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", visitor.getConflicts().size()));
         if (!dlg.isVisible()) {
             dlg.action.actionPerformed(new ActionEvent(this, 0, ""));