Index: src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 14755) +++ src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (nonexistent) @@ -1,234 +0,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.preferences.plugin; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.FlowLayout; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.util.EnumMap; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; - -import javax.swing.ButtonGroup; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; -import org.openstreetmap.josm.gui.widgets.JosmTextField; -import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; -import org.openstreetmap.josm.plugins.PluginHandler; -import org.openstreetmap.josm.spi.preferences.Config; - -/** - * A panel for configuring whether JOSM shall update plugins at startup. - * - */ -public class PluginUpdatePolicyPanel extends JPanel { - - private enum Policy { - ASK("ask"), - ALWAYS("always"), - NEVER("never"); - - private final String preferenceValue; - - Policy(String preferenceValue) { - this.preferenceValue = preferenceValue; - } - - public String getPreferencesValue() { - return preferenceValue; - } - - static Policy fromPreferenceValue(String preferenceValue) { - if (preferenceValue == null) - return null; - String prefValue = preferenceValue.trim().toLowerCase(Locale.ENGLISH); - for (Policy p: Policy.values()) { - if (p.getPreferencesValue().equals(prefValue)) - return p; - } - return null; - } - } - - private transient Map rbVersionBasedUpatePolicy; - private transient Map rbTimeBasedUpatePolicy; - private final JosmTextField tfUpdateInterval = new JosmTextField(5); - private final JLabel lblUpdateInterval = new JLabel(tr("Update interval (in days):")); - - /** - * Constructs a new {@code PluginUpdatePolicyPanel}. - */ - public PluginUpdatePolicyPanel() { - build(); - initFromPreferences(); - } - - protected JPanel buildVersionBasedUpdatePolicyPanel() { - JPanel pnl = new JPanel(new GridBagLayout()); - GridBagConstraints gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - - ButtonGroup bgVersionBasedUpdatePolicy = new ButtonGroup(); - rbVersionBasedUpatePolicy = new EnumMap<>(Policy.class); - JRadioButton btn = new JRadioButton(tr("Ask before updating")); - rbVersionBasedUpatePolicy.put(Policy.ASK, btn); - bgVersionBasedUpdatePolicy.add(btn); - - btn = new JRadioButton(tr("Always update without asking")); - rbVersionBasedUpatePolicy.put(Policy.ALWAYS, btn); - bgVersionBasedUpdatePolicy.add(btn); - - btn = new JRadioButton(tr("Never update")); - rbVersionBasedUpatePolicy.put(Policy.NEVER, btn); - bgVersionBasedUpdatePolicy.add(btn); - - JMultilineLabel lbl = new JMultilineLabel( - tr("Please decide whether JOSM shall automatically update active plugins at startup after an update of JOSM itself.")); - gc.gridy = 0; - pnl.add(lbl, gc); - for (Policy p: Policy.values()) { - gc.gridy++; - pnl.add(rbVersionBasedUpatePolicy.get(p), gc); - } - return pnl; - } - - protected JPanel buildUpdateIntervalPanel() { - JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT)); - pnl.add(lblUpdateInterval); - pnl.add(tfUpdateInterval); - lblUpdateInterval.setLabelFor(tfUpdateInterval); - SelectAllOnFocusGainedDecorator.decorate(tfUpdateInterval); - return pnl; - } - - protected JPanel buildTimeBasedUpdatePolicyPanel() { - JPanel pnl = new JPanel(new GridBagLayout()); - GridBagConstraints gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - - TimeBasedPolicyChangeListener changeListener = new TimeBasedPolicyChangeListener(); - - ButtonGroup bgTimeBasedUpdatePolicy = new ButtonGroup(); - rbTimeBasedUpatePolicy = new EnumMap<>(Policy.class); - JRadioButton btn = new JRadioButton(tr("Ask before updating")); - btn.addChangeListener(changeListener); - rbTimeBasedUpatePolicy.put(Policy.ASK, btn); - bgTimeBasedUpdatePolicy.add(btn); - - btn = new JRadioButton(tr("Always update without asking")); - btn.addChangeListener(changeListener); - rbTimeBasedUpatePolicy.put(Policy.ALWAYS, btn); - bgTimeBasedUpdatePolicy.add(btn); - - btn = new JRadioButton(tr("Never update")); - btn.addChangeListener(changeListener); - rbTimeBasedUpatePolicy.put(Policy.NEVER, btn); - bgTimeBasedUpdatePolicy.add(btn); - - JMultilineLabel lbl = new JMultilineLabel( - tr("Please decide whether JOSM shall automatically update active plugins after a certain period of time.")); - gc.gridy = 0; - pnl.add(lbl, gc); - for (Policy p: Policy.values()) { - gc.gridy++; - pnl.add(rbTimeBasedUpatePolicy.get(p), gc); - } - gc.gridy++; - pnl.add(buildUpdateIntervalPanel(), gc); - return pnl; - } - - protected final void build() { - setLayout(new GridBagLayout()); - GridBagConstraints gc = new GridBagConstraints(); - gc.anchor = GridBagConstraints.NORTHWEST; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - gc.insets = new Insets(5, 5, 10, 5); - - add(buildVersionBasedUpdatePolicyPanel(), gc); - gc.gridy = 1; - add(buildTimeBasedUpdatePolicyPanel(), gc); - - gc.gridy = 2; - gc.weighty = 1.0; - gc.fill = GridBagConstraints.BOTH; - add(new JPanel(), gc); - } - - /** - * Loads the relevant preference values from the JOSM preferences - */ - public final void initFromPreferences() { - rbVersionBasedUpatePolicy.get( - Optional.ofNullable(Policy.fromPreferenceValue( - Config.getPref().get("pluginmanager.version-based-update.policy", "ask"))).orElse(Policy.ASK)) - .setSelected(true); - rbTimeBasedUpatePolicy.get( - Optional.ofNullable(Policy.fromPreferenceValue( - Config.getPref().get("pluginmanager.time-based-update.policy", "ask"))).orElse(Policy.ASK)) - .setSelected(true); - - int days = Config.getPref().getInt("pluginmanager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL); - tfUpdateInterval.setText(Integer.toString(days)); - } - - /** - * Remebers the update policy preference settings on the JOSM preferences - */ - public void rememberInPreferences() { - - // remember policy for version based update - // - for (Policy p: Policy.values()) { - if (rbVersionBasedUpatePolicy.get(p).isSelected()) { - Config.getPref().put("pluginmanager.version-based-update.policy", p.getPreferencesValue()); - break; - } - } - - // remember policy for time based update - // - for (Policy p: Policy.values()) { - if (rbTimeBasedUpatePolicy.get(p).isSelected()) { - Config.getPref().put("pluginmanager.time-based-update.policy", p.getPreferencesValue()); - break; - } - } - - // remember update interval - // - int days = 0; - try { - days = Integer.parseInt(tfUpdateInterval.getText().trim()); - if (days <= 0) { - days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL; - } - } catch (NumberFormatException e) { - days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL; - } - Config.getPref().putInt("pluginmanager.time-based-update.interval", days); - } - - class TimeBasedPolicyChangeListener implements ChangeListener { - @Override - public void stateChanged(ChangeEvent e) { - lblUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); - tfUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); - } - } - -} Property changes on: src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: src/org/openstreetmap/josm/gui/preferences/UpdatePolicyPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/UpdatePolicyPanel.java (nonexistent) +++ src/org/openstreetmap/josm/gui/preferences/UpdatePolicyPanel.java (working copy) @@ -0,0 +1,245 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.EnumMap; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; + +import javax.swing.ButtonGroup; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import org.openstreetmap.josm.gui.widgets.JMultilineLabel; +import org.openstreetmap.josm.gui.widgets.JosmTextField; +import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; +import org.openstreetmap.josm.plugins.PluginHandler; +import org.openstreetmap.josm.spi.preferences.Config; + +/** + * An abstract method to implement update panels + * @author Taylor Smock + * @since xxx + */ +public class UpdatePolicyPanel extends JPanel { + private enum Policy { + ASK("ask"), + ALWAYS("always"), + NEVER("never"); + + private final String preferenceValue; + + Policy(String preferenceValue) { + this.preferenceValue = preferenceValue; + } + + public String getPreferencesValue() { + return preferenceValue; + } + + static Policy fromPreferenceValue(String preferenceValue) { + if (preferenceValue == null) + return null; + String prefValue = preferenceValue.trim().toLowerCase(Locale.ENGLISH); + for (Policy p: Policy.values()) { + if (p.getPreferencesValue().equals(prefValue)) + return p; + } + return null; + } + } + + private transient Map rbVersionBasedUpatePolicy; + private transient Map rbTimeBasedUpatePolicy; + private final JosmTextField tfUpdateInterval = new JosmTextField(5); + private final JLabel lblUpdateInterval = new JLabel(tr("Update interval (in days):")); + private final String type; + + /** + * Constructs a new {@code UpdatePolicyPanel}. + * @param type The type of external file to update (plugin, validator, map paint style) + */ + public UpdatePolicyPanel(String type) { + this.type = type; + build(); + initFromPreferences(); + } + + /* + * Prevent empty super() + */ + @SuppressWarnings("unused") + private UpdatePolicyPanel() { + this.type = null; + // Do nothing + } + + protected JPanel buildVersionBasedUpdatePolicyPanel() { + JPanel pnl = new JPanel(new GridBagLayout()); + GridBagConstraints gc = new GridBagConstraints(); + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 1.0; + + ButtonGroup bgVersionBasedUpdatePolicy = new ButtonGroup(); + rbVersionBasedUpatePolicy = new EnumMap<>(Policy.class); + JRadioButton btn = new JRadioButton(tr("Ask before updating")); + rbVersionBasedUpatePolicy.put(Policy.ASK, btn); + bgVersionBasedUpdatePolicy.add(btn); + + btn = new JRadioButton(tr("Always update without asking")); + rbVersionBasedUpatePolicy.put(Policy.ALWAYS, btn); + bgVersionBasedUpdatePolicy.add(btn); + + btn = new JRadioButton(tr("Never update")); + rbVersionBasedUpatePolicy.put(Policy.NEVER, btn); + bgVersionBasedUpdatePolicy.add(btn); + + JMultilineLabel lbl = new JMultilineLabel( + tr("Please decide whether JOSM shall automatically update active " + type + "s at startup after an update of JOSM itself.")); + gc.gridy = 0; + pnl.add(lbl, gc); + for (Policy p: Policy.values()) { + gc.gridy++; + pnl.add(rbVersionBasedUpatePolicy.get(p), gc); + } + return pnl; + } + + protected JPanel buildUpdateIntervalPanel() { + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT)); + pnl.add(lblUpdateInterval); + pnl.add(tfUpdateInterval); + lblUpdateInterval.setLabelFor(tfUpdateInterval); + SelectAllOnFocusGainedDecorator.decorate(tfUpdateInterval); + return pnl; + } + + protected JPanel buildTimeBasedUpdatePolicyPanel() { + JPanel pnl = new JPanel(new GridBagLayout()); + GridBagConstraints gc = new GridBagConstraints(); + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 1.0; + + TimeBasedPolicyChangeListener changeListener = new TimeBasedPolicyChangeListener(); + + ButtonGroup bgTimeBasedUpdatePolicy = new ButtonGroup(); + rbTimeBasedUpatePolicy = new EnumMap<>(Policy.class); + JRadioButton btn = new JRadioButton(tr("Ask before updating")); + btn.addChangeListener(changeListener); + rbTimeBasedUpatePolicy.put(Policy.ASK, btn); + bgTimeBasedUpdatePolicy.add(btn); + + btn = new JRadioButton(tr("Always update without asking")); + btn.addChangeListener(changeListener); + rbTimeBasedUpatePolicy.put(Policy.ALWAYS, btn); + bgTimeBasedUpdatePolicy.add(btn); + + btn = new JRadioButton(tr("Never update")); + btn.addChangeListener(changeListener); + rbTimeBasedUpatePolicy.put(Policy.NEVER, btn); + bgTimeBasedUpdatePolicy.add(btn); + + JMultilineLabel lbl = new JMultilineLabel( + tr("Please decide whether JOSM shall automatically update active " + type + "s after a certain period of time.")); + gc.gridy = 0; + pnl.add(lbl, gc); + for (Policy p: Policy.values()) { + gc.gridy++; + pnl.add(rbTimeBasedUpatePolicy.get(p), gc); + } + gc.gridy++; + pnl.add(buildUpdateIntervalPanel(), gc); + return pnl; + } + + protected final void build() { + setLayout(new GridBagLayout()); + GridBagConstraints gc = new GridBagConstraints(); + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 1.0; + gc.insets = new Insets(5, 5, 10, 5); + + add(buildVersionBasedUpdatePolicyPanel(), gc); + gc.gridy = 1; + add(buildTimeBasedUpdatePolicyPanel(), gc); + + gc.gridy = 2; + gc.weighty = 1.0; + gc.fill = GridBagConstraints.BOTH; + add(new JPanel(), gc); + } + + /** + * Loads the relevant preference values from the JOSM preferences + */ + public final void initFromPreferences() { + rbVersionBasedUpatePolicy.get( + Optional.ofNullable(Policy.fromPreferenceValue( + Config.getPref().get(type + "manager.version-based-update.policy", "ask"))).orElse(Policy.ASK)) + .setSelected(true); + rbTimeBasedUpatePolicy.get( + Optional.ofNullable(Policy.fromPreferenceValue( + Config.getPref().get(type + "manager.time-based-update.policy", "ask"))).orElse(Policy.ASK)) + .setSelected(true); + + int days = Config.getPref().getInt(type + "manager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL); + tfUpdateInterval.setText(Integer.toString(days)); + } + + /** + * Remembers the update policy preference settings on the JOSM preferences + */ + public void rememberInPreferences() { + + // remember policy for version based update + // + for (Policy p: Policy.values()) { + if (rbVersionBasedUpatePolicy.get(p).isSelected()) { + Config.getPref().put(type + "manager.version-based-update.policy", p.getPreferencesValue()); + break; + } + } + + // remember policy for time based update + // + for (Policy p: Policy.values()) { + if (rbTimeBasedUpatePolicy.get(p).isSelected()) { + Config.getPref().put(type + "manager.time-based-update.policy", p.getPreferencesValue()); + break; + } + } + + // remember update interval + // + int days = 0; + try { + days = Integer.parseInt(tfUpdateInterval.getText().trim()); + if (days <= 0) { + days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL; + } + } catch (NumberFormatException e) { + days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL; + } + Config.getPref().putInt(type + "manager.time-based-update.interval", days); + } + + class TimeBasedPolicyChangeListener implements ChangeListener { + @Override + public void stateChanged(ChangeEvent e) { + lblUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); + tfUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected()); + } + } +} Index: src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 14755) +++ src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (working copy) @@ -54,6 +54,7 @@ import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory; import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.PreferencePanel; +import org.openstreetmap.josm.gui.preferences.UpdatePolicyPanel; import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; @@ -87,7 +88,7 @@ private PluginListPanel pnlPluginPreferences; private PluginPreferencesModel model; private JScrollPane spPluginPreferences; - private PluginUpdatePolicyPanel pnlPluginUpdatePolicy; + private UpdatePolicyPanel pnlPluginUpdatePolicy; /** * is set to true if this preference pane has been selected by the user @@ -251,7 +252,7 @@ private JTabbedPane buildContentPane() { JTabbedPane pane = getTabPane(); - pnlPluginUpdatePolicy = new PluginUpdatePolicyPanel(); + pnlPluginUpdatePolicy = new UpdatePolicyPanel("plugin"); pane.addTab(tr("Plugins"), buildPluginListPanel()); pane.addTab(tr("Plugin update policy"), pnlPluginUpdatePolicy); return pane; Index: src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 14755) +++ src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (working copy) @@ -9,6 +9,8 @@ import java.util.Collections; import java.util.List; +import javax.swing.JTabbedPane; + import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry; import org.openstreetmap.josm.data.preferences.sources.SourceEntry; import org.openstreetmap.josm.data.preferences.sources.SourceProvider; @@ -22,6 +24,7 @@ import org.openstreetmap.josm.gui.preferences.SourceEditor; import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting; import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting; +import org.openstreetmap.josm.gui.preferences.UpdatePolicyPanel; import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference; import org.openstreetmap.josm.spi.preferences.Config; @@ -42,6 +45,8 @@ } private static final List ruleSourceProviders = new ArrayList<>(); + private UpdatePolicyPanel vupp; + private boolean validatorPreferencesActivated = false; /** * Registers a new additional rule source provider. @@ -130,7 +135,11 @@ valPref.addSubTab(this, tr("Tag checker rules"), sources, tr("Choose Tag checker rules to enable")); + vupp = new UpdatePolicyPanel("validator"); + JTabbedPane pane = valPref.getTabPane(); + pane.addTab(tr("Tag checker update policy"), vupp); sources.deferLoading(valPref, sources); + validatorPreferencesActivated = true; } @Override @@ -142,7 +151,9 @@ OsmValidator.initializeTests(Collections.singleton(tagChecker)); } } - + if (validatorPreferencesActivated) { + vupp.rememberInPreferences(); + } return false; }