Changeset 2924 in josm for trunk/src/org/openstreetmap/josm/gui

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/gui/preferences

Files:

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

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());