Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -21 +21 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
 import org.openstreetmap.josm.command.AddCommand;
@@ -43 +42 @@
 import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -115 +115 @@
                     SwingUtilities.invokeLater(() -> {
                             MainApplication.getMap().relationListDialog.selectRelation(relation);
-                            if (Main.pref.getBoolean("multipoly.show-relation-editor", false)) {
+                            if (Config.getPref().getBoolean("multipoly.show-relation-editor", false)) {
                                 //Open relation edit window, if set up in preferences
                                 RelationEditor editor = RelationEditor.getEditor(
@@ -382 +382 @@
 
         // filter out empty key conflicts - we need second iteration
-        if (!Main.pref.getBoolean("multipoly.alltags", false)) {
+        if (!Config.getPref().getBoolean("multipoly.alltags", false)) {
             for (RelationMember m : relation.getMembers()) {
                 if (m.hasRole() && "outer".equals(m.getRole()) && m.isWay()) {
@@ -398 +398 @@
         }
 
-        for (String linearTag : Main.pref.getList("multipoly.lineartagstokeep", DEFAULT_LINEAR_TAGS)) {
+        for (String linearTag : Config.getPref().getList("multipoly.lineartagstokeep", DEFAULT_LINEAR_TAGS)) {
             values.remove(linearTag);
         }
@@ -408 +408 @@
 
         List<Command> commands = new ArrayList<>();
-        boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
+        boolean moveTags = Config.getPref().getBoolean("multipoly.movetags", true);
 
         for (Entry<String, String> entry : values.entrySet()) {