Changeset 14149 in josm for trunk/scripts

Timestamp:

2018-08-12T17:24:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.pref

Location:

trunk/scripts

Files:

• SyncEditorLayerIndex.groovy (modified) (2 diffs)
• TagInfoExtract.groovy (modified) (2 diffs)

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -25 +25 @@
 import javax.json.JsonValue
 
-import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.data.Preferences
 import org.openstreetmap.josm.data.imagery.ImageryInfo
@@ -61 +60 @@
         Locale.setDefault(Locale.ROOT)
         parse_command_line_arguments(args)
-        Main.determinePlatformHook()
         def pref = new Preferences(JosmBaseDirectories.getInstance())
         Config.setPreferencesInstance(pref)

trunk/scripts/TagInfoExtract.groovy

@@ -21 +21 @@
 import javax.json.stream.JsonGenerator
 
-import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.actions.DeleteAction
 import org.openstreetmap.josm.command.DeleteCommand
+import org.openstreetmap.josm.data.Preferences
 import org.openstreetmap.josm.data.Version
 import org.openstreetmap.josm.data.coor.LatLon
@@ -413 +413 @@
      */
     def init() {
-        Main.determinePlatformHook()
         Logging.setLogLevel(Logging.LEVEL_INFO)
-        Main.pref.enableSaveOnPut(false)
-        Config.setPreferencesInstance(Main.pref)
+        Preferences.main().enableSaveOnPut(false)
+        Config.setPreferencesInstance(Preferences.main())
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance())
         Config.setUrlsProvider(JosmUrls.getInstance())