Changeset 2924 in josm for trunk/src/org

Timestamp:

2010-02-02T18:54:51+01:00 (15 years ago)

Author:

Gubaer

Message:

Fixed automatic update policy for plugins.
new: policy for version and time based automatic update can be configured in the preferences, see help

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/PluginPreference.java (modified) (6 diffs)
• gui/preferences/plugin/PluginListPanel.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java ) (1 diff)
• gui/preferences/plugin/PluginUpdatePolicyPanel.java (added)
• plugins/PluginHandler.java (modified) (6 diffs)

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

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginListPanel;
 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferencesModel;
-import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferencesPanel;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginUpdatePolicyPanel;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
@@ -94 +95 @@
 
     private JTextField tfFilter;
-    private PluginPreferencesPanel pnlPluginPreferences;
+    private PluginListPanel pnlPluginPreferences;
     private PluginPreferencesModel model;
     private JScrollPane spPluginPreferences;
+    private PluginUpdatePolicyPanel pnlPluginUpdatePolicy;
+
     /**
      * is set to true if this preference pane has been selected
@@ -132 +135 @@
     }
 
-    protected JPanel buildContentPane() {
+    protected JPanel buildPluginListPanel() {
         JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(buildSearchFieldPanel(), BorderLayout.NORTH);
         model  = new PluginPreferencesModel();
-        spPluginPreferences = new JScrollPane(pnlPluginPreferences = new PluginPreferencesPanel(model));
+        spPluginPreferences = new JScrollPane(pnlPluginPreferences = new PluginListPanel(model));
         spPluginPreferences.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
         spPluginPreferences.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
@@ -157 +160 @@
     }
 
+    protected JPanel buildContentPanel() {
+        JPanel pnl = new JPanel(new BorderLayout());
+        JTabbedPane tpPluginPreferences = new JTabbedPane();
+        tpPluginPreferences.add(buildPluginListPanel());
+        tpPluginPreferences.add(pnlPluginUpdatePolicy  =new PluginUpdatePolicyPanel());
+        tpPluginPreferences.setTitleAt(0, tr("Plugins"));
+        tpPluginPreferences.setTitleAt(1, tr("Plugin update policy"));
+
+        pnl.add(tpPluginPreferences, BorderLayout.CENTER);
+        return pnl;
+    }
+
     public void addGui(final PreferenceTabbedPane gui) {
         GridBagConstraints gc = new GridBagConstraints();
@@ -163 +178 @@
         gc.anchor = GridBagConstraints.NORTHWEST;
         gc.fill = GridBagConstraints.BOTH;
-        gui.plugins.add(buildContentPane(), gc);
+        gui.plugins.add(buildContentPanel(), gc);
         pnlPluginPreferences.refreshView();
         gui.addChangeListener(new PluginPreferenceActivationListener(gui.plugins));
@@ -255 +270 @@
         if (! pluginPreferencesActivated)
             return false;
+        pnlPluginUpdatePolicy.rememberInPreferences();
         if (model.isActivePluginsChanged()) {
             LinkedList<String> l = new LinkedList<String>(model.getSelectedPluginNames());

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -25 +25 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 
-public class PluginPreferencesPanel extends VerticallyScrollablePanel{
-    private static final Logger logger = Logger.getLogger(PluginPreferencesPanel.class.getName());
+public class PluginListPanel extends VerticallyScrollablePanel{
+    private static final Logger logger = Logger.getLogger(PluginListPanel.class.getName());
 
     private PluginPreferencesModel model;
 
-    public PluginPreferencesPanel() {
+    public PluginListPanel() {
         model = new PluginPreferencesModel();
         setLayout(new GridBagLayout());
     }
 
-    public PluginPreferencesPanel(PluginPreferencesModel model) {
+    public PluginListPanel(PluginPreferencesModel model) {
         this.model = model;
         setLayout(new GridBagLayout());

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

@@ -170 +170 @@
                 )
                 + "</html>";
-            togglePreferenceKey = "pluginmanager.dontshowagain.version";
+            togglePreferenceKey = "pluginmanager.version-based-update.policy";
         }  else {
             long tim = System.currentTimeMillis();
             long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
-            Integer maxTime = Main.pref.getInteger("pluginmanager.warntime", 60);
+            Integer maxTime = Main.pref.getInteger("pluginmanager.time-based-update.interval", 60);
             long d = (tim - last) / (24 * 60 * 60 * 1000l);
             if ((last <= 0) || (maxTime <= 0)) {
@@ -183 +183 @@
                     + tr("Last plugin update more than {0} days ago.", d)
                     + "</html>";
-                togglePreferenceKey = "pluginmanager.dontshowagain.time";
+                togglePreferenceKey = "pluginmanager.time-based-update.policy";
             }
         }
@@ -209 +209 @@
         // check whether automatic update at startup was disabled
         //
-        boolean doAsk = !Main.pref.getBoolean(togglePreferenceKey, false);
-        if (! doAsk) return false;
-
+        String policy = Main.pref.get(togglePreferenceKey, "ask");
+        policy = policy.trim().toLowerCase();
+        if (policy.equals("never")) {
+            if (togglePreferenceKey.equals("pluginmanager.version-based-update.policy")) {
+                System.out.println(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
+            } else if (togglePreferenceKey.equals("pluginmanager.time-based-update.policy")) {
+                System.out.println(tr("Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."));
+            }
+            return false;
+        }
+
+        if (policy.equals("always")) {
+            if (togglePreferenceKey.equals("pluginmanager.time-based-update.policy")) {
+                System.out.println(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
+            } else if (togglePreferenceKey.equals("pluginmanager.time-based-update.policy")) {
+                System.out.println(tr("Running plugin update after elapsed update interval. Automatic update at startup is disabled."));
+            }
+            return true;
+        }
+
+        if (!policy.equals("ask")) {
+            System.err.println(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey));
+        }
         int ret = HelpAwareOptionPane.showOptionDialog(
                 parent,
@@ -220 +240 @@
                 options,
                 options[0],
-                ht("/Plugin/AutomaticUpdate")
-        );
-
-        pnlMessage.rememberDontShowAgain(togglePreferenceKey);
+                ht("/Preferences/Plugins#AutomaticUpdate")
+        );
+
+        if (pnlMessage.isRememberDecision()) {
+            switch(ret) {
+            case 0:
+                Main.pref.put(togglePreferenceKey, "always");
+                break;
+            case JOptionPane.CLOSED_OPTION:
+            case 1:
+                Main.pref.put(togglePreferenceKey, "never");
+                break;
+            }
+        } else {
+            Main.pref.put(togglePreferenceKey, "ask");
+        }
         return ret == 0;
     }
@@ -888 +920 @@
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weighty = 0.0;
-            add(cbDontShowAgain = new JCheckBox(tr("Do not check and ask again at startup (remembers choice)")), gc);
+            add(cbDontShowAgain = new JCheckBox(tr("Do not ask again and remember my decision (go to Preferences->Plugins to change it later)")), gc);
             cbDontShowAgain.setFont(cbDontShowAgain.getFont().deriveFont(Font.PLAIN));
         }
@@ -901 +933 @@
 
         public void initDontShowAgain(String preferencesKey) {
-            cbDontShowAgain.setSelected(Main.pref.getBoolean(preferencesKey, false));
-        }
-
-        public void rememberDontShowAgain(String preferenceKey) {
-            Main.pref.put(preferenceKey, cbDontShowAgain.isSelected());
+            String policy = Main.pref.get(preferencesKey, "ask");
+            policy = policy.trim().toLowerCase();
+            cbDontShowAgain.setSelected(! policy.equals("ask"));
+        }
+
+        public boolean isRememberDecision() {
+            return cbDontShowAgain.isSelected();
         }
     }