Changeset 4028 in josm

Timestamp:

Apr 15, 2011 10:03:38 PM (2 years ago)

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/ImageryPreference.java (modified) (3 diffs)
• gui/preferences/ImagerySettingsMigration.java (deleted)
• plugins/PluginHandler.java (modified) (2 diffs)

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

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -75 +75 @@
         String IN_CORE = tr("integrated into main program");
 
-        class RemotecontrolMigration implements Runnable {
-            public void run() {
-                System.out.println("Migrating remotecontrol plugin...");
-                if (!RemoteControl.PROP_REMOTECONTROL_ENABLED.isSet()) {
-                    System.out.println("  Setting "+RemoteControl.PROP_REMOTECONTROL_ENABLED.getKey()+"=true");
-                    RemoteControl.PROP_REMOTECONTROL_ENABLED.put(true);
-                }
-                System.out.println("...Done.");
-            }
-        }
-
         DEPRECATED_PLUGINS = Arrays.asList(new DeprecatedPlugin[] {
             new DeprecatedPlugin("mappaint", IN_CORE),
@@ -111 +100 @@
             new DeprecatedPlugin("validator", IN_CORE),
             new DeprecatedPlugin("multipoly", IN_CORE),
-            new DeprecatedPlugin("remotecontrol", IN_CORE, new RemotecontrolMigration()),
+            new DeprecatedPlugin("remotecontrol", IN_CORE),
             new DeprecatedPlugin("imagery", IN_CORE),
             new DeprecatedPlugin("slippymap", IN_CORE),