Changeset 34551 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java

Timestamp:

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

Author:

donvip

Message:

update to JOSM 14153

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java

@@ -19 +19 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -28 +28 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -70 +71 @@
         }
 
-        MainApplication.undoRedo.add(new AddCommand(ds, rel));
+        UndoRedoHandler.getInstance().add(new AddCommand(ds, rel));
 
         if (chRel != null) {
@@ -105 +106 @@
         keys.setPossibleItems(RELATION_TYPES);
         keys.setEditable(true);
-        keys.getEditor().setItem(Main.pref.get(PREF_LASTTYPE, "multipolygon"));
+        keys.getEditor().setItem(Config.getPref().get(PREF_LASTTYPE, "multipolygon"));
 
         panel.add(new JLabel(tr("Type")), GBC.std());
@@ -118 +119 @@
             }
         };
-        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Create a new relation"));
+        final JDialog dlg = optionPane.createDialog(MainApplication.getMainFrame(), tr("Create a new relation"));
         dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
 
@@ -137 +138 @@
 
         String result = keys.getEditor().getItem().toString().trim();
-        Main.pref.put(PREF_LASTTYPE, result);
+        Config.getPref().put(PREF_LASTTYPE, result);
         return result;
     }