Changeset 14134 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2018-08-11T23:33:58+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main*.undoRedo - make UndoRedoHandler a singleton

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• CommandStackDialog.java (modified) (7 diffs)
• ConflictDialog.java (modified) (2 diffs)
• ConflictResolutionDialog.java (modified) (2 diffs)
• ValidatorDialog.java (modified) (3 diffs)
• properties/PropertiesDialog.java (modified) (5 diffs)
• properties/TagEditHelper.java (modified) (6 diffs)
• relation/actions/RefreshAction.java (modified) (2 diffs)
• relation/actions/SavingAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.PseudoCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandAddedEvent;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueCleanedEvent;
@@ -237 +238 @@
             listener.updateEnabledState();
         }
-        MainApplication.undoRedo.addCommandQueuePreciseListener(this);
+        UndoRedoHandler.getInstance().addCommandQueuePreciseListener(this);
     }
 
@@ -255 +256 @@
         undoTreeModel.setRoot(undoRoot);
         redoTreeModel.setRoot(redoRoot);
-        MainApplication.undoRedo.removeCommandQueuePreciseListener(this);
+        UndoRedoHandler.getInstance().removeCommandQueuePreciseListener(this);
     }
 
@@ -270 +271 @@
 
     private void buildUndoTree() {
-        List<Command> undoCommands = MainApplication.undoRedo.commands;
+        List<Command> undoCommands = UndoRedoHandler.getInstance().commands;
         undoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < undoCommands.size(); ++i) {
@@ -279 +280 @@
 
     private void buildRedoTree() {
-        List<Command> redoCommands = MainApplication.undoRedo.redoCommands;
+        List<Command> redoCommands = UndoRedoHandler.getInstance().redoCommands;
         redoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < redoCommands.size(); ++i) {
@@ -288 +289 @@
 
     private void ensureTreesConsistency() {
-        List<Command> undoCommands = MainApplication.undoRedo.commands;
-        List<Command> redoCommands = MainApplication.undoRedo.redoCommands;
+        List<Command> undoCommands = UndoRedoHandler.getInstance().commands;
+        List<Command> redoCommands = UndoRedoHandler.getInstance().redoCommands;
         if (redoTreeModel.getChildCount(redoRoot) > 0) {
             redoTree.scrollRowToVisible(0);
@@ -505 +506 @@
             case UNDO:
                 int numUndo = ((DefaultMutableTreeNode) undoTreeModel.getRoot()).getChildCount() - idx;
-                MainApplication.undoRedo.undo(numUndo);
+                UndoRedoHandler.getInstance().undo(numUndo);
                 break;
             case REDO:
                 int numRedo = idx+1;
-                MainApplication.undoRedo.redo(numRedo);
+                UndoRedoHandler.getInstance().redo(numRedo);
                 break;
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -41 +41 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
@@ -523 +524 @@
                 }
             }
-            MainApplication.undoRedo.add(new SequenceCommand(name, commands));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
             refreshView();
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -18 +18 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
 import org.openstreetmap.josm.gui.help.HelpBrowser;
@@ -204 +204 @@
                 }
             }
-            MainApplication.undoRedo.add(resolver.buildResolveCommand());
+            UndoRedoHandler.getInstance().add(resolver.buildResolveCommand());
             buttonAction(1, evt);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -35 +35 @@
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -560 +561 @@
                 final Command fixCommand = error.getFix();
                 if (fixCommand != null) {
-                    SwingUtilities.invokeAndWait(() -> MainApplication.undoRedo.addNoRedraw(fixCommand));
+                    SwingUtilities.invokeAndWait(() -> UndoRedoHandler.getInstance().addNoRedraw(fixCommand));
                 }
                 // It is wanted to ignore an error if it said fixable, even if fixCommand was null
