Changeset 26509 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2011-08-11T00:45:56+02:00 (13 years ago)

Author:

stoecker

Message:

i18n fixes

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/CadastreInterface.java (modified) (4 diffs)
• src/cadastre_fr/CadastrePlugin.java (modified) (2 diffs)
• src/cadastre_fr/CadastrePreferenceSetting.java (modified) (1 diff)
• src/cadastre_fr/DownloadWMSPlanImage.java (modified) (2 diffs)
• src/cadastre_fr/DownloadWMSVectorImage.java (modified) (1 diff)
• src/cadastre_fr/GrabThread.java (modified) (6 diffs)
• src/cadastre_fr/MenuActionGrabPlanImage.java (modified) (1 diff)
• src/cadastre_fr/WMSLayer.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -32 +32 @@
     <property name="ant.build.javac.target" value="1.5"/>
     <property name="commit.message" value="Changed constructor for Plugin"/>
-    <property name="plugin.main.version" value="4126"/>
+    <property name="plugin.main.version" value="4310"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>

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

@@ -26 +26 @@
 
 public class CadastreInterface {
-    public boolean downloadCancelled = false;
+    public boolean downloadCanceled = false;
     public HttpURLConnection urlConn = null;
 
@@ -76 +76 @@
             interfaceRef = null;
         // open the session with the French Cadastre web front end
-        downloadCancelled = false;
+        downloadCanceled = false;
         try {
             if (cookie == null || isCookieExpired) {
@@ -306 +306 @@
                     // list of values parsed in listOfFeuilles (list all non-georeferenced images)
                     lines = getFeuillesList();
-                    if (!downloadCancelled) {
+                    if (!downloadCanceled) {
                         parseFeuillesList(lines);
                         if (listOfFeuilles.size() > 0) {
@@ -567 +567 @@
             //urlConn.disconnect();
         }
-        downloadCancelled = true;
+        downloadCanceled = true;
         lastWMSLayerName = null;
     }

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

@@ -256 +256 @@
         if (!alreadyRedefined) {
             int reply = JOptionPane.showConfirmDialog(null,
-                    tr("Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"+
-                    "which is currently allocated for full-screen switch by default\n"+
-                    "Would you like to restore F11 for grab action ?"),
+                    tr("Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"+
+                    "which is currently allocated for full-screen switch by default.\n"+
+                    "Would you like to restore F11 for grab action?"),
                     tr("Restore grab shortcut F11"),
                     JOptionPane.YES_NO_OPTION);
@@ -268 +268 @@
             }
         } else
-            System.out.println("shortcut F11 already redefined; do not change");
+            System.out.println("Shortcut F11 already redefined; do not change.");
 
         refreshMenu();

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

@@ -114 +114 @@
         // option to alter the original colors of the wms images
         alterColors.setSelected(Main.pref.getBoolean("cadastrewms.alterColors", false));
-        alterColors.setToolTipText(tr("Replace the original white background by the backgound color defined in JOSM preferences."));
+        alterColors.setToolTipText(tr("Replace the original white background by the background color defined in JOSM preferences."));
         cadastrewms.add(alterColors, GBC.eop().insets(0, 0, 0, 0));
 

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

@@ -45 +45 @@
                         // till here
                         dontGeoreference = true;
-                    } else if (wmsLayer.grabber.getWmsInterface().downloadCancelled){
+                    } else if (wmsLayer.grabber.getWmsInterface().downloadCanceled){
                         // do nothing
                     } else {
@@ -62 +62 @@
                             // grab new images from wms server into active layer
                             wmsLayer.grab(bounds);
-                            if (wmsLayer.grabber.getWmsInterface().downloadCancelled) {
+                            if (wmsLayer.grabber.getWmsInterface().downloadCanceled) {
                                 wmsLayer.clearImages();
                                 Main.map.mapView.repaint();

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

@@ -68 +68 @@
         wmsLayer.grabber.getWmsInterface().cancel();
         if (wmsLayer != null)
-            wmsLayer.grabThread.setCancelled(true);
+            wmsLayer.grabThread.setCanceled(true);
     }
 

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

@@ -17 +17 @@
 public class GrabThread extends Thread {
 
-    private boolean cancelled;
+    private boolean canceled;
 
     private CadastreGrabber grabber;
@@ -84 +84 @@
                 imagesToGrab.remove(0);
                 lockImagesToGrag.unlock();
-                if (cancelled) {
+                if (canceled) {
                     break;
                 } else {
@@ -93 +93 @@
                     } catch (IOException e) {
                         System.out
-                                .println("Download action cancelled by user or server did not respond");
-                        setCancelled(true);
+                                .println("Download action canceled by user or server did not respond");
+                        setCanceled(true);
                         break;
                     } catch (OsmTransferException e) {
                         System.out.println("OSM transfer failed");
-                        setCancelled(true);
+                        setCanceled(true);
                         break;
                     }
-                    if (grabber.getWmsInterface().downloadCancelled) {
-                        System.out.println("Download action cancelled by user");
-                        setCancelled(true);
+                    if (grabber.getWmsInterface().downloadcanceled) {
+                        System.out.println("Download action canceled by user");
+                        setCanceled(true);
                         break;
                     }
@@ -125 +125 @@
                     } catch (NullPointerException e) {
                         System.out.println("Layer destroyed. Cancel grab thread");
-                        setCancelled(true);
+                        setCanceled(true);
                     }
                 }
@@ -133 +133 @@
             currentGrabImage = null;
             lockCurrentGrabImage.unlock();
-            if (cancelled) {
+            if (canceled) {
                 clearImagesToGrab();
-                cancelled = false;
+                canceled = false;
             }
             if (wmsLayer.isRaster()) {
@@ -207 +207 @@
     }
     
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public boolean isCanceled() {
+        return canceled;
+    }
+
+    public void setCanceled(boolean canceled) {
+        this.canceled = canceled;
     }
 

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

@@ -108 +108 @@
             Main.map.repaint();
         } else if (wmsLayer.getImages().size() == 0) {
-            // action cancelled or image loaded from cache (and already georeferenced)
+            // action canceled or image loaded from cache (and already georeferenced)
             actionInterrupted();
         } else {

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

@@ -129 +129 @@
 
     public void grab(Bounds b) throws IOException {
-        grabThread.setCancelled(false);
+        grabThread.setCanceled(false);
         grabThread.setGrabber(grabber);
         // if it is the first layer, use the communeBBox as grab bbox (and not divided)