Changeset 13002 in josm for trunk/src/org

Timestamp:

2017-10-15T19:27:02+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - remove some uses of Main.pref

Location:

trunk/src/org/openstreetmap/josm/data/preferences

Files:

• CollectionProperty.java (modified) (2 diffs)
• EnumProperty.java (modified) (2 diffs)
• IntegerProperty.java (modified) (2 diffs)
• ListProperty.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/CollectionProperty.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -21 +19 @@
     public CollectionProperty(String key, Collection<String> defaultValue) {
         super(key, defaultValue);
-        if (Main.pref != null) {
+        if (getPreferences() != null) {
             get();
         }

trunk/src/org/openstreetmap/josm/data/preferences/EnumProperty.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.preferences;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -23 +23 @@
         super(enumClass, defaultValue);
         this.key = key;
-        if (Main.pref != null) {
+        if (Config.getPref() != null) {
             get();
         }

trunk/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.preferences;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -17 +15 @@
     public IntegerProperty(String key, int defaultValue) {
         super(key, defaultValue);
-        if (Main.pref != null) {
+        if (getPreferences() != null) {
             get();
         }

trunk/src/org/openstreetmap/josm/data/preferences/ListProperty.java

@@ -3 +3 @@
 
 import java.util.List;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -18 +16 @@
     public ListProperty(String key, List<String> defaultValue) {
         super(key, defaultValue);
-        if (Main.pref != null) {
+        if (getPreferences() != null) {
             get();
         }