Changeset 26228 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java

Timestamp:

2011-07-01T00:44:06+02:00 (15 years ago)

Author:

pieren

Message:

For v2.2

• replace deprecated Main.proj by newest Main.getProjection()
• fix list of raster images (Feuilles) parsing failing after a Cadastre server change/maintenance

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java

@@ -38 +38 @@
                 String ext = (filename.lastIndexOf(".")==-1)?"":filename.substring(filename.lastIndexOf(".")+1,filename.length());
                 if ((ext.length() == 3 && ext.substring(0, CacheControl.cLambertCC9Z.length()).equals(CacheControl.cLambertCC9Z) &&
-                    !(Main.proj instanceof LambertCC9Zones))
+                    !(Main.getProjection() instanceof LambertCC9Zones))
                     || (ext.length() == 4 && ext.substring(0, CacheControl.cUTM20N.length()).equals(CacheControl.cUTM20N) &&
-                            !(Main.proj instanceof UTM_France_DOM))
-                    || (ext.length() == 1) && !(Main.proj instanceof Lambert)) {
+                            !(Main.getProjection() instanceof UTM_France_DOM))
+                    || (ext.length() == 1) && !(Main.getProjection() instanceof Lambert)) {
                         JOptionPane.showMessageDialog(Main.parent, tr("{0} not allowed with the current projection", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
                         continue;
@@ -89 +89 @@
         int layoutZone = new MenuActionLoadFromCache().getCurrentProjZone();
         if (layoutZone != -1) {
-            if (Main.proj instanceof Lambert)
+            if (Main.getProjection() instanceof Lambert)
                 fc.addChoosableFileFilter(CacheFileLambert4ZoneFilter.filters[layoutZone]);
-            else if (Main.proj instanceof LambertCC9Zones)
+            else if (Main.getProjection() instanceof LambertCC9Zones)
                 fc.addChoosableFileFilter(CacheFileLambert9ZoneFilter.filters[layoutZone]);
-            else if (Main.proj instanceof UTM_France_DOM)
+            else if (Main.getProjection() instanceof UTM_France_DOM)
                 fc.addChoosableFileFilter(CacheFileUTM20NFilter.filters[layoutZone]);
         }
@@ -107 +107 @@
     private int getCurrentProjZone() {
         int zone = -1;
-        if (Main.proj instanceof LambertCC9Zones)
-            zone = ((LambertCC9Zones)Main.proj).getLayoutZone();
-        else if (Main.proj instanceof Lambert)
-            zone = ((Lambert)Main.proj).getLayoutZone();
-        else if (Main.proj instanceof UTM_France_DOM)
-            zone = ((UTM_France_DOM)Main.proj).getCurrentGeodesic();
+        if (Main.getProjection() instanceof LambertCC9Zones)
+            zone = ((LambertCC9Zones)Main.getProjection()).getLayoutZone();
+        else if (Main.getProjection() instanceof Lambert)
+            zone = ((Lambert)Main.getProjection()).getLayoutZone();
+        else if (Main.getProjection() instanceof UTM_France_DOM)
+            zone = ((UTM_France_DOM)Main.getProjection()).getCurrentGeodesic();
         return zone;
     }