Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.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/DefaultNameFormatter.java (modified) (11 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -21 +21 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
@@ -31 +30 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetNameTemplateList;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.I18n;
@@ -105 +105 @@
         if (namingTagsForRelations == null) {
             namingTagsForRelations = new ArrayList<>(
-                    Main.pref.getList("relation.nameOrder", Arrays.asList(DEFAULT_NAMING_TAGS_FOR_RELATIONS))
+                    Config.getPref().getList("relation.nameOrder", Arrays.asList(DEFAULT_NAMING_TAGS_FOR_RELATIONS))
                     );
         }
@@ -119 +119 @@
      */
     protected void decorateNameWithId(StringBuilder name, IPrimitive primitive) {
-        if (Main.pref.getBoolean("osm-primitives.showid")) {
-            if (Main.pref.getBoolean("osm-primitives.showid.new-primitives")) {
+        if (Config.getPref().getBoolean("osm-primitives.showid")) {
+            if (Config.getPref().getBoolean("osm-primitives.showid.new-primitives")) {
                 name.append(tr(" [id: {0}]", primitive.getUniqueId()));
             } else {
@@ -155 +155 @@
             if (preset == null) {
                 String n;
-                if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+                if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
                     n = node.getLocalName();
                 } else {
@@ -233 +233 @@
             if (preset == null) {
                 String n;
-                if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+                if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
                     n = way.getLocalName();
                 } else {
@@ -433 +433 @@
     private static String getNameTagValue(IRelation relation, String nameTag) {
         if ("name".equals(nameTag)) {
-            if (Main.pref.getBoolean("osm-primitives.localize-name", true))
+            if (Config.getPref().getBoolean("osm-primitives.localize-name", true))
                 return relation.getLocalName();
             else
@@ -519 +519 @@
      */
     protected void decorateNameWithId(StringBuilder name, HistoryOsmPrimitive primitive) {
-        if (Main.pref.getBoolean("osm-primitives.showid")) {
+        if (Config.getPref().getBoolean("osm-primitives.showid")) {
             name.append(tr(" [id: {0}]", primitive.getId()));
         }
@@ -528 +528 @@
         StringBuilder sb = new StringBuilder();
         String name;
-        if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+        if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
             name = node.getLocalName();
         } else {
@@ -554 +554 @@
         StringBuilder sb = new StringBuilder();
         String name;
-        if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+        if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
             name = way.getLocalName();
         } else {
@@ -601 +601 @@
             // #3328: "note " and " note" are name tags too
             if (namingTags.contains(n.trim())) {
-                if (Main.pref.getBoolean("osm-primitives.localize-name", true)) {
+                if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
                     nameTag = relation.getLocalName();
                 } else {