Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 3717) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 3718) @@ -15,4 +15,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; import org.openstreetmap.josm.io.MirroredInputStream; @@ -68,5 +69,6 @@ if(!defaults.contains(url)) { for(ImageryInfo i : layers) { - if(url.equals(i.url)) { + if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getURL())) + || url.equals(i.getFullURL())) { force = false; } Index: trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java (revision 3717) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java (revision 3718) @@ -19,5 +19,4 @@ import java.util.List; import java.util.Locale; -import java.util.Map; import javax.swing.BorderFactory; @@ -62,4 +61,6 @@ ImageryProvidersPanel imageryProviders; + static ImagerySettingsMigration settingsMigration; + // Common settings private Color colFadeColor; @@ -87,6 +88,4 @@ this.colFadeColor = ImageryLayer.getFadeColor(); this.btnFadeColor = new JButton(); - this.btnFadeColor.setBackground(colFadeColor); - this.btnFadeColor.setText(ColorHelper.color2html(colFadeColor)); this.btnFadeColor.addActionListener(new ActionListener() { @@ -114,5 +113,4 @@ p.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL)); p.add(this.fadeAmount, GBC.eol().fill(GBC.HORIZONTAL)); - this.fadeAmount.setValue(ImageryLayer.PROP_FADE_AMOUNT.get()); this.sharpen = new JComboBox(new String[] { @@ -122,7 +120,23 @@ p.add(new JLabel(tr("Sharpen (requires layer re-add): "))); p.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL)); - p.add(this.sharpen, GBC.std().fill(GBC.HORIZONTAL)); - this.sharpen.setSelectedIndex(ImageryLayer.PROP_SHARPEN_LEVEL.get()); - + p.add(this.sharpen, GBC.eol().fill(GBC.HORIZONTAL)); + + if (settingsMigration != null) { + final JButton btnSettingsMigration = new JButton(tr("WMSPlugin/SlippyMap settings migration")); + btnSettingsMigration.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (settingsMigration == null) return; + settingsMigration.settingsMigrationDialog(gui); + loadSettings(); + imageryProviders.model.fireTableDataChanged(); + if (!settingsMigration.hasConflicts()) { + btnSettingsMigration.setEnabled(false); + settingsMigration = null; + } + } + }); + p.add(btnSettingsMigration,GBC.eol().insets(0,5,0,5)); + } return p; } @@ -136,5 +150,4 @@ "webkit-image-gtk {0}"}); browser.setEditable(true); - browser.setSelectedItem(HTMLGrabber.PROP_BROWSER.get()); p.add(new JLabel(tr("Downloader:")), GBC.eol().fill(GBC.HORIZONTAL)); p.add(browser); @@ -143,5 +156,5 @@ p.add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL)); - overlapCheckBox = new JCheckBox(tr("Overlap tiles"), WMSLayer.PROP_OVERLAP.get()); + overlapCheckBox = new JCheckBox(tr("Overlap tiles")); JLabel labelEast = new JLabel(tr("% of east:")); JLabel labelNorth = new JLabel(tr("% of north:")); @@ -196,9 +209,4 @@ tmsTab.add(addToSlippyMapChosser, GBC.eol().fill(GBC.HORIZONTAL)); - this.autozoomActive.setSelected(TMSLayer.PROP_DEFAULT_AUTOZOOM.get()); - this.autoloadTiles.setSelected(TMSLayer.PROP_DEFAULT_AUTOLOAD.get()); - this.addToSlippyMapChosser.setSelected(TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get()); - this.maxZoomLvl.setValue(TMSLayer.getMaxZoomLvl(null)); - this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null)); return tmsTab; } @@ -232,8 +240,31 @@ pane.add(buildSettingsPanel(gui)); pane.add(new OffsetBookmarksPanel(gui)); + loadSettings(); pane.setTitleAt(0, tr("Imagery providers")); pane.setTitleAt(1, tr("Settings")); pane.setTitleAt(2, tr("Offset bookmarks")); p.add(pane,GBC.std().fill(GBC.BOTH)); + } + + private void loadSettings() { + // Common settings + this.btnFadeColor.setBackground(colFadeColor); + this.btnFadeColor.setText(ColorHelper.color2html(colFadeColor)); + this.fadeAmount.setValue(ImageryLayer.PROP_FADE_AMOUNT.get()); + this.sharpen.setSelectedIndex(ImageryLayer.PROP_SHARPEN_LEVEL.get()); + + // WMS Settings + this.browser.setSelectedItem(HTMLGrabber.PROP_BROWSER.get()); + this.overlapCheckBox.setSelected(WMSLayer.PROP_OVERLAP.get()); + this.spinEast.setValue(WMSLayer.PROP_OVERLAP_EAST.get()); + this.spinNorth.setValue(WMSLayer.PROP_OVERLAP_NORTH.get()); + this.spinSimConn.setValue(WMSLayer.PROP_SIMULTANEOUS_CONNECTIONS.get()); + + // TMS Settings + this.autozoomActive.setSelected(TMSLayer.PROP_DEFAULT_AUTOZOOM.get()); + this.autoloadTiles.setSelected(TMSLayer.PROP_DEFAULT_AUTOLOAD.get()); + this.addToSlippyMapChosser.setSelected(TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get()); + this.maxZoomLvl.setValue(TMSLayer.getMaxZoomLvl(null)); + this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null)); } @@ -707,6 +738,9 @@ public static void initialize() { - migrateWMSPlugin(); - migrateSlippyMapPlugin(); + settingsMigration = new ImagerySettingsMigration(); + settingsMigration.migrateSettings(); + if (!settingsMigration.hasConflicts()) { + settingsMigration = null; + } ImageryLayerInfo.instance.load(); OffsetBookmark.loadBookmarks(); @@ -714,83 +748,3 @@ Main.main.menu.imageryMenuUpdater.refreshOffsetMenu(); } - - // Migration of WMSPlugin and SlippyMap settings - static boolean wmsLayersConflict; - static boolean wmsSettingsConflict; - static boolean tmsSettingsConflict; - - static class SettingsConflictException extends Exception { - } - - static void migrateProperty(String oldProp, String newProp) - throws SettingsConflictException { - String oldValue = Main.pref.get(oldProp, null); - if (oldValue == null) return; - String newValue = Main.pref.get(newProp, null); - if (newValue != null && !oldValue.equals(newValue)) { - System.out.println(tr("Imagery settings migration: conflict when moving property {0} -> {1}", - oldProp, newProp)); - throw new SettingsConflictException(); - } - Main.pref.put(newProp, oldValue); - Main.pref.put(oldProp, null); - } - - static void migrateWMSPlugin() { - try { - migrateProperty("wmslayers", "imagery.layers"); - } catch (SettingsConflictException e) { - wmsLayersConflict = true; - } - try { - Main.pref.put("wmslayers.default", null); - migrateProperty("imagery.remotecontrol", "remotecontrol.permission.imagery"); - migrateProperty("wmsplugin.remotecontrol", "remotecontrol.permission.imagery"); - migrateProperty("wmsplugin.alpha_channel", "imagery.wms.alpha_channel"); - migrateProperty("wmsplugin.browser", "imagery.wms.browser"); - migrateProperty("wmsplugin.user_agent", "imagery.wms.user_agent"); - migrateProperty("wmsplugin.timeout.connect", "imagery.wms.timeout.connect"); - migrateProperty("wmsplugin.timeout.read", "imagery.wms.timeout.read"); - migrateProperty("wmsplugin.simultaneousConnections", "imagery.wms.simultaneousConnections"); - migrateProperty("wmsplugin.overlap", "imagery.wms.overlap"); - migrateProperty("wmsplugin.overlapEast", "imagery.wms.overlapEast"); - migrateProperty("wmsplugin.overlapNorth", "imagery.wms.overlapNorth"); - Map unknownProps = Main.pref.getAllPrefix("wmsplugin"); - if (!unknownProps.isEmpty()) { - System.out.println(tr("There are {0} unknown WMSPlugin settings", unknownProps.size())); - wmsSettingsConflict = true; - } - } catch (SettingsConflictException e) { - wmsSettingsConflict = true; - } - } - - static void migrateSlippyMapPlugin() { - try { - Main.pref.put("slippymap.tile_source", null); - Main.pref.put("slippymap.last_zoom_lvl", null); - migrateProperty("slippymap.draw_debug", "imagery.tms.draw_debug"); - migrateProperty("slippymap.autoload_tiles", "imagery.tms.autoload"); - migrateProperty("slippymap.autozoom", "imagery.tms.autozoom"); - migrateProperty("slippymap.min_zoom_lvl", "imagery.tms.min_zoom_lvl"); - migrateProperty("slippymap.max_zoom_lvl", "imagery.tms.max_zoom_lvl"); - if (Main.pref.get("slippymap.fade_background_100", null) == null) { - try { - Main.pref.putInteger("slippymap.fade_background_100", (int)Math.round( - Double.valueOf(Main.pref.get("slippymap.fade_background", "0"))*100.0)); - } catch (NumberFormatException e) { - } - } - Main.pref.put("slippymap.fade_background", null); - migrateProperty("slippymap.fade_background_100", "imagery.fade_amount"); - Map unknownProps = Main.pref.getAllPrefix("slippymap"); - if (!unknownProps.isEmpty()) { - System.out.println(tr("There are {0} unknown slippymap plugin settings", unknownProps.size())); - wmsSettingsConflict = true; - } - } catch (SettingsConflictException e) { - tmsSettingsConflict = true; - } - } - } Index: trunk/src/org/openstreetmap/josm/gui/preferences/ImagerySettingsMigration.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ImagerySettingsMigration.java (revision 3718) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ImagerySettingsMigration.java (revision 3718) @@ -0,0 +1,230 @@ +package org.openstreetmap.josm.gui.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.GridBagLayout; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; + +import javax.swing.ButtonGroup; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.data.imagery.ImageryLayerInfo; +import org.openstreetmap.josm.tools.GBC; + +/** Migration of WMSPlugin and SlippyMap settings */ +class ImagerySettingsMigration { + enum PropertyMerge { + USE_OLD, + USE_NEW, + THROW_ON_CONFLICT + } + static boolean wmsLayersConflict; + static boolean wmsSettingsConflict; + static boolean tmsSettingsConflict; + + private PropertyMerge mergeModel = PropertyMerge.THROW_ON_CONFLICT; + + static class SettingsConflictException extends Exception { + } + + private void migrateProperty(String oldProp, String newProp) + throws SettingsConflictException { + String oldValue = Main.pref.get(oldProp, null); + if (oldValue == null) return; + if (mergeModel == PropertyMerge.THROW_ON_CONFLICT) { + String newValue = Main.pref.get(newProp, null); + if (newValue != null && !oldValue.equals(newValue)) { + System.out.println(tr("Imagery settings migration: conflict when moving property {0} -> {1}", + oldProp, newProp)); + throw new SettingsConflictException(); + } + } + if (mergeModel != PropertyMerge.USE_NEW) { + Main.pref.put(newProp, oldValue); + } + Main.pref.put(oldProp, null); + } + + private void migrateArray(String oldProp, String newProp) + throws SettingsConflictException { + Collection> oldValue = Main.pref.getArray(oldProp, null); + if (oldValue == null) return; + if (mergeModel == PropertyMerge.THROW_ON_CONFLICT) { + Collection> newValue = Main.pref.getArray(newProp, null); + if (newValue != null) { + System.out.println(tr("Imagery settings migration: conflict when moving array {0} -> {1}", + oldProp, newProp)); + throw new SettingsConflictException(); + } + } + if (mergeModel != PropertyMerge.USE_NEW) { + Main.pref.putArray(newProp, oldValue); + } + Main.pref.putArray(oldProp, null); + } + + private void migrateWMSPlugin() { + try { + Main.pref.put("wmslayers.default", null); + migrateProperty("imagery.remotecontrol", "remotecontrol.permission.imagery"); + migrateProperty("wmsplugin.remotecontrol", "remotecontrol.permission.imagery"); + migrateProperty("wmsplugin.alpha_channel", "imagery.wms.alpha_channel"); + migrateProperty("wmsplugin.browser", "imagery.wms.browser"); + migrateProperty("wmsplugin.user_agent", "imagery.wms.user_agent"); + migrateProperty("wmsplugin.timeout.connect", "imagery.wms.timeout.connect"); + migrateProperty("wmsplugin.timeout.read", "imagery.wms.timeout.read"); + migrateProperty("wmsplugin.simultaneousConnections", "imagery.wms.simultaneousConnections"); + migrateProperty("wmsplugin.overlap", "imagery.wms.overlap"); + migrateProperty("wmsplugin.overlapEast", "imagery.wms.overlapEast"); + migrateProperty("wmsplugin.overlapNorth", "imagery.wms.overlapNorth"); + Map unknownProps = Main.pref.getAllPrefix("wmsplugin"); + if (!unknownProps.isEmpty()) { + System.out.println(tr("There are {0} unknown WMSPlugin settings", unknownProps.size())); + } + } catch (SettingsConflictException e) { + wmsSettingsConflict = true; + } + } + + private void migrateSlippyMapPlugin() { + try { + Main.pref.put("slippymap.tile_source", null); + Main.pref.put("slippymap.last_zoom_lvl", null); + migrateProperty("slippymap.draw_debug", "imagery.tms.draw_debug"); + migrateProperty("slippymap.autoload_tiles", "imagery.tms.autoload"); + migrateProperty("slippymap.autozoom", "imagery.tms.autozoom"); + migrateProperty("slippymap.min_zoom_lvl", "imagery.tms.min_zoom_lvl"); + migrateProperty("slippymap.max_zoom_lvl", "imagery.tms.max_zoom_lvl"); + if (Main.pref.get("slippymap.fade_background_100", null) == null) { + try { + Main.pref.putInteger("slippymap.fade_background_100", (int)Math.round( + Double.valueOf(Main.pref.get("slippymap.fade_background", "0"))*100.0)); + } catch (NumberFormatException e) { + } + } + Main.pref.put("slippymap.fade_background", null); + migrateProperty("slippymap.fade_background_100", "imagery.fade_amount"); + Map unknownProps = Main.pref.getAllPrefix("slippymap"); + if (!unknownProps.isEmpty()) { + System.out.println(tr("There are {0} unknown slippymap plugin settings", unknownProps.size())); + } + } catch (SettingsConflictException e) { + tmsSettingsConflict = true; + } + } + + private void mergeWMSLayers() { + ImageryLayerInfo layerInfo = ImageryLayerInfo.instance; + HashSet existingUrls = new HashSet(); + for (ImageryInfo info : layerInfo.getLayers()) { + existingUrls.add(info.getFullURL()); + } + for(Collection c : Main.pref.getArray("wmslayers", + Collections.>emptySet())) { + ImageryInfo info = new ImageryInfo(c); + if (!existingUrls.contains(info.getFullURL())) { + layerInfo.add(info); + } + } + layerInfo.save(); + Main.pref.putArray("wmslayers", null); + } + + public void migrateSettings() { + mergeModel = PropertyMerge.THROW_ON_CONFLICT; + try { + migrateArray("wmslayers", "imagery.layers"); + } catch (SettingsConflictException e) { + wmsLayersConflict = true; + } + migrateWMSPlugin(); + migrateSlippyMapPlugin(); + } + + public boolean hasConflicts() { + return wmsLayersConflict || wmsSettingsConflict || tmsSettingsConflict; + } + + JRadioButton wlKeepImagery = new JRadioButton(tr("Keep current list")); + JRadioButton wlUseWMS = new JRadioButton(tr("Overwrite with WMSPlugin list")); + JRadioButton wlMerge = new JRadioButton(tr("Merge")); + + JRadioButton wsKeepImagery = new JRadioButton(tr("Keep current settings")); + JRadioButton wsUseWMS = new JRadioButton(tr("Overwrite with WMSPlugin settings")); + + JRadioButton tsKeepImagery = new JRadioButton(tr("Keep current settings")); + JRadioButton tsUseSlippyMap = new JRadioButton(tr("Overwrite with SlippyMap settings")); + + public void settingsMigrationDialog(Component parent) { + JPanel p = new JPanel(new GridBagLayout()); + + if (wmsLayersConflict) { + p.add(new JLabel(tr("WMS layer list:")), GBC.eol()); + ButtonGroup g = new ButtonGroup(); + g.add(wlKeepImagery); + g.add(wlUseWMS); + g.add(wlMerge); + wlMerge.setSelected(true); + + p.add(wlKeepImagery, GBC.eol()); + p.add(wlUseWMS, GBC.eol()); + p.add(wlMerge, GBC.eop()); + } + + if (wmsSettingsConflict) { + p.add(new JLabel(tr("WMSPlugin settings:")), GBC.eol()); + ButtonGroup g = new ButtonGroup(); + g.add(wsKeepImagery); + g.add(wsUseWMS); + wsKeepImagery.setSelected(true); + + p.add(wsKeepImagery, GBC.eol()); + p.add(wsUseWMS, GBC.eop()); + } + + if (tmsSettingsConflict) { + p.add(new JLabel(tr("SlippyMap settings:")), GBC.eol()); + ButtonGroup g = new ButtonGroup(); + g.add(tsKeepImagery); + g.add(tsUseSlippyMap); + tsKeepImagery.setSelected(true); + + p.add(tsKeepImagery, GBC.eol()); + p.add(tsUseSlippyMap, GBC.eop()); + } + int answer = JOptionPane.showConfirmDialog( + parent, p, + tr("Imagery settings migration"), + JOptionPane.OK_CANCEL_OPTION); + if (answer != JOptionPane.OK_OPTION) return; + try { + if (wlMerge.isSelected()) { + mergeWMSLayers(); + } else { + mergeModel = wlKeepImagery.isSelected() ? PropertyMerge.USE_NEW : PropertyMerge.USE_OLD; + migrateArray("wmslayers", "imagery.layers"); + } + wmsLayersConflict = false; + mergeModel = wsKeepImagery.isSelected() ? PropertyMerge.USE_NEW : PropertyMerge.USE_OLD; + migrateWMSPlugin(); + wmsSettingsConflict = false; + mergeModel = tsKeepImagery.isSelected() ? PropertyMerge.USE_NEW : PropertyMerge.USE_OLD; + migrateSlippyMapPlugin(); + tmsSettingsConflict = false; + } catch (SettingsConflictException e) { + JOptionPane.showMessageDialog( + parent, tr("Warning: unexpected settings conflict"), + tr("Imagery settings migration"), + JOptionPane.OK_OPTION); + } + } +}