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

Timestamp:

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

Author:

donvip

Message:

update to JOSM 14153

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (modified) (8 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -58 +58 @@
 import javax.swing.table.TableColumnModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -79 +79 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 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.Logging;
@@ -205 +206 @@
         });
         downloadButton.setVisible(false);
-        if (Main.pref.getBoolean(PREF_PREFIX + ".hidetopline", false)) {
+        if (Config.getPref().getBoolean(PREF_PREFIX + ".hidetopline", false)) {
             chosenRelationPanel.setVisible(false);
         }
@@ -359 +360 @@
     @Override
     public void chosenRelationChanged(Relation oldRelation, Relation newRelation) {
-        if (chosenRelationPanel != null && Main.pref.getBoolean(PREF_PREFIX + ".hidetopline", false)) {
+        if (chosenRelationPanel != null && Config.getPref().getBoolean(PREF_PREFIX + ".hidetopline", false)) {
             chosenRelationPanel.setVisible(newRelation != null);
         }
@@ -494 +495 @@
             }
         };
-        final JDialog dlg = optionPane.createDialog(Main.parent, tr("Specify role"));
+        final JDialog dlg = optionPane.createDialog(MainApplication.getMainFrame(), tr("Specify role"));
         dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
 
@@ -573 +574 @@
             }
             if (!commands.isEmpty()) {
-                //                Main.main.undoRedo.add(new ChangeCommand(chosenRelation.get(), r));
-                MainApplication.undoRedo.add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
+                //                UndoRedoHandler.getInstance().add(new ChangeCommand(chosenRelation.get(), r));
+                UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
             }
         }
@@ -603 +604 @@
             String fullProperty = PREF_PREFIX + ".multipolygon." + property;
             JCheckBoxMenuItem item = new JCheckBoxMenuItem(tr(title));
-            item.setSelected(Main.pref.getBoolean(fullProperty, CreateMultipolygonAction.getDefaultPropertyValue(property)));
+            item.setSelected(Config.getPref().getBoolean(fullProperty, CreateMultipolygonAction.getDefaultPropertyValue(property)));
             item.setActionCommand(fullProperty);
             item.addActionListener(this);
@@ -615 +616 @@
             if (property != null && property.length() > 0 && e.getSource() instanceof JCheckBoxMenuItem) {
                 boolean value = ((JCheckBoxMenuItem) e.getSource()).isSelected();
-                Main.pref.putBoolean(property, value);
+                Config.getPref().putBoolean(property, value);
                 show(getInvoker(), getX(), getY());
             }