Changeset 34534 in osm

Timestamp:

2018-08-18T18:55:26+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/no_more_mapping

Files:

• build.xml (modified) (1 diff)
• src/nomore/NoMorePlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/no_more_mapping/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!--

applications/editors/josm/plugins/no_more_mapping/src/nomore/NoMorePlugin.java

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -26 +28 @@
     public NoMorePlugin(PluginInformation info) {
         super(info);
-        long startDate = Main.pref.getLong("nomoremapping.date", 0);
-        long lastHash = Math.max(Main.pref.getLong("pluginmanager.lastupdate", 0) / 1000,
-                Math.max(Main.pref.getLong("cache.motd.html", 0),
-                Main.pref.getLong("cache.bing.attribution.xml", 0))) + Main.pref.get("osm-download.bounds", "").hashCode();
-        boolean sameHash = Main.pref.getLong("nomoremapping.hash", 0) == lastHash;
+        long startDate = Config.getPref().getLong("nomoremapping.date", 0);
+        long lastHash = Math.max(Config.getPref().getLong("pluginmanager.lastupdate", 0) / 1000,
+                Math.max(Config.getPref().getLong("cache.motd.html", 0),
+                Config.getPref().getLong("cache.bing.attribution.xml", 0))) + Config.getPref().get("osm-download.bounds", "").hashCode();
+        boolean sameHash = Config.getPref().getLong("nomoremapping.hash", 0) == lastHash;
         long today = new Date().getTime() / 1000;
         if (startDate == 0 || !sameHash) {
             startDate = today;
-            Main.pref.putLong("nomoremapping.date", startDate);
-            Main.pref.putLong("nomoremapping.hash", lastHash);
+            Config.getPref().putLong("nomoremapping.date", startDate);
+            Config.getPref().putLong("nomoremapping.hash", lastHash);
         }
         long days = Math.max(today - startDate, 0) / (60*60*24);
@@ -50 +52 @@
         String prefs;
         try {
-             prefs = Main.pref.getPreferenceFile().getCanonicalPath();
+             prefs = Preferences.main().getPreferenceFile().getCanonicalPath();
         } catch (IOException e) {
-            prefs = Main.pref.getPreferenceFile().getAbsolutePath();
+            prefs = Preferences.main().getPreferenceFile().getAbsolutePath();
         }
         String howto = days > 0 ? "" : "\n\n" + tr("(To miserably continue mapping, edit out no_more_mapping\nfrom {0})", prefs);
-        JOptionPane.showMessageDialog(Main.parent, intro + " " + message + howto, "No More Mapping", JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(MainApplication.getMainFrame(), intro + " " + message + howto, 
+                "No More Mapping", JOptionPane.INFORMATION_MESSAGE);
         System.exit(0);
     }