Changeset 34552 in osm for applications/editors

Timestamp:

2018-08-18T20:08:51+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/ChangesetIdQuery.java (modified) (5 diffs)
• src/reverter/ObjectsHistoryDialog.java (modified) (1 diff)
• src/reverter/RevertChangesetTask.java (modified) (3 diffs)
• src/reverter/ReverterUploadHook.java (modified) (2 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="13914"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -25 +25 @@
 import javax.swing.plaf.basic.BasicComboBoxEditor;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -66 +66 @@
 
     public ChangesetIdQuery() {
-        super(Main.parent, tr("Revert changeset"), new String[] {tr("Revert"), tr("Cancel")}, true);
+        super(MainApplication.getMainFrame(), tr("Revert changeset"), new String[] {tr("Revert"), tr("Cancel")}, true);
         contentInsets = new Insets(10, 10, 10, 5);
 
@@ -142 +142 @@
         });
 
-        if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) {
+        if (Config.getPref().getBoolean("downloadchangeset.autopaste", true)) {
             tcid.tryToPasteFromClipboard();
         }
@@ -157 +157 @@
     protected void restoreChangesetsHistory(HistoryComboBox cbHistory) {
         List<String> cmtHistory = new LinkedList<>(
-                Main.pref.getList(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
+                Config.getPref().getList(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
         // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         Collections.reverse(cmtHistory);
@@ -169 +169 @@
     protected void remindChangesetsHistory(HistoryComboBox cbHistory) {
         cbHistory.addCurrentItemToHistory();
-        Main.pref.putList(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
+        Config.getPref().putList(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
     }
 

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

@@ -9 +9 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 
 @SuppressWarnings("serial")
 public class ObjectsHistoryDialog extends ExtendedDialog {
     public ObjectsHistoryDialog() {
-        super(Main.parent, tr("Objects history"), new String[] {"Revert", "Cancel"}, false);
+        super(MainApplication.getMainFrame(), tr("Objects history"), new String[] {"Revert", "Cancel"}, false);
         contentInsets = new Insets(10, 10, 10, 5);
         setButtonIcons(new String[] {"ok.png", "cancel.png" });

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

@@ -14 +14 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
@@ -65 +65 @@
                 @Override
                 public Integer call() throws Exception {
-                    return JOptionPane.showConfirmDialog(Main.parent,
+                    return JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
                             tr("This changeset has objects that are not present in current dataset.\n" +
                                     "It is needed to download them before reverting. Do you want to continue?"),
@@ -111 +111 @@
             Command cmd = allcmds.size() == 1 ? allcmds.get(0) : new SequenceCommand(tr("Revert changeset"), allcmds);
             GuiHelper.runInEDT(() -> {
-                MainApplication.undoRedo.add(cmd);
+                UndoRedoHandler.getInstance().add(cmd);
                 if (numberOfConflicts > 0) {
                     MainApplication.getMap().conflictDialog.warnNumNewConflicts(numberOfConflicts);

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

@@ -5 +5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.gui.MainApplication;
 
@@ -17 +18 @@
         if (!ReverterPlugin.reverterUsed) return true;
         boolean hasRevertions = false;
-        for (Command cmd : MainApplication.undoRedo.commands) {
+        for (Command cmd : UndoRedoHandler.getInstance().commands) {
             if (cmd instanceof RevertChangesetCommand) {
                 hasRevertions = true;