Changeset 4028 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2011-04-15T22:03:38+02:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/preferences
- Files:
-
- 1 deleted
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java
r4016 r4028 73 73 ImageryLayerInfo layerInfo; 74 74 75 static ImagerySettingsMigration settingsMigration;76 77 75 // Common settings 78 76 private Color colFadeColor; … … 137 135 p.add(this.sharpen, GBC.eol().fill(GBC.HORIZONTAL)); 138 136 139 if (settingsMigration != null) {140 final JButton btnSettingsMigration = new JButton(tr("WMSPlugin/SlippyMap settings migration"));141 btnSettingsMigration.addActionListener(new ActionListener() {142 @Override143 public void actionPerformed(ActionEvent e) {144 if (settingsMigration == null) return;145 settingsMigration.settingsMigrationDialog(gui);146 loadSettings();147 imageryProviders.model.fireTableDataChanged();148 if (!settingsMigration.hasConflicts()) {149 btnSettingsMigration.setEnabled(false);150 settingsMigration = null;151 }152 }153 });154 p.add(btnSettingsMigration,GBC.eol().insets(0,5,0,5));155 }156 137 this.useOffsetServer = new JCheckBox(tr("Use offset server: ")); 157 138 this.offsetServerUrl = new JTextField(); … … 855 836 856 837 public static void initialize() { 857 settingsMigration = new ImagerySettingsMigration();858 settingsMigration.migrateSettings();859 if (!settingsMigration.hasConflicts()) {860 settingsMigration = null;861 }862 838 ImageryLayerInfo.instance.load(); 863 839 ImageryLayerInfo.instance.loadDefaults(false);
Note:
See TracChangeset
for help on using the changeset viewer.