Changeset 4288 in josm

Timestamp:

2011-08-07T21:27:38+02:00 (13 years ago)

Author:

bastiK

Message:

fix: also fire projection change, when switching between subprojections

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• data/projection/Lambert.java (modified) (1 diff)
• data/projection/LambertCC9Zones.java (modified) (1 diff)
• data/projection/Projection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -85 +85 @@
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 abstract public class Main {
@@ -823 +824 @@
     private static void fireProjectionChanged(Projection oldValue, Projection newValue) {
         if (newValue == null ^ oldValue == null
-                || (newValue != null && oldValue != null && !newValue.getClass().getName().equals(oldValue.getClass().getName()))) {
+                || (newValue != null && oldValue != null && !Utils.equal(newValue.toCode(), oldValue.toCode()))) {
 
             synchronized(Main.class) {

trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

@@ -86 +86 @@
                 InputStream is = Main.class.getResourceAsStream("/data/"+gridFileName);
                 if (is == null) {
-                    throw new RuntimeException(tr("Warning: failed to open input stream for resource ''/data/{0}''. Cannot load NTF<->RGF93 grid", gridFileName));
+                    throw new RuntimeException(tr("Error: failed to open input stream for resource ''/data/{0}''. Cannot load NTF<->RGF93 grid", gridFileName));
                 }
                 ntf_rgf93Grid = new NTV2GridShiftFile();

trunk/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java

@@ -145 +145 @@
 
     @Override
-    public void setPreferences(Collection<String> args)
-    {
+    public void setPreferences(Collection<String> args) {
         int layoutZone = DEFAULT_ZONE;
         if (args != null) {

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -38 +38 @@
 
     /**
-     * Return projection code.
+     * Return projection code. This should be a unique identifier.
+     * If projection supports parameters, return a different code
+     * for each set of parameters.
+     * 
+     * The EPSG code can be used (if defined for the projection).
      */
     String toCode();