Changeset 29548 in osm for applications

Timestamp:

2013-05-01T00:12:19+02:00 (12 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8646 + code cleanup/update

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/ChangesetReverter.java (modified) (8 diffs)
• src/reverter/MultiOsmReader.java (modified) (2 diffs)
• src/reverter/OsmServerMultiObjectReader.java (modified) (3 diffs)

applications/editors/josm/plugins/reverter/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5865"/>
+    <property name="plugin.main.version" value="5874"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -103 +104 @@
      * @return <code>true</code> if {@see ChangesetDataSetEntry} conforms to current RevertType
      */
-    private boolean CheckOsmChangeEntry(ChangesetDataSetEntry entry) {
+    private boolean checkOsmChangeEntry(ChangesetDataSetEntry entry) {
         if (revertType == RevertType.FULL) return true;
         if (revertType == RevertType.SELECTION_WITH_UNDELETE &&
@@ -152 +153 @@
         for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
             ChangesetDataSetEntry entry = it.next();
-            if (!CheckOsmChangeEntry(entry)) continue;
+            if (!checkOsmChangeEntry(entry)) continue;
             if (entry.getModificationType() == ChangesetModificationType.CREATED) {
                 created.add(entry.getPrimitive());
@@ -173 +174 @@
 
     /**
-     * fetch objects that was updated or deleted by changeset
+     * fetch objects that were updated or deleted by changeset
      * @param progressMonitor
      * @throws OsmTransferException
@@ -182 +183 @@
         progressMonitor.beginTask("Downloading objects history",updated.size()+deleted.size()+1);
         try {
-            for (HistoryOsmPrimitive entry : updated) {
-                rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
-                        progressMonitor.createSubTaskMonitor(1, true));
-                if (progressMonitor.isCanceled()) return;
-            }
-            for (HistoryOsmPrimitive entry : deleted) {
-                rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
-                        progressMonitor.createSubTaskMonitor(1, true));
-                if (progressMonitor.isCanceled()) return;
+            for (HashSet<HistoryOsmPrimitive> collection : Arrays.asList(new HashSet[]{updated, deleted})) {
+                for (HistoryOsmPrimitive entry : collection) {
+                    PrimitiveId id = entry.getPrimitiveId();
+                    rdr.readObject(id, cds.getEarliestVersion(id)-1, progressMonitor.createSubTaskMonitor(1, true));
+                    if (progressMonitor.isCanceled()) return;
+                }
             }
             nds = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true));
@@ -322 +320 @@
         }
 
-
         //////////////////////////////////////////////////////////////////////////
         // Check reversion against current dataset and create necessary conflicts
@@ -335 +332 @@
         for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
             ChangesetDataSetEntry entry = it.next();
-            if (!CheckOsmChangeEntry(entry)) continue;
+            if (!checkOsmChangeEntry(entry)) continue;
             HistoryOsmPrimitive hp = entry.getPrimitive();
             OsmPrimitive dp = ds.getPrimitiveById(hp.getPrimitiveId());
@@ -345 +342 @@
                     && (hp.isVisible() || dp.isVisible()) &&
                     /* Don't create conflict if changeset object and dataset object
-                     * has same semantic attributes(but different versions)
-                     */
-                    !hasEqualSemanticAttributes(dp,hp)) {
-
-
+                     * has same semantic attributes (but different versions) */
+                    !hasEqualSemanticAttributes(dp,hp)
+                    /* Don't create conflict if the object has to be deleted but has already been deleted */
+                    && !(toDelete.contains(dp) && dp.isDeleted())) {
                 cmds.add(new ConflictAddCommand(layer,CreateConflict(dp,
                         entry.getModificationType() == ChangesetModificationType.CREATED)));

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

@@ -18 +18 @@
 public class MultiOsmReader extends OsmReader {
 
-    public void AddData(InputStream source) throws IllegalDataException {
+    public void addData(InputStream source) throws IllegalDataException {
         try {
             InputStreamReader ir = UTFInputStreamReader.create(source, "UTF-8");
@@ -30 +30 @@
         }
     }
-    public void ProcessData() throws IllegalDataException {
+    
+    public void processData() throws IllegalDataException {
         prepareDataSet();
     }

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

@@ -12 +12 @@
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
-
 public class OsmServerMultiObjectReader extends OsmServerReader {
-    private MultiOsmReader rdr = new MultiOsmReader();
-    public void ReadObject(PrimitiveId id, int version, ProgressMonitor progressMonitor) throws OsmTransferException {
-        ReadObject(id.getUniqueId(), version, id.getType(), progressMonitor);
+    private final MultiOsmReader rdr = new MultiOsmReader();
+    
+    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 {
+    
+    public void readObject(long id,int version,OsmPrimitiveType type,ProgressMonitor progressMonitor) throws OsmTransferException {
         StringBuffer sb = new StringBuffer();
         sb.append(type.getAPIName());
@@ -30 +32 @@
         InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
         try {
-            rdr.AddData(in);
+            rdr.addData(in);
         } catch (Exception e) {
             throw new OsmTransferException(e);
         } finally {
             progressMonitor.finishTask();
-            if (in!=null) {
-                try {
-                    in.close();
-                } catch(Exception e) {}
-            }
+            Utils.close(in);
         }
     }
@@ -53 +51 @@
         progressMonitor.subTask(tr("Preparing history data..."));
         try {
-            rdr.ProcessData();
+            rdr.processData();
             return rdr.getDataSet();
         } catch (Exception e) {