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

Timestamp:

2011-04-15T22:03:38+02:00 (13 years ago)

Author:

stoecker

Message:

remove migration stuff for old imagery, wms and remote control plugins

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• ImageryPreference.java (modified) (3 diffs)
• ImagerySettingsMigration.java (deleted)

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

@@ -73 +73 @@
     ImageryLayerInfo layerInfo;
 
-    static ImagerySettingsMigration settingsMigration;
-
     // Common settings
     private Color colFadeColor;
@@ -137 +135 @@
         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));
-        }
         this.useOffsetServer = new JCheckBox(tr("Use offset server: "));
         this.offsetServerUrl = new JTextField();
@@ -855 +836 @@
 
     public static void initialize() {
-        settingsMigration = new ImagerySettingsMigration();
-        settingsMigration.migrateSettings();
-        if (!settingsMigration.hasConflicts()) {
-            settingsMigration = null;
-        }
         ImageryLayerInfo.instance.load();
         ImageryLayerInfo.instance.loadDefaults(false);