Changeset 21807 in osm

Timestamp:

2010-06-19T22:30:58+02:00 (14 years ago)

Author:

upliner

Message:

optimize reverter for new JOSM core

Location:

applications/editors/josm

Files:

• dist/reverter.jar (modified) ( previous)
• plugins/reverter/build.xml (modified) (1 diff)
• plugins/reverter/src/reverter/ChangesetReverter.java (modified) (1 diff)
• plugins/reverter/src/reverter/DataSetToCmd.java (modified) (1 diff)
• plugins/reverter/src/reverter/ReverterPlugin.java (modified) (2 diffs)
• plugins/reverter/src/reverter/ReverterUploadHook.java (deleted)
• plugins/reverter/src/reverter/UndeletedObjectsStorage.java (deleted)

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

@@ -33 +33 @@
         <property name="commit.message" value="Added image icon" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="3000" />
+        <property name="plugin.main.version" value="3336" />
 
 

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

@@ -205 +205 @@
                 p.setDeleted(true);
                 p.setModified(false);
-                ReverterPlugin.undeletedObjects.addPrimitive(ds,
-                        new PrimitiveIdVersion(p.getPrimitiveId(),(int)p.getVersion()));
             }
         }

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

@@ -60 +60 @@
         newTarget.mergeFrom(source);
         newTarget.setOsmId(target.getId(), (int)target.getVersion());
+        newTarget.setVisible(target.isVisible());
         newTarget.setDeleted(false);
         cmds.add(new ChangeCommand(target,newTarget));

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.gui.MainMenu;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
 public class ReverterPlugin extends Plugin {
-    static UndeletedObjectsStorage undeletedObjects = new UndeletedObjectsStorage();
     public ReverterPlugin(PluginInformation info) {
         super(info);
@@ -23 +20 @@
         //MainMenu.add(historyMenu, new ObjectsHistoryAction());       
         MainMenu.add(historyMenu, new RevertChangesetAction());
-        MapView.addLayerChangeListener(undeletedObjects);
-        UploadAction.registerUploadHook(new ReverterUploadHook(undeletedObjects));        
     }
 }