Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.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/data/osm/visitor/paint/relations/Multipolygon.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.AreaAndPerimeter;
@@ -96 +97 @@
         private void initFromPreferences() {
             initDefaults();
-            if (Main.pref == null) return;
+            if (Config.getPref() == null) return;
             Collection<String> literals;
-            literals = Main.pref.getList(PREF_KEY_OUTER_ROLES);
+            literals = Config.getPref().getList(PREF_KEY_OUTER_ROLES);
             if (literals != null && !literals.isEmpty()) {
                 setNormalized(literals, outerExactRoles);
             }
-            literals = Main.pref.getList(PREF_KEY_OUTER_ROLE_PREFIXES);
+            literals = Config.getPref().getList(PREF_KEY_OUTER_ROLE_PREFIXES);
             if (literals != null && !literals.isEmpty()) {
                 setNormalized(literals, outerRolePrefixes);
             }
-            literals = Main.pref.getList(PREF_KEY_INNER_ROLES);
+            literals = Config.getPref().getList(PREF_KEY_INNER_ROLES);
             if (literals != null && !literals.isEmpty()) {
                 setNormalized(literals, innerExactRoles);
             }
-            literals = Main.pref.getList(PREF_KEY_INNER_ROLE_PREFIXES);
+            literals = Config.getPref().getList(PREF_KEY_INNER_ROLE_PREFIXES);
             if (literals != null && !literals.isEmpty()) {
                 setNormalized(literals, innerRolePrefixes);
@@ -157 +158 @@
         if (roleMatcher == null) {
             roleMatcher = new MultipolygonRoleMatcher();
-            if (Main.pref != null) {
+            if (Config.getPref() != null) {
                 roleMatcher.initFromPreferences();
-                Main.pref.addPreferenceChangeListener(roleMatcher);
+                Config.getPref().addPreferenceChangeListener(roleMatcher);
             }
         }