Changeset 1073 in josm for trunk/src

Timestamp:

2008-11-09T22:10:39+01:00 (16 years ago)

Author:

stoecker

Message:

added some plugin checks

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• actions/AboutAction.java (modified) (1 diff)
• data/Preferences.java (modified) (2 diffs)
• gui/PleaseWaitDialog.java (modified) (1 diff)
• gui/preferences/PluginPreference.java (modified) (3 diffs)
• plugins/PluginDownloader.java (modified) (3 diffs)
• plugins/PluginInformation.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -33 +33 @@
 import javax.swing.UIManager;
 
+import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
@@ -247 +248 @@
                                 if (info.early != early)
                                         continue;
+                                if (info.mainversion != null && info.mainversion.compareTo(AboutAction.version) < 0)
+                                {
+                                        JOptionPane.showMessageDialog(Main.parent, tr("Plugin requires JOSM update: {0}.", pluginName));
+                                        continue;
+                                }
                                 if (!p.containsKey(info.stage))
                                         p.put(info.stage, new LinkedList<PluginInformation>());
@@ -255 +261 @@
                                 else
                                         JOptionPane.showMessageDialog(Main.parent, tr("Plugin not found: {0}.", pluginName));
+                        }
+                }
+
+                if(!early)
+                {
+                        long tim = System.currentTimeMillis();
+                        long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
+                        Integer maxTime = Main.pref.getInteger("pluginmanager.warntime", 30*24*60*60);
+                        if(last <= 0)
+                        {
+                                Main.pref.put("pluginmanager.lastupdate",Long.toString(tim));
+                        }
+                        else if(tim - last >= maxTime*1000*24*60*60)
+                        {
+                                long d = (tim - last)/(24*60*60*1000);
+                                JOptionPane.showMessageDialog(Main.parent, tr("Last plugin update more than {0} days ago.", d));
                         }
                 }

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -52 +52 @@
 
         static {
-                revision = loadFile(Main.class.getResource("/REVISION"));
+                URL u = Main.class.getResource("/REVISION");
+                if(u == null) u = Main.class.getResource("/META-INF/MANIFEST.MF");
+                revision = loadFile(u);
 
-                Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+                Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
                 Matcher match = versionPattern.matcher(revision.getText());
                 version = match.matches() ? match.group(1) : tr("UNKNOWN");
 
-                Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+                Pattern timePattern = Pattern.compile(".*?(?:Last Changed Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
                 match = timePattern.matcher(revision.getText());
                 time = match.matches() ? match.group(1) : tr("UNKNOWN");

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -388 +388 @@
         }
 
+        synchronized public long getLong(String key, long def) {
+                putDefault(key, Long.toString(def));
+                String v = get(key);
+                if(null == v)
+                        return def;
+
+                try {
+                        return Long.parseLong(v);
+                } catch(NumberFormatException e) {
+                        // fall out
+                }
+                return def;
+        }
+
         synchronized public double getDouble(String key, double def) {
                 putDefault(key, Double.toString(def));
@@ -408 +422 @@
                         /* handle old comma separated stuff - remove in future */
                         if(s.indexOf(',') >= 0)
+                                return Arrays.asList(s.split(","));
+                        /* handle space separated stuff - remove in future */
+                        else if(s.indexOf(' ') >= 0)
                                 return Arrays.asList(s.split(","));
                         else

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -35 +35 @@
                 pane.add(cancel, GBC.eol().anchor(GBC.CENTER));
                 setContentPane(pane);
-                setSize(400,100);
+                setSize(Main.pref.getInteger("progressdialog.size",400),100);
                 setLocationRelativeTo(Main.parent);
         }

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -198 +198 @@
         private void update() {
                 // refresh description
-                PluginDownloader.downloadDescription();
+                int num = PluginDownloader.downloadDescription();
+                Boolean done = false;
                 refreshPluginPanel(gui);
 
@@ -205 +206 @@
                 for (PluginProxy proxy : Main.plugins) {
                         PluginDescription description = findDescription(proxy.info.name);
-                        if (description != null && (description.version == null || description.version.equals("")) ? (proxy.info.version != null && proxy.info.version.equals("")) : !description.version.equals(proxy.info.version)) {
+                        if (description != null && (description.version == null || description.version.equals(""))
+                        ? (proxy.info.version != null && proxy.info.version.equals("")) : !description.version.equals(proxy.info.version)) {
                                 toUpdate.add(description);
                                 toUpdateStr.append(description.name+"\n");
@@ -212 +214 @@
                 if (toUpdate.isEmpty()) {
                         JOptionPane.showMessageDialog(Main.parent, tr("All installed plugins are up to date."));
-                        return;
-                }
-                int answer = JOptionPane.showConfirmDialog(Main.parent, tr("Update the following plugins:\n\n{0}", toUpdateStr.toString()), tr("Update"), JOptionPane.OK_CANCEL_OPTION);
-                if (answer != JOptionPane.OK_OPTION)
-                        return;
-                PluginDownloader.update(toUpdate);
+                        done = true;
+                }
+                else
+                {
+                        int answer = JOptionPane.showConfirmDialog(Main.parent, tr("Update the following plugins:\n\n{0}",
+                        toUpdateStr.toString()), tr("Update"), JOptionPane.OK_CANCEL_OPTION);
+                        if (answer == JOptionPane.OK_OPTION)
+                        {
+                                PluginDownloader.update(toUpdate);
+                                done = true;
+                        }
+                }
+                if(done && num >= 1)
+                        Main.pref.put("pluginmanager.lastupdate", Long.toString(System.currentTimeMillis()));
         }
 

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

@@ -20 +20 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.regex.Matcher;
@@ -71 +72 @@
         private static final Pattern wiki = Pattern.compile("^</td></tr><tr><td><a class=\"ext-link\" href=\"([^\"]*)\"><span class=\"icon\">([^<]*)</span></a></td><td>([^<]*)</td><td>([^<].*)</td><td>(.*)");
 
+        private final static String[] pluginSites = {"http://josm.openstreetmap.de/wiki/Plugins"};
+
+        public static Collection<String> getSites() {
+                return Main.pref.getCollection("pluginmanager.sites", Arrays.asList(pluginSites));
+        }
+
         public static int downloadDescription() {
                 int count = 0;
@@ -94 +101 @@
                 return count;
         }
-
-        public static String[] getSites() {
-            return Main.pref.get("pluginmanager.sites", "http://josm.openstreetmap.de/wiki/Plugins").split(" ");
-    }
 
         private static CharSequence readXml(BufferedReader r) throws IOException {

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

@@ -32 +32 @@
         public final File file;
         public final String name;
+        public final String mainversion;
         public final String className;
         public final String description;
@@ -81 +82 @@
                                 stage = stageStr == null ? 50 : Integer.parseInt(stageStr);
                                 version = attr.getValue("Plugin-Version");
+                                mainversion = attr.getValue("Plugin-Mainversion");
                                 author = attr.getValue("Author");
 
@@ -101 +103 @@
                                 // resource-only plugin
                                 className = null;
+                                mainversion = null;
                                 description = tr("unknown");
                                 early = false;