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

Timestamp:

2012-11-02T23:44:09+01:00 (13 years ago)

Author:

bastik

Message:

update to latest josm (projection)

File:

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

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

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.projection.Lambert;
-import org.openstreetmap.josm.data.projection.LambertCC9Zones;
-import org.openstreetmap.josm.data.projection.UTM_France_DOM;
 import org.openstreetmap.josm.gui.layer.Layer;
 
@@ -32 +29 @@
 
         File[] files = fc.getSelectedFiles();
-        int layoutZone = getCurrentProjZone();
+        int layoutZone = CadastrePlugin.getCadastreProjectionLayoutZone();
         nextFile:
         for (File file : files) {
@@ -39 +36 @@
                 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.getProjection() instanceof LambertCC9Zones))
+                    !(CadastrePlugin.isLambert_cc9()))
                     || (ext.length() == 4 && ext.substring(0, CacheControl.cUTM20N.length()).equals(CacheControl.cUTM20N) &&
-                            !(Main.getProjection() instanceof UTM_France_DOM))
-                    || (ext.length() == 1) && !(Main.getProjection() instanceof Lambert)) {
+                            !(CadastrePlugin.isUtm_france_dom()))
+                    || (ext.length() == 1) && !(CadastrePlugin.isLambert())) {
                         JOptionPane.showMessageDialog(Main.parent, tr("{0} not allowed with the current projection", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
                         continue;
@@ -88 +85 @@
         JFileChooser fc = new JFileChooser(new File(CadastrePlugin.cacheDir));
         fc.setMultiSelectionEnabled(true);
-        int layoutZone = new MenuActionLoadFromCache().getCurrentProjZone();
+        int layoutZone = CadastrePlugin.getCadastreProjectionLayoutZone();
         if (layoutZone != -1) {
-            if (Main.getProjection() instanceof Lambert)
+            if (CadastrePlugin.isLambert())
                 fc.addChoosableFileFilter(CacheFileLambert4ZoneFilter.filters[layoutZone]);
-            else if (Main.getProjection() instanceof LambertCC9Zones)
+            else if (CadastrePlugin.isLambert_cc9())
                 fc.addChoosableFileFilter(CacheFileLambert9ZoneFilter.filters[layoutZone]);
-            else if (Main.getProjection() instanceof UTM_France_DOM)
+            else if (CadastrePlugin.isUtm_france_dom())
                 fc.addChoosableFileFilter(CacheFileUTM20NFilter.filters[layoutZone]);
         }
@@ -106 +103 @@
     }
 
-    private int getCurrentProjZone() {
-        int zone = -1;
-        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;
-    }
 }