Changeset 9911 in josm

Timestamp:

2016-03-02T10:48:41+01:00 (8 years ago)

Author:

simon04

Message:

Remove code to be removed end of 2015

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -97 +97 @@
 
     private static final String[] OBSOLETE_PREF_KEYS = {
-            "remote.control.host", // replaced by individual values for IPv4 and IPv6. To remove end of 2015
-            "osm.notes.enableDownload", // was used prior to r8071 when notes was an hidden feature. To remove end of 2015
-            "mappaint.style.migration.switchedToMapCSS", // was used prior to 8315 for MapCSS switch. To remove end of 2015
-            "mappaint.style.migration.changedXmlName" // was used prior to 8315 for MapCSS switch. To remove end of 2015
     };
 

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -38 +37 @@
         // They just insist on painting themselves...
         Utils.updateSystemProperty("apple.laf.useScreenMenuBar", "true");
-        migrateOldDirectory();
     }
 
@@ -346 +344 @@
         return new File(System.getProperty("user.home")+"/Library", "JOSM");
     }
-
-    /***
-     * Prior to r7834, JOSM used the same Unix directory ~/.josm for all local files (preferences,
-     * caches, user data). This method migrates the existing preferences and plugins to new directories
-     * if applicable. Old directory, including cache, is deleted.
-     * Method to remove end of 2015.
-     * @since 7835
-     */
-    public static void migrateOldDirectory() {
-        File oldDir = new File(System.getProperty("user.home"), ".josm");
-        if (oldDir.exists()) {
-            boolean error = false;
-
-            File oldPref = new File(oldDir, "preferences.xml");
-            if (oldPref.exists()) {
-                File newPref = Main.pref.getPreferenceFile();
-                if (!newPref.exists()) {
-                    try {
-                        Utils.mkDirs(Main.pref.getPreferencesDirectory());
-                        Main.info("Copying old preferences file to new location");
-                        Utils.copyFile(oldPref, newPref);
-                        Utils.deleteFile(oldPref, marktr("Unable to delete old preferences file {0}"));
-                    } catch (IOException e) {
-                        Main.error(e);
-                        error = true;
-                    }
-                }
-            }
-
-            File oldPlugins = new File(oldDir, "plugins");
-            if (oldPlugins.exists()) {
-                File newPlugins = Main.pref.getPluginsDirectory();
-                if (!newPlugins.exists()) {
-                    try {
-                        Utils.copyDirectory(oldPlugins, newPlugins);
-                    } catch (IOException e) {
-                        Main.error(e);
-                        error = true;
-                    }
-                }
-            }
-
-            if (!error) {
-                Main.info("Deleting old preferences directory");
-                if (!Utils.deleteDirectory(oldDir)) {
-                    Main.warn("Unable to delete old preferences directory");
-                }
-            }
-        }
-    }
 }