Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

• AreaElement.java (modified) (3 diffs)
• LabelCompositionStrategy.java (modified) (2 diffs)
• NodeElement.java (modified) (4 diffs)
• StyleElement.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -7 +7 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -17 +16 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.HiDPISupport;
@@ -90 +90 @@
             );
 
-            fillImage.alpha = Utils.clamp(Main.pref.getInt("mappaint.fill-image-alpha", 255), 0, 255);
+            fillImage.alpha = Utils.clamp(Config.getPref().getInt("mappaint.fill-image-alpha", 255), 0, 255);
             Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));
             if (pAlpha != null) {

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -233 +234 @@
          */
         public final void initNameTagsFromPreferences() {
-            if (Main.pref == null) {
+            if (Config.getPref() == null) {
                 this.nameTags = new ArrayList<>(Arrays.asList(DEFAULT_NAME_TAGS));
                 this.nameComplementTags = new ArrayList<>(Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS));
             } else {
                 this.nameTags = new ArrayList<>(
-                        Main.pref.getList("mappaint.nameOrder", Arrays.asList(DEFAULT_NAME_TAGS))
+                        Config.getPref().getList("mappaint.nameOrder", Arrays.asList(DEFAULT_NAME_TAGS))
                 );
                 this.nameComplementTags = new ArrayList<>(
-                        Main.pref.getList("mappaint.nameComplementOrder", Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS))
+                        Config.getPref().getList("mappaint.nameComplementOrder", Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS))
                 );
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -10 +10 @@
 import java.util.stream.IntStream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -25 +24 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.BoxProvider;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.SimpleBoxProvider;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
@@ -196 +196 @@
         mapImage.offsetY = Math.round(offsetYF);
 
-        mapImage.alpha = Utils.clamp(Main.pref.getInt("mappaint.icon-image-alpha", 255), 0, 255);
+        mapImage.alpha = Utils.clamp(Config.getPref().getInt("mappaint.icon-image-alpha", 255), 0, 255);
         Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
         if (pAlpha != null) {
@@ -356 +356 @@
             // This is only executed once, so no performance concerns.
             // However, it would be better, if the settings could be changed at runtime.
-            int size = max(
-                    Main.pref.getInt("mappaint.node.selected-size", 5),
-                    Main.pref.getInt("mappaint.node.unselected-size", 3),
-                    Main.pref.getInt("mappaint.node.connection-size", 5),
-                    Main.pref.getInt("mappaint.node.tagged-size", 3)
+            int size = max(Config.getPref().getInt("mappaint.node.selected-size", 5),
+                    Config.getPref().getInt("mappaint.node.unselected-size", 3),
+                    Config.getPref().getInt("mappaint.node.connection-size", 5),
+                    Config.getPref().getInt("mappaint.node.tagged-size", 3)
             );
             return new SimpleBoxProvider(new Rectangle(-size/2, -size/2, size, size));

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

@@ -7 +7 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
@@ -15 +14 @@
 import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -148 +148 @@
                 s = defaultFontSize;
                 if (s == null) {
-                    defaultFontSize = s = (float) Main.pref.getInt("mappaint.fontsize", 8);
+                    defaultFontSize = s = (float) Config.getPref().getInt("mappaint.fontsize", 8);
                 }
             }
@@ -161 +161 @@
                 n = defaultFontName;
                 if (n == null) {
-                    defaultFontName = n = Main.pref.get("mappaint.font", "Droid Sans");
+                    defaultFontName = n = Config.getPref().get("mappaint.font", "Droid Sans");
                 }
             }