Changeset 5546 in josm for trunk/src/org

Timestamp:

2012-11-01T11:33:12+01:00 (11 years ago)

Author:

bastiK

Message:

remove old migration code

Location:

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

Files:

• Alias.java (deleted)
• CustomProjectionChoice.java (modified) (2 diffs)
• GaussKruegerProjectionChoice.java (modified) (2 diffs)
• LambertCC9ZonesProjectionChoice.java (modified) (2 diffs)
• LambertProjectionChoice.java (modified) (2 diffs)
• ProjectionPreference.java (modified) (4 diffs)
• PuwgProjectionChoice.java (modified) (2 diffs)
• SingleProjectionChoice.java (modified) (2 diffs)
• UTMProjectionChoice.java (modified) (2 diffs)
• UTM_France_DOM_ProjectionChoice.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.Utils;
 
-public class CustomProjectionChoice extends AbstractProjectionChoice implements Alias, SubPrefsOptions {
+public class CustomProjectionChoice extends AbstractProjectionChoice implements SubPrefsOptions {
 
     private String pref;
@@ -230 +230 @@
 
     @Override
-    public String getAlias() {
-        return "org.openstreetmap.josm.data.projection.CustomProjectionPrefGui";
-    }
-
-    @Override
     public boolean showProjectionCode() {
         return false;

trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.projection.Projection;
 
-public class GaussKruegerProjectionChoice extends ListProjectionChoice implements Alias {
+public class GaussKruegerProjectionChoice extends ListProjectionChoice {
 
     private static String[] zones = { "2", "3", "4", "5" };
@@ -57 +57 @@
     }
     
-    @Override
-    public String getAlias() {
-        return GaussKrueger.class.getName();
-    }
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java

@@ -16 +16 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice implements Alias {
+public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice {
 
     private static String[] lambert9zones = {
@@ -88 +88 @@
     }
 
-    @Override
-    public String getAlias() {
-        return LambertCC9Zones.class.getName();
-    }
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java

@@ -16 +16 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-public class LambertProjectionChoice extends ListProjectionChoice implements Alias {
+public class LambertProjectionChoice extends ListProjectionChoice {
 
     public static String[] lambert4zones = {
@@ -82 +82 @@
     }
 
-    @Override
-    public String getAlias() {
-        return Lambert.class.getName();
-    }
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -55 +55 @@
     private static List<ProjectionChoice> projectionChoices = new ArrayList<ProjectionChoice>();
     private static Map<String, ProjectionChoice> projectionChoicesById = new HashMap<String, ProjectionChoice>();
-    private static Map<String, String> aliasNormalizer = new HashMap<String, String>();
 
     public static ProjectionChoice mercator = new SingleProjectionChoice("core:mercator", new Mercator());
@@ -82 +81 @@
         projectionChoices.add(c);
         projectionChoicesById.put(c.getId(), c);
-        aliasNormalizer.put(c.getId(), c.getId());
-        if (c instanceof Alias) {
-            String alias = ((Alias) c).getAlias();
-            projectionChoicesById.put(alias, c);
-            aliasNormalizer.put(alias, c.getId());
-        }
     }
 
@@ -288 +281 @@
             ProjectionChoice pc1 = (ProjectionChoice) projectionCombo.getItemAt(i);
             pc1.setPreferences(getSubprojectionPreference(pc1));
-            if (pc1.getId().equals(aliasNormalizer.get(PROP_PROJECTION.get()))) {
+            if (pc1.getId().equals(PROP_PROJECTION.get())) {
                 projectionCombo.setSelectedIndex(i);
                 selectedProjectionChanged(pc1);
@@ -309 +302 @@
 
     private Collection<String> getSubprojectionPreference(ProjectionChoice pc) {
-        Collection<String> c1 = Main.pref.getCollection("projection.sub."+pc.getId(), null);
-        if (c1 != null)
-            return c1;
-        if (pc instanceof Alias) {
-            String alias = ((Alias) pc).getAlias();
-            String sname = alias.substring(alias.lastIndexOf(".")+1);
-            return Main.pref.getCollection("projection.sub."+sname, null);
-        }
-        return null;
+        return Main.pref.getCollection("projection.sub."+pc.getId(), null);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.projection.Puwg;
 
-public class PuwgProjectionChoice extends ListProjectionChoice implements Alias {
+public class PuwgProjectionChoice extends ListProjectionChoice {
 
     public PuwgProjectionChoice() {
@@ -40 +40 @@
 
     @Override
-    public String getAlias() {
-        return Puwg.class.getName();
-    }
-
-    @Override
     protected String indexToZone(int index) {
         return Puwg.zones[index].toCode();

trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java

@@ -15 +15 @@
  * The GUI is an empty panel.
  */
-public class SingleProjectionChoice implements ProjectionChoice, Alias {
+public class SingleProjectionChoice implements ProjectionChoice {
 
     private String id;
@@ -72 +72 @@
             return null;
     }
-
-    @Override
-    public String getAlias() {
-        return projection.getClass().getName();
-    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -20 +20 @@
 import org.openstreetmap.josm.tools.GBC;
 
-public class UTMProjectionChoice extends ListProjectionChoice implements Alias {
+public class UTMProjectionChoice extends ListProjectionChoice {
 
     private static final UTM.Hemisphere DEFAULT_HEMISPHERE = UTM.Hemisphere.North;
@@ -148 +148 @@
     }
 
-    @Override
-    public String getAlias() {
-        return UTM.class.getName();
-    }
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.projection.UTM_France_DOM;
 
-public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice implements Alias {
+public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice {
 
     private final static String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
@@ -58 +58 @@
     }
 
-    @Override
-    public String getAlias() {
-        return UTM_France_DOM.class.getName();
-    }
-
 }