Changeset 14149 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.pref

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -55 +55 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RestartAction;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.PreferencesUtils;
 import org.openstreetmap.josm.data.Version;
@@ -535 +536 @@
         }
         if (NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE)) {
-            for (String updateSite : Main.pref.getPluginSites()) {
+            for (String updateSite : Preferences.main().getPluginSites()) {
                 try {
                     OnlineResource.JOSM_WEBSITE.checkOfflineAccess(updateSite, Config.getUrls().getJOSMWebsite());
@@ -598 +599 @@
         // Update plugin list
         final ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(
-                Main.pref.getOnlinePluginSites());
+                Preferences.main().getOnlinePluginSites());
         MainApplication.worker.submit(pluginInfoDownloadTask);
 
@@ -743 +744 @@
     private static void extendJoinedPluginResourceCL(Collection<PluginInformation> plugins) {
         // iterate all plugins and collect all libraries of all plugins:
-        File pluginDir = Main.pref.getPluginsDirectory();
+        File pluginDir = Preferences.main().getPluginsDirectory();
         DynamicURLClassLoader cl = getJoinedPluginResourceCL();
 
@@ -1076 +1077 @@
             ReadRemotePluginInformationTask task1 = new ReadRemotePluginInformationTask(
                     monitor.createSubTaskMonitor(1, false),
-                    Main.pref.getOnlinePluginSites(), displayErrMsg
+                    Preferences.main().getOnlinePluginSites(), displayErrMsg
             );
             task1.run();
@@ -1248 +1249 @@
      */
     public static void installDownloadedPlugins(Collection<PluginInformation> pluginsToLoad, boolean dowarn) {
-        File pluginDir = Main.pref.getPluginsDirectory();
+        File pluginDir = Preferences.main().getPluginsDirectory();
         if (!pluginDir.exists() || !pluginDir.isDirectory() || !pluginDir.canWrite())
             return;
@@ -1326 +1327 @@
      */
     public static File findUpdatedJar(String name) {
-        File pluginDir = Main.pref.getPluginsDirectory();
+        File pluginDir = Preferences.main().getPluginsDirectory();
         // Find the downloaded file. We have tried to install the downloaded plugins
         // (PluginHandler.installDownloadedPlugins). This succeeds depending on the platform.