Changeset 7656 in josm for trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java
- Timestamp:
- 2014-10-27T20:47:56+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java
r7012 r7656 17 17 18 18 import org.openstreetmap.josm.data.osm.Changeset; 19 import org.openstreetmap.josm.data.osm.IPrimitive; 19 import org.openstreetmap.josm.data.osm.DataSet; 20 import org.openstreetmap.josm.data.osm.OsmPrimitive; 20 21 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 21 22 import org.openstreetmap.josm.data.osm.PrimitiveId; … … 44 45 private Map<PrimitiveId, DiffResultEntry> diffResults = new HashMap<>(); 45 46 /** 46 * the set of processed primitives *after* the new id, the new version and the new changeset id 47 * is set 47 * the set of processed primitives *after* the new id, the new version and the new changeset id is set 48 48 */ 49 private Set< IPrimitive> processed;49 private Set<OsmPrimitive> processed; 50 50 /** 51 51 * the collection of primitives being uploaded 52 52 */ 53 private Collection<? extends IPrimitive> primitives;53 private Collection<? extends OsmPrimitive> primitives; 54 54 55 55 /** … … 59 59 * assumes an empty collection. 60 60 */ 61 public DiffResultProcessor(Collection<? extends IPrimitive> primitives) {61 public DiffResultProcessor(Collection<? extends OsmPrimitive> primitives) { 62 62 if (primitives == null) { 63 63 primitives = Collections.emptyList(); … … 105 105 * @return the collection of processed primitives 106 106 */ 107 protected Set< IPrimitive> postProcess(Changeset cs, ProgressMonitor monitor) {107 protected Set<OsmPrimitive> postProcess(Changeset cs, ProgressMonitor monitor) { 108 108 if (monitor == null) { 109 109 monitor = NullProgressMonitor.INSTANCE; 110 110 } 111 DataSet ds = primitives.iterator().next().getDataSet(); 112 ds.beginUpdate(); 111 113 try { 112 114 monitor.beginTask("Postprocessing uploaded data ..."); 113 115 monitor.setTicksCount(primitives.size()); 114 116 monitor.setTicks(0); 115 for ( IPrimitive p : primitives) {117 for (OsmPrimitive p : primitives) { 116 118 monitor.worked(1); 117 119 DiffResultEntry entry = diffResults.get(p.getPrimitiveId()); … … 132 134 return processed; 133 135 } finally { 136 ds.endUpdate(); 134 137 monitor.finishTask(); 135 138 }
Note:
See TracChangeset
for help on using the changeset viewer.