Changeset 34668 in osm for applications/editors/josm/plugins

Timestamp:

2018-09-22T15:26:51+02:00 (6 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre

Files:

• actions/MenuActionBoundaries.java (modified) (2 diffs)
• actions/MenuActionCancelGrab.java (modified) (1 diff)
• actions/MenuActionGrab.java (modified) (1 diff)
• actions/MenuActionGrabPlanImage.java (modified) (1 diff)
• actions/MenuActionLoadFromCache.java (modified) (2 diffs)
• actions/MenuActionNewLocation.java (modified) (2 diffs)
• actions/MenuActionOpenPreferences.java (modified) (1 diff)
• actions/MenuActionRefineGeoRef.java (modified) (1 diff)
• actions/MenuActionResetCookie.java (modified) (1 diff)
• actions/MenuActionSaveRasterAs.java (modified) (3 diffs)
• edigeo/EdigeoRecord.java (modified) (1 diff)
• wms/CacheControl.java (modified) (5 diffs)
• wms/CadastreInterface.java (modified) (1 diff)
• wms/GrabThread.java (modified) (5 diffs)
• wms/WMSLayer.java (modified) (14 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionBoundaries.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -13 +14 @@
 import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
+/**
+ * Extract commune boundary
+ */
 public class MenuActionBoundaries extends JosmAction {
 
-    public static final String NAME = "Administrative boundary";
+    private static final String NAME = marktr("Administrative boundary");
 
     private static final long serialVersionUID = 1L;

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionCancelGrab.java

@@ -10 +10 @@
 import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
-@SuppressWarnings("serial")
+/**
+ * Cancel current grab (only vector images)
+ */
 public class MenuActionCancelGrab extends JosmAction {
 
-    public static final String NAME = marktr("Cancel current grab");
+    private static final String NAME = marktr("Cancel current grab");
 
     private WMSLayer wmsLayer;

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionGrab.java

@@ -20 +20 @@
 public class MenuActionGrab extends JosmAction {
 
-    public static final String NAME = marktr("Cadastre grab");
+    private static final String NAME = marktr("Cadastre grab");
 
     /**

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionGrabPlanImage.java

@@ -18 +18 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 
+/**
+ * Grab non-georeferenced image
+ */
 public class MenuActionGrabPlanImage extends JosmAction implements Runnable {
 

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionLoadFromCache.java

@@ -22 +22 @@
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Load location from cache (only if cache is enabled)
+ */
 public class MenuActionLoadFromCache extends JosmAction {
     private static final long serialVersionUID = 1L;
 
-    public static final String name = marktr("Load layer from cache");
+    private static final String name = marktr("Load layer from cache");
 
     /**
@@ -49 +52 @@
                 String ext = (filename.lastIndexOf('.') == -1) ? "" : filename.substring(filename.lastIndexOf('.')+1, filename.length());
                 if ((ext.length() == 3 && ext.substring(0, CacheControl.C_LAMBERT_CC_9Z.length()).equals(CacheControl.C_LAMBERT_CC_9Z) &&
-                    !(CadastrePlugin.isLambert_cc9()))
+                    !CadastrePlugin.isLambert_cc9())
                     || (ext.length() == 4 && ext.substring(0, CacheControl.C_UTM20N.length()).equals(CacheControl.C_UTM20N) &&
                             !(CadastrePlugin.isUtm_france_dom()))
-                    || (ext.length() == 1) && !(CadastrePlugin.isLambert())) {
+                    || (ext.length() == 1 && !CadastrePlugin.isLambert())) {
                         JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                                 tr("{0} not allowed with the current projection", filename),

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionNewLocation.java

@@ -24 +24 @@
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Set a new location for the next request
+ */
 public class MenuActionNewLocation extends JosmAction {
 
@@ -59 +62 @@
     // CHECKSTYLE.ON: LineLength
 
+    /**
+     * Constructs a new {@code MenuActionNewLocation}.
+     */
     public MenuActionNewLocation() {
         super(tr("Change location"), "cadastre_small", tr("Set a new location for the next request"), null, false,

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionOpenPreferences.java

@@ -12 +12 @@
 import org.openstreetmap.josm.plugins.fr.cadastre.preferences.CadastrePreferenceSetting;
 
+/**
+ * Open Cadastre Preferences
+ */
 public class MenuActionOpenPreferences extends JosmAction {
-    private static final long serialVersionUID = 1L;
 
-    public static final String NAME = marktr("Preferences");
+    private static final String NAME = marktr("Preferences");
 
     /**

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionRefineGeoRef.java

@@ -13 +13 @@
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Improve georeferencing (only raster images)
+ */
 public class MenuActionRefineGeoRef extends JosmAction {
 
-    public static final String NAME = marktr("Refine georeferencing");
+    private static final String NAME = marktr("Refine georeferencing");
 
     private WMSLayer wmsLayer;

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionResetCookie.java

@@ -8 +8 @@
 import org.openstreetmap.josm.actions.JosmAction;
 
+/**
+ * Get a new cookie (session timeout)
+ */
 public class MenuActionResetCookie extends JosmAction {
 
     /**
-     *
+     * Constructs a new {@code MenuActionResetCookie}
      */
-    private static final long serialVersionUID = 1L;
-
     public MenuActionResetCookie() {
         super(tr("Reset cookie"), "cadastre_small", tr("Get a new cookie (session timeout)"), null, false);

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java

@@ -30 +30 @@
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Export image (only raster images)
+ */
 public class MenuActionSaveRasterAs extends JosmAction {
 
-    public static final String NAME = marktr("Save image as...");
-
-    private static final long serialVersionUID = 1L;
+    private static final String NAME = marktr("Save image as...");
 
     private WMSLayer wmsLayer;
 
-    public static class FiltrePng extends FileFilter {
+    static class FiltrePng extends FileFilter {
         @Override
         public boolean accept(File file) {
@@ -53 +54 @@
     }
 
-    public static class FiltreTiff extends FileFilter {
+    static class FiltreTiff extends FileFilter {
         @Override
         public boolean accept(File file) {
@@ -96 +97 @@
                 try {
                     ImageIO.write(bi, "png", file);
-                    /*
-                    FileOutputStream flux = new FileOutputStream(file);
-                    BufferedOutputStream fluxBuf = new BufferedOutputStream(flux);
-                    JPEGImageEncoder codec = JPEGCodec.createJPEGEncoder(fluxBuf, JPEGCodec.getDefaultJPEGEncodeParam(bi));
-                    codec.encode(bi);
-                    fluxBuf.close();
-                    */
                 } catch (IOException e) {
                     Logging.error(e);

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoRecord.java

@@ -10 +10 @@
  * Edigeo record.
  */
-class EdigeoRecord {
+final class EdigeoRecord {
 
     enum Nature {

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheControl.java

@@ -64 +64 @@
     public boolean isCachePipeEmpty() {
         imagesLock.lock();
-        boolean ret = imagesToSave.isEmpty();
-        imagesLock.unlock();
-        return ret;
+        try {
+            return imagesToSave.isEmpty();
+        } finally {
+            imagesLock.unlock();
+        }
     }
 
@@ -159 +161 @@
             ObjectInputStream ois = new ObjectInputStream(fis);
         ) {
-            successfulRead = wmsLayer.read(file, ois, currentLambertZone);
+            wmsLayer.setAssociatedFile(file);
+            successfulRead = wmsLayer.read(ois, currentLambertZone);
         } catch (IOException | ClassNotFoundException ex) {
             Logging.error(ex);
@@ -176 +179 @@
     public synchronized void saveCache(GeorefImage image) {
         imagesLock.lock();
-        this.imagesToSave.add(image);
-        this.notifyAll();
-        imagesLock.unlock();
+        try {
+            this.imagesToSave.add(image);
+            this.notifyAll();
+        } finally {
+            imagesLock.unlock();
+        }
     }
 
@@ -203 +209 @@
                         try (ObjectOutputStream oos = new ObjectOutputStream(
                                 new BufferedOutputStream(new FileOutputStream(file)))) {
-                            wmsLayer.write(file, oos);
+                            wmsLayer.setAssociatedFile(file);
+                            wmsLayer.write(oos);
                             for (int i = 0; i < size; i++) {
                                 oos.writeObject(imagesToSave.get(i));
@@ -213 +220 @@
                 }
                 imagesLock.lock();
-                for (int i = 0; i < size; i++) {
-                    imagesToSave.remove(0);
-                }
-                imagesLock.unlock();
+                try {
+                    for (int i = 0; i < size; i++) {
+                        imagesToSave.remove(0);
+                    }
+                } finally {
+                    imagesLock.unlock();
+                }
             }
             try {

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java

@@ -536 +536 @@
         if (MainApplication.getMap() != null) {
             for (Layer l : MainApplication.getLayerManager().getLayers()) {
-                if (l instanceof WMSLayer && l.getName().equals(wmsLayer.getName()) && (!l.equals(wmsLayer))) {
+                if (l instanceof WMSLayer && l.getName().equals(wmsLayer.getName()) && !l.equals(wmsLayer)) {
                     Logging.info("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
                     // remove the duplicated layer

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/GrabThread.java

@@ -40 +40 @@
     void addImages(ArrayList<EastNorthBound> moreImages) {
         lockImagesToGrag.lock();
-        imagesToGrab.addAll(moreImages);
-        lockImagesToGrag.unlock();
+        try {
+            imagesToGrab.addAll(moreImages);
+        } finally {
+            lockImagesToGrag.unlock();
+        }
         synchronized (this) {
             this.notify();
@@ -53 +56 @@
     public int getImagesToGrabSize() {
         lockImagesToGrag.lock();
-        int size = imagesToGrab.size();
-        lockImagesToGrag.unlock();
-        return size;
+        try {
+            return imagesToGrab.size();
+        } finally {
+            lockImagesToGrag.unlock();
+        }
     }
 
@@ -61 +66 @@
         ArrayList<EastNorthBound> copyList = new ArrayList<>();
         lockImagesToGrag.lock();
-        for (EastNorthBound img : imagesToGrab) {
-            EastNorthBound imgCpy = new EastNorthBound(img.min, img.max);
-            copyList.add(imgCpy);
-        }
-        lockImagesToGrag.unlock();
+        try {
+            for (EastNorthBound img : imagesToGrab) {
+                EastNorthBound imgCpy = new EastNorthBound(img.min, img.max);
+                copyList.add(imgCpy);
+            }
+        } finally {
+            lockImagesToGrag.unlock();
+        }
         return copyList;
     }
@@ -71 +79 @@
     void clearImagesToGrab() {
         lockImagesToGrag.lock();
-        imagesToGrab.clear();
-        lockImagesToGrag.unlock();
+        try {
+            imagesToGrab.clear();
+        } finally {
+            lockImagesToGrag.unlock();
+        }
     }
 
@@ -109 +120 @@
                         if (CadastrePlugin.backgroundTransparent) {
                             wmsLayer.imagesLock.lock();
-                            for (GeorefImage img : wmsLayer.getImages()) {
-                                if (img.overlap(newImage))
-                                    // mask overlapping zone in already grabbed image
-                                    img.withdraw(newImage);
-                                else
-                                    // mask overlapping zone in new image only when new image covers completely the
-                                    // existing image
-                                    newImage.withdraw(img);
+                            try {
+                                for (GeorefImage img : wmsLayer.getImages()) {
+                                    if (img.overlap(newImage))
+                                        // mask overlapping zone in already grabbed image
+                                        img.withdraw(newImage);
+                                    else
+                                        // mask overlapping zone in new image only when new image covers completely the
+                                        // existing image
+                                        newImage.withdraw(img);
+                                }
+                            } finally {
+                                wmsLayer.imagesLock.unlock();
                             }
-                            wmsLayer.imagesLock.unlock();
                         }
                         wmsLayer.addImage(newImage);

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/WMSLayer.java

@@ -15 +15 @@
 import java.awt.image.ImageObserver;
 import java.io.EOFException;
-import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -61 +60 @@
     private int lambertZone = -1;
 
-    public CadastreGrabber grabber = new CadastreGrabber();
+    CadastreGrabber grabber = new CadastreGrabber();
 
     protected static final Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(
@@ -68 +67 @@
     private Vector<GeorefImage> images = new Vector<>();
 
-    public Lock imagesLock = new ReentrantLock();
+    Lock imagesLock = new ReentrantLock();
 
     /**
@@ -77 +76 @@
     protected final int serializeFormatVersion = 4;
 
-    public static int currentFormat;
+    static int currentFormat;
 
     private ArrayList<EastNorthBound> dividedBbox = new ArrayList<>();
@@ -87 +86 @@
     private String codeCommune = "";
 
-    public EastNorthBound communeBBox = new EastNorthBound(new EastNorth(0, 0), new EastNorth(0, 0));
+    EastNorthBound communeBBox = new EastNorthBound(new EastNorth(0, 0), new EastNorth(0, 0));
 
     private boolean isRaster;
     private boolean isAlreadyGeoreferenced;
-    public double X0, Y0, angle, fX, fY;
+    double X0, Y0, angle, fX, fY;
 
     // bbox of the georeferenced raster image (the nice horizontal and vertical box)
@@ -99 +98 @@
 
     // offset for vector images temporarily shifted (correcting Cadastre artifacts), in pixels
-    public double deltaEast;
-    public double deltaNorth;
+    double deltaEast;
+    double deltaNorth;
 
     private Action saveAsPng;
@@ -300 +299 @@
                 g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
             imagesLock.lock();
-            for (GeorefImage img : images) {
-                img.paint(g, mv, CadastrePlugin.backgroundTransparent,
-                        CadastrePlugin.transparency, CadastrePlugin.drawBoundaries);
-            }
-            imagesLock.unlock();
+            try {
+                for (GeorefImage img : images) {
+                    img.paint(g, mv, CadastrePlugin.backgroundTransparent,
+                            CadastrePlugin.transparency, CadastrePlugin.drawBoundaries);
+                }
+            } finally {
+                imagesLock.unlock();
+            }
             g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, savedInterpolation);
         }
@@ -378 +380 @@
      * The original raster size is [0,0,12286,8730] where 0,0 is the upper left corner and
      * 12286,8730 is the approx. raster max size.
+     * @param min min east/north
+     * @param max max east/north
      * @return the raster coordinates for the wms server request URL (minX,minY,maxX,maxY)
      */
@@ -456 +460 @@
      * Called by CacheControl when a new cache file is created on disk.
      * Save only primitives to keep cache independent of software changes.
-     */
-    public void write(File associatedFile, ObjectOutputStream oos) throws IOException {
+     * @param oos output stream
+     * @throws IOException if any I/O error occurs
+     */
+    public void write(ObjectOutputStream oos) throws IOException {
         currentFormat = this.serializeFormatVersion;
-        setAssociatedFile(associatedFile);
         oos.writeInt(this.serializeFormatVersion);
         oos.writeObject(this.location);    // String
@@ -482 +487 @@
      * Called by CacheControl when a cache file is read from disk.
      * Cache uses only primitives to stay independent of software changes.
-     */
-    public boolean read(File associatedFile, ObjectInputStream ois, int currentLambertZone) throws IOException, ClassNotFoundException {
-        currentFormat = ois.readInt();;
+     * @param ois input stream
+     * @param currentLambertZone current Lambert zone
+     * @return {@code true} for success
+     * @throws IOException if any I/O error occurs
+     * @throws ClassNotFoundException if class of a serialized object cannot be found
+     */
+    public boolean read(ObjectInputStream ois, int currentLambertZone) throws IOException, ClassNotFoundException {
+        currentFormat = ois.readInt();
         if (currentFormat < 2) {
             JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
@@ -495 +505 @@
         this.lambertZone = ois.readInt();
         this.setRaster(ois.readBoolean());
-        setAssociatedFile(associatedFile);
         if (currentFormat >= 4)
             ois.readBoolean();
@@ -587 +596 @@
      * Works only for raster image layer (only one image in collection).
      * Updates layer georeferences.
+     * @param en1 first east/north
+     * @param en2 second east/north
      */
     public void cropImage(EastNorth en1, EastNorth en2) {
@@ -700 +711 @@
     public GeorefImage getImage(int index) {
         imagesLock.lock();
-        GeorefImage img = null;
         try {
-            img = this.images.get(index);
+            return images.get(index);
         } catch (ArrayIndexOutOfBoundsException e) {
             Logging.error(e);
-        }
-        imagesLock.unlock();
-        return img;
+            return null;
+        } finally {
+            imagesLock.unlock();
+        }
     }
 
     public Vector<GeorefImage> getImages() {
-        return this.images;
+        return images;
     }
 
@@ -720 +731 @@
     public void addImage(GeorefImage img) {
         imagesLock.lock();
-        this.images.add(img);
-        imagesLock.unlock();
+        try {
+            images.add(img);
+        } finally {
+            imagesLock.unlock();
+        }
     }
 
     public void setImages(Vector<GeorefImage> images) {
         imagesLock.lock();
-        this.images = images;
-        imagesLock.unlock();
+        try {
+            this.images = images;
+        } finally {
+            imagesLock.unlock();
+        }
     }
 
     public void clearImages() {
         imagesLock.lock();
-        this.images.clear();
-        imagesLock.unlock();
+        try {
+            images.clear();
+        } finally {
+            imagesLock.unlock();
+        }
     }
 }