Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastrePlugin.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastrePlugin.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastrePlugin.java (revision 34115) @@ -482,7 +482,8 @@ /** - * Adds the WMSLayer following this rule:
- * - if a WMSLayer exists place this new layer just before this layer
- * - Otherwise place it at the bottom + * Adds the WMSLayer following this rule: * @param wmsLayer the wmsLayer to add */ Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/MenuActionSaveRasterAs.java (revision 34115) @@ -38,5 +38,5 @@ private WMSLayer wmsLayer; - public class FiltrePng extends FileFilter { + public static class FiltrePng extends FileFilter { @Override public boolean accept(File file) { @@ -53,5 +53,5 @@ } - public class FiltreTiff extends FileFilter { + public static class FiltreTiff extends FileFilter { @Override public boolean accept(File file) { Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileVEC.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileVEC.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileVEC.java (revision 34115) @@ -186,5 +186,5 @@ ISOLATED(2); - int code; + final int code; NodeType(int code) { this.code = code; Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java (revision 34115) @@ -63,5 +63,5 @@ /** * Finds a descriptor by its identifier. - * @param values 4 values obtained from a {@link EdigeoRecord}:
    + * @param values 4 values obtained from a {@code EdigeoRecord}:
      *
    1. Lot identifier
      2. *
    2. subset identifier
      3. @@ -77,5 +77,5 @@ /** * Finds a descriptor by its identifier. - * @param values 4 values obtained from a {@link EdigeoRecord}:
        + * @param values 4 values obtained from a {@code EdigeoRecord}:
          *
        1. Lot identifier
          2. *
        2. subset identifier
          3. Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java (revision 34115) @@ -23,6 +23,6 @@ import org.apache.commons.text.WordUtils; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.UploadPolicy; -import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.progress.ProgressMonitor; @@ -257,5 +257,5 @@ try (FileOutputStream out = new FileOutputStream(file)) { if (IOUtils.copy(tar, out) < entry.getSize()) { - throw new IOException(String.format("Unable to write ''{0}'' entirely", file)); + throw new IOException(String.format("Unable to write ''%s'' entirely", file)); } else if (file.toString().endsWith(".THF")) { thfPath = file.toPath(); Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java (revision 34115) @@ -267,10 +267,10 @@ * Two possibilities : * - either the commune name matches and we receive an URL starting with "afficherCarteCommune.do" or - * - we don't receive a single answer but a list of possible values. This answer looks like: - * * * * - * + * } * The returned string is the interface name used in further requests, e.g. "afficherCarteCommune.do?c=QP224" * where QP224 is the code commune known by the WMS (or "afficherCarteTa.do?c=..." for raster images). Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/RasterImageModifier.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/RasterImageModifier.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/RasterImageModifier.java (revision 34115) @@ -53,5 +53,5 @@ int b = col.getBlue(); if ((b == r) && (b == g)) { - pixel = (0x00 << 32) + ((byte) (255 - r) << 16) + ((byte) (255 - r) << 8) + ((byte) (255 - r)); + pixel = (0x00 << 24) + ((byte) (255 - r) << 16) + ((byte) (255 - r) << 8) + ((byte) (255 - r)); } return pixel; Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/WMSLayer.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/WMSLayer.java (revision 34114) +++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/WMSLayer.java (revision 34115) @@ -143,5 +143,5 @@ @Override - public void destroy() { + public synchronized void destroy() { // if the layer is currently saving the images in the cache, wait until it's finished if (grabThread != null)