Changeset 14119 in josm for trunk/src/org/openstreetmap/josm/data/preferences

Timestamp:

2018-08-11T16:10:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods returning an URL

Location:

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

Files:

• JosmUrls.java (added)
• PreferencesWriter.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.io.XmlWriter;
-import org.openstreetmap.josm.spi.preferences.Setting;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.ListListSetting;
-import org.openstreetmap.josm.spi.preferences.SettingVisitor;
 import org.openstreetmap.josm.spi.preferences.ListSetting;
 import org.openstreetmap.josm.spi.preferences.MapListSetting;
+import org.openstreetmap.josm.spi.preferences.Setting;
+import org.openstreetmap.josm.spi.preferences.SettingVisitor;
 import org.openstreetmap.josm.spi.preferences.StringSetting;
 
@@ -57 +57 @@
         out.write(String.format("<?xml version=\"1.0\" encoding=\"UTF-8\"?>%n"));
         String rootElement = defaults ? "preferences-defaults" : "preferences";
-        out.write(String.format("<%s xmlns='%s/preferences-1.0'", rootElement, Main.getXMLBase()));
+        out.write(String.format("<%s xmlns='%s/preferences-1.0'", rootElement, Config.getUrls().getXMLBase()));
         if (defaults) {
             out.write(" xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'");