@@ -591 +592 @@
                 monitor.subTask(tr("Updating map ..."));
                 SwingUtilities.invokeAndWait(() -> {
-                    MainApplication.undoRedo.afterAdd(null);
+                    UndoRedoHandler.getInstance().afterAdd(null);
                     invalidateValidatorLayers();
                     tree.resetErrors();

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -59 +59 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
@@ -844 +845 @@
             Command command = TaggingPreset.createCommand(getSelection(), tags);
             if (command != null) {
-                MainApplication.undoRedo.add(command);
+                UndoRedoHandler.getInstance().add(command);
             }
         }
@@ -1011 +1012 @@
 
             Collection<OsmPrimitive> sel = Main.main.getInProgressSelection();
-            MainApplication.undoRedo.add(new ChangePropertyCommand(sel, tags));
+            UndoRedoHandler.getInstance().add(new ChangePropertyCommand(sel, tags));
 
             membershipTable.clearSelection();
@@ -1042 +1043 @@
                 rel.removeMembersFor(primitive);
             }
-            MainApplication.undoRedo.add(new ChangeCommand(cur, rel));
+            UndoRedoHandler.getInstance().add(new ChangeCommand(cur, rel));
 
             tagTable.clearSelection();
@@ -1164 +1165 @@
             if (sel.isEmpty() || clipboard == null || sel.iterator().next().getDataSet().isLocked())
                 return;
-            MainApplication.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));
+            UndoRedoHandler.getInstance().add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -68 +68 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -81 +82 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.IExtendedDialog;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -508 +508 @@
                 return;
             if (key.equals(newkey) || value == null) {
-                MainApplication.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
+                UndoRedoHandler.getInstance().add(new ChangePropertyCommand(sel, newkey, value));
                 AutoCompletionManager.rememberUserInput(newkey, value, true);
             } else {
@@ -542 +542 @@
                     AutoCompletionManager.rememberUserInput(newkey, value, false);
                 }
-                MainApplication.undoRedo.add(new SequenceCommand(
+                UndoRedoHandler.getInstance().add(new SequenceCommand(
                         trn("Change properties of up to {0} object",
                                 "Change properties of up to {0} objects", sel.size(), sel.size()),
@@ -1077 +1077 @@
             AutoCompletionManager.rememberUserInput(key, value, false);
             commandCount++;
-            MainApplication.undoRedo.add(new ChangePropertyCommand(sel, key, value));
+            UndoRedoHandler.getInstance().add(new ChangePropertyCommand(sel, key, value));
             changedKey = key;
             clearEntries();
@@ -1088 +1088 @@
 
         public void undoAllTagsAdding() {
-            MainApplication.undoRedo.undo(commandCount);
+            UndoRedoHandler.getInstance().undo(commandCount);
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -46 +46 @@
             rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), "refresh");
         }
-        MainApplication.undoRedo.addCommandQueueListener(this);
+        UndoRedoHandler.getInstance().addCommandQueueListener(this);
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -67 +68 @@
         if (newRelation.getMembersCount() == 0 && !newRelation.hasKeys())
             return;
-        MainApplication.undoRedo.add(new AddCommand(getLayer().getDataSet(), newRelation));
+        UndoRedoHandler.getInstance().add(new AddCommand(getLayer().getDataSet(), newRelation));
 
         // make sure everybody is notified about the changes
@@ -89 +90 @@
         editorAccess.getMemberTableModel().applyToRelation(editedRelation);
         Conflict<Relation> conflict = new Conflict<>(editorAccess.getEditor().getRelation(), editedRelation);
-        MainApplication.undoRedo.add(new ConflictAddCommand(getLayer().getDataSet(), conflict));
+        UndoRedoHandler.getInstance().add(new ConflictAddCommand(getLayer().getDataSet(), conflict));
     }
 
@@ -102 +103 @@
         getMemberTableModel().applyToRelation(editedRelation);
         if (!editedRelation.hasEqualSemanticAttributes(originRelation, false)) {
-            MainApplication.undoRedo.add(new ChangeCommand(originRelation, editedRelation));
+            UndoRedoHandler.getInstance().add(new ChangeCommand(originRelation, editedRelation));
         }
     }