Changeset 21634 in osm for applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

Timestamp:

2010-06-10T17:30:56+02:00 (14 years ago)

Author:

upliner

Message:

reverter: fully fix #5005 and add conflicts handling

File:

• applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmServerReader;
@@ -15 +16 @@
 public class OsmServerMultiObjectReader extends OsmServerReader {
     private MultiOsmReader rdr = new MultiOsmReader();
-    public void ReadObject(long id,int version,OsmPrimitiveType type,ProgressMonitor progressMonitor) throws OsmTransferException
-    {
+    public void ReadObject(PrimitiveId id, int version, ProgressMonitor progressMonitor) throws OsmTransferException {
+        ReadObject(id.getUniqueId(), version, id.getType(), progressMonitor);
+    }
+    public void ReadObject(long id,int version,OsmPrimitiveType type,ProgressMonitor progressMonitor) throws OsmTransferException {
         StringBuffer sb = new StringBuffer();
         sb.append(type.getAPIName());
@@ -53 +56 @@
         } catch (Exception e) {
             throw new OsmTransferException(e);
-        } finally
-        {
+        } finally {
             progressMonitor.finishTask();
             activeConnection = null;
         }
     }
-
 }