Changeset 29101 in osm for applications/editors/josm

Timestamp:

2012-12-21T00:37:53+01:00 (12 years ago)

Author:

pieren

Message:

#8229 patch from Don-vip going directly to projection preference window if grab action is called in incompatible cadastre proj.

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CacheControl.java (modified) (1 diff)
• CadastrePlugin.java (modified) (2 diffs)
• DownloadWMSVectorImage.java (modified) (1 diff)
• MenuActionGrab.java (modified) (1 diff)
• MenuActionGrabPlanImage.java (modified) (1 diff)

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

@@ -93 +93 @@
 
     public boolean loadCacheIfExist() {
+        if (!CadastrePlugin.isCadastreProjection()) {
+            CadastrePlugin.askToChangeProjection();
+        }
         try {
             File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());

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

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.map.MapPreference;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -479 +481 @@
     }
 
+    public static void askToChangeProjection() { 
+        if (JOptionPane.showConfirmDialog(Main.parent, 
+                tr("To enable the cadastre WMS plugin, change\n" 
+                        + "the current projection to one of the cadastre\n" 
+                        + "projections and retry"),  
+                        tr("Change the current projection"), JOptionPane.OK_CANCEL_OPTION)  
+            == JOptionPane.OK_OPTION) { 
+            PreferenceDialog p = new PreferenceDialog(Main.parent); 
+            p.selectPreferencesTabByClass(MapPreference.class); 
+            p.getTabbedPane().getSetting(ProjectionPreference.class).selectProjection(ProjectionPreference.lambert_cc9); 
+            p.setVisible(true); 
+        } 
+        } 
 }

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

@@ -37 +37 @@
                         if (wmsLayer.grabThread.getCacheControl().loadCacheIfExist()) {
                             Main.map.mapView.zoomTo(wmsLayer.getFirstViewFromCacheBBox().toBounds());
-                            //Main.map.mapView.repaint();
                             return;
                         }

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

@@ -36 +36 @@
                     DownloadWMSVectorImage.download(wmsLayer);
             } else {
-                JOptionPane.showMessageDialog(Main.parent,
-                        tr("To enable the cadastre WMS plugin, change\n"
-                         + "the current projection to one of the cadastre\n"
-                         + "projections and retry"));
+                CadastrePlugin.askToChangeProjection();
             }
         } else

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

@@ -94 +94 @@
                 Main.worker.execute(this);
             } else {
-                JOptionPane.showMessageDialog(Main.parent,
-                        tr("To enable the cadastre WMS plugin, change\n"
-                         + "the current projection to one of the cadastre\n"
-                         + "projections and retry"));
+                CadastrePlugin.askToChangeProjection();
             }
         }