Index: /applications/editors/josm/plugins/cadastre-fr/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/.settings/org.eclipse.jdt.core.prefs (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/.settings/org.eclipse.jdt.core.prefs (revision 34223) @@ -41,5 +41,5 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning @@ -55,5 +55,5 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java (revision 34223) @@ -89,6 +89,4 @@ JLabel link = new JLabel(); private transient Way selectedWay; - private boolean shift; - private boolean ctrl; /** @@ -129,6 +127,5 @@ if (e.getButton() != MouseEvent.BUTTON1) return; - shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + updateKeyModifiers(e); MapView mv = MainApplication.getMap().mapView; Point mousePos = e.getPoint(); @@ -379,9 +376,10 @@ // fall through to default action. // (for semi-parallel lines, intersection might be miles away!) - if (MainApplication.getMap().mapView.getPoint(n).distance(MainApplication.getMap().mapView.getPoint(intersection)) < snapToIntersectionThreshold) { + MapView mv = MainApplication.getMap().mapView; + if (mv.getPoint(n).distance(mv.getPoint(intersection)) < snapToIntersectionThreshold) { n.setEastNorth(intersection); return; } - + // fall through default: EastNorth P = n.getEastNorth(); Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/upload/CheckSourceUploadHook.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/upload/CheckSourceUploadHook.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/upload/CheckSourceUploadHook.java (revision 34223) @@ -55,13 +55,9 @@ /** * Check whenever one of the keys of the object is "source" + * @param osm primitive to check * @return true if one of keys is "source" */ private boolean tagSourceExist(OsmPrimitive osm) { - for (String key : osm.keySet()) { - if (key.equals("source")) { - return true; - } - } - return false; + return osm.hasKey("source"); } Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadData.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadData.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadData.java (revision 34223) @@ -18,4 +18,13 @@ /** * Constructs a new {@code CadastreDownloadData}. + * @param downloadWater whether to download water layer + * @param downloadBuilding whether to download building layer + * @param downloadSymbol whether to download symbol layer + * @param downloadParcel whether to download parcel layer + * @param downloadParcelNumber whether to download parcel number layer + * @param downloadAddress whether to download address layer + * @param downloadLocality whether to download locality layer + * @param downloadSection whether to download section layer + * @param downloadCommune whether to download communal layer */ CadastreDownloadData(boolean downloadWater, boolean downloadBuilding, boolean downloadSymbol, 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 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoLotFile.java (revision 34223) @@ -77,4 +77,5 @@ /** * Finds a descriptor by its identifier. + * @param block type * @param values 4 values obtained from a {@code EdigeoRecord}:
    *
  1. Lot identifier
    2. Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/utils/ClassToInstancesMap.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/utils/ClassToInstancesMap.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/utils/ClassToInstancesMap.java (revision 34223) @@ -20,4 +20,5 @@ * entry for this class is present. This will only return values that were * bound to this specific class, not values that may have been bound to a subtype. + * @param block type * @param type type * @return the values the specified class is mapped to, or {@code null} @@ -28,4 +29,5 @@ * Maps the specified class to the specified values. Does not associate * these values with any of the class's supertypes. + * @param block type * @param type type * @param values new values @@ -38,4 +40,5 @@ /** * Adds a new value to the list mapped to the specified class. + * @param block type * @param type type * @param value value to add Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert4ZoneFilter.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert4ZoneFilter.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert4ZoneFilter.java (revision 34223) @@ -17,4 +17,7 @@ private final String description; + /** + * Filters for each one of the 4 Lambert zones. + */ public static final CacheFileLambert4ZoneFilter[] filters = { new CacheFileLambert4ZoneFilter("1", tr("Lambert Zone {0} cache file (.{0})", 1)), @@ -26,5 +29,6 @@ /** * Construct an extension file filter by giving the extension to check after. - * + * @param extension file extension + * @param description file description */ private CacheFileLambert4ZoneFilter(String extension, String description) { @@ -33,5 +37,5 @@ } - public boolean acceptName(String filename) { + boolean acceptName(String filename) { String name = filename.toLowerCase(Locale.FRANCE); for (String ext : extension.split(",")) { Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert9ZoneFilter.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert9ZoneFilter.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileLambert9ZoneFilter.java (revision 34223) @@ -16,4 +16,7 @@ private final String description; + /** + * Filters for each one of the 9 Lambert zones. + */ public static CacheFileLambert9ZoneFilter[] filters = { new CacheFileLambert9ZoneFilter("cc1", tr("Lambert CC9 Zone {0} cache file (.CC{0})", 1)), @@ -30,5 +33,6 @@ /** * Construct an extension file filter by giving the extension to check after. - * + * @param extension file extension + * @param description file description */ private CacheFileLambert9ZoneFilter(String extension, String description) { @@ -37,5 +41,5 @@ } - public boolean acceptName(String filename) { + boolean acceptName(String filename) { String name = filename.toLowerCase(); for (String ext : extension.split(",")) { @@ -57,4 +61,3 @@ return description; } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileUTM20NFilter.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileUTM20NFilter.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CacheFileUTM20NFilter.java (revision 34223) @@ -16,4 +16,7 @@ private final String description; + /** + * Filters for each one of the 4 French UTM zones. + */ public static CacheFileUTM20NFilter[] filters = { new CacheFileUTM20NFilter("utm1", tr("Guadeloupe Fort-Marigot cache file (.UTM1)")), @@ -25,5 +28,6 @@ /** * Construct an extension file filter by giving the extension to check after. - * + * @param extension file extension + * @param description file description */ private CacheFileUTM20NFilter(String extension, String description) { @@ -32,5 +36,5 @@ } - public boolean acceptName(String filename) { + boolean acceptName(String filename) { String name = filename.toLowerCase(); for (String ext : extension.split(",")) { @@ -52,4 +56,3 @@ return description; } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreGrabber.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreGrabber.java (revision 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreGrabber.java (revision 34223) @@ -21,5 +21,5 @@ private CadastreInterface wmsInterface = new CadastreInterface(); - public GeorefImage grab(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) + GeorefImage grab(WMSLayer wmsLayer, EastNorth lambertMin, EastNorth lambertMax) throws IOException, OsmTransferException { try { @@ -89,5 +89,5 @@ } - public CadastreInterface getWmsInterface() { + CadastreInterface getWmsInterface() { return wmsInterface; } 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 34222) +++ /applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/wms/CadastreInterface.java (revision 34223) @@ -38,5 +38,5 @@ public class CadastreInterface { - public boolean downloadCanceled; + boolean downloadCanceled; private Response urlConn; @@ -60,5 +60,5 @@ private long cookieTimestamp; - public static final String BASE_URL = "https://www.cadastre.gouv.fr"; + static final String BASE_URL = "https://www.cadastre.gouv.fr"; static final String C_IMAGE_FORMAT = "Cette commune est au format "; static final String C_COMMUNE_LIST_START = "