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

Timestamp:

2017-09-19T22:55:47+02:00 (7 years ago)

Author:

donvip

Message:

reorganize code base in several packages

Location:

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

Files:

• CadastrePlugin.java (modified) (1 diff)
• SimplifyWay.java (deleted)
• actions (added)
• actions/MenuActionBoundaries.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionBoundaries.java ) (2 diffs)
• actions/MenuActionCancelGrab.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionCancelGrab.java ) (2 diffs)
• actions/MenuActionGrab.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionGrab.java ) (2 diffs)
• actions/MenuActionGrabPlanImage.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionGrabPlanImage.java ) (2 diffs)
• actions/MenuActionLoadFromCache.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionLoadFromCache.java ) (2 diffs)
• actions/MenuActionNewLocation.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionNewLocation.java ) (2 diffs)
• actions/MenuActionOpenPreferences.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionOpenPreferences.java ) (2 diffs)
• actions/MenuActionRefineGeoRef.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionRefineGeoRef.java ) (2 diffs)
• actions/MenuActionResetCookie.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionResetCookie.java ) (1 diff)
• actions/MenuActionSaveRasterAs.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/MenuActionSaveRasterAs.java ) (2 diffs)
• actions/WMSDownloadAction.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/WMSDownloadAction.java ) (2 diffs)
• actions/mapmode (added)
• actions/mapmode/Address.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/Address.java ) (1 diff)
• actions/mapmode/WMSAdjustAction.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/WMSAdjustAction.java ) (2 diffs)
• actions/upload (added)
• actions/upload/CheckSourceUploadHook.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CheckSourceUploadHook.java ) (2 diffs)
• preferences (added)
• preferences/CadastrePreferenceSetting.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastrePreferenceSetting.java ) (3 diffs)
• preferences/Scale.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/Scale.java ) (1 diff)
• session (added)
• session/CadastreSessionExporter.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastreSessionExporter.java ) (2 diffs)
• session/CadastreSessionImporter.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastreSessionImporter.java ) (2 diffs)
• wms (added)
• wms/CacheControl.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CacheControl.java ) (2 diffs)
• wms/CacheFileLambert4ZoneFilter.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CacheFileLambert4ZoneFilter.java ) (2 diffs)
• wms/CacheFileLambert9ZoneFilter.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CacheFileLambert9ZoneFilter.java ) (1 diff)
• wms/CacheFileUTM20NFilter.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CacheFileUTM20NFilter.java ) (1 diff)
• wms/CadastreGrabber.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastreGrabber.java ) (2 diffs)
• wms/CadastreInterface.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastreInterface.java ) (3 diffs)
• wms/DownloadSVGBuilding.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/DownloadSVGBuilding.java ) (3 diffs)
• wms/DownloadSVGTask.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/DownloadSVGTask.java ) (3 diffs)
• wms/DownloadWMSPlanImage.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/DownloadWMSPlanImage.java ) (2 diffs)
• wms/DownloadWMSVectorImage.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/DownloadWMSVectorImage.java ) (1 diff)
• wms/DuplicateLayerException.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/DuplicateLayerException.java ) (1 diff)
• wms/EastNorthBound.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/EastNorthBound.java ) (1 diff)
• wms/GeorefImage.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/GeorefImage.java ) (1 diff)
• wms/GrabThread.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/GrabThread.java ) (2 diffs)
• wms/ImageModifier.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/ImageModifier.java ) (1 diff)
• wms/RasterImageGeoreferencer.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/RasterImageGeoreferencer.java ) (1 diff)
• wms/RasterImageModifier.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/RasterImageModifier.java ) (1 diff)
• wms/SVGParser.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/SVGParser.java ) (1 diff)
• wms/VectorImageModifier.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/VectorImageModifier.java ) (1 diff)
• wms/WMSException.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/WMSException.java ) (1 diff)
• wms/WMSLayer.java (moved) (moved from applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/WMSLayer.java ) (2 diffs)

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

@@ -38 +38 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionGrab;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionGrabPlanImage;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionLoadFromCache;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionNewLocation;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionOpenPreferences;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.mapmode.Address;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.mapmode.WMSAdjustAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.upload.CheckSourceUploadHook;
+import org.openstreetmap.josm.plugins.fr.cadastre.preferences.CadastrePreferenceSetting;
+import org.openstreetmap.josm.plugins.fr.cadastre.session.CadastreSessionExporter;
+import org.openstreetmap.josm.plugins.fr.cadastre.session.CadastreSessionImporter;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 /**

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.DownloadSVGTask;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 public class MenuActionBoundaries extends JosmAction {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -8 +8 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 @SuppressWarnings("serial")

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.DownloadWMSVectorImage;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 import org.openstreetmap.josm.tools.Shortcut;
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.DownloadWMSPlanImage;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.RasterImageGeoreferencer;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 public class MenuActionGrabPlanImage extends JosmAction implements Runnable {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -14 +14 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheControl;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheFileLambert4ZoneFilter;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheFileLambert9ZoneFilter;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheFileUTM20NFilter;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 public class MenuActionLoadFromCache extends JosmAction {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17 +17 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.DownloadWMSVectorImage;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 import org.openstreetmap.josm.tools.GBC;
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -10 +10 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
+import org.openstreetmap.josm.plugins.fr.cadastre.preferences.CadastrePreferenceSetting;
 
 public class MenuActionOpenPreferences extends JosmAction {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.RasterImageGeoreferencer;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 public class MenuActionRefineGeoRef extends JosmAction {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -27 +27 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
 public class MenuActionSaveRasterAs extends JosmAction {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -12 +12 @@
 //import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 
-public class WMSDownloadAction /*extends JosmAction */ {
-
-//    public WMSDownloadAction(String layerName) {
-//        super(layerName, "wmsmenu", tr("Download WMS tile from {0}",layerName), null, false);
-//    }
-//
-//    public void actionPerformed(ActionEvent e) {
-//        DownloadWMSVectorImage.download(getLayer());
-//    }
+public class WMSDownloadAction {
 
     public static WMSLayer getLayer() {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions.mapmode;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions.mapmode;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19 +19 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheControl;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.actions.upload;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 import org.openstreetmap.josm.tools.GBC;
 

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/preferences/CadastrePreferenceSetting.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.preferences;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -26 +26 @@
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheControl;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -93 +95 @@
     private JCheckBox layerCommune = new JCheckBox(tr("commune"));
 
-    static final int DEFAULT_SQUARE_SIZE = 100;
+    public static final int DEFAULT_SQUARE_SIZE = 100;
     private JTextField grabMultiplier4Size = new JTextField(5);
 
     private JCheckBox enableCache = new JCheckBox(tr("Enable automatic caching."));
 
-    static final int DEFAULT_CACHE_SIZE = 0; // disabled by default
+    public static final int DEFAULT_CACHE_SIZE = 0; // disabled by default
     JLabel jLabelCacheSize = new JLabel(tr("Max. cache size (in MB)"));
     private JTextField cacheSize = new JTextField(20);
 
-    static final String DEFAULT_RASTER_DIVIDER = "7";
+    public static final String DEFAULT_RASTER_DIVIDER = "7";
     private JTextField rasterDivider = new JTextField(10);
 
     static final int DEFAULT_CROSSPIECES = 0;
 
-    static final String DEFAULT_GRAB_MULTIPLIER = Scale.SQUARE_100M.value;
+    public static final String DEFAULT_GRAB_MULTIPLIER = Scale.SQUARE_100M.value;
 
     /**

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/preferences/Scale.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.preferences;
 
 /**

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/session/CadastreSessionExporter.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.session;
 
 import java.awt.Component;
@@ -19 +19 @@
 import org.openstreetmap.josm.io.session.SessionLayerExporter;
 import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 import org.openstreetmap.josm.tools.GBC;
 import org.w3c.dom.Element;

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/session/CadastreSessionImporter.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.session;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19 +19 @@
 import org.openstreetmap.josm.io.session.SessionLayerImporter;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.CacheControl;
+import org.openstreetmap.josm.plugins.fr.cadastre.wms.WMSLayer;
 import org.w3c.dom.Element;
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.preferences.CadastrePreferenceSetting;
 
 /**

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17 +17 @@
     private final String description;
 
-    static final CacheFileLambert4ZoneFilter[] filters = {
+    public static final CacheFileLambert4ZoneFilter[] filters = {
         new CacheFileLambert4ZoneFilter("1", tr("Lambert Zone {0} cache file (.{0})", 1)),
         new CacheFileLambert4ZoneFilter("2", tr("Lambert Zone {0} cache file (.{0})", 2)),

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 
 public class CadastreGrabber {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -34 +34 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.ProgressInputStream;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -58 +59 @@
     private long cookieTimestamp;
 
-    static final String BASE_URL = "https://www.cadastre.gouv.fr";
+    public 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 = "<select name=\"codeCommune\"";

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -31 +31 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 
 public class DownloadSVGBuilding extends PleaseWaitRunnable {
@@ -134 +135 @@
                 }*/
 
-        // simplify ways and check if we can reuse existing OSM nodes
-//        for (Way wayToAdd : svgDataSet.getWays())
-//            new SimplifyWay().simplifyWay(wayToAdd, svgDataSet, 0.5);
         // check if the new way or its nodes is already in OSM layer
         for (Node n : svgDataSet.getNodes()) {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -31 +31 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 
 /**
@@ -129 +130 @@
         wayToAdd.addNode(wayToAdd.getNode(0)); // close the circle
 
-        // simplify the way
-//        double threshold = Double.parseDouble(Main.pref.get("cadastrewms.simplify-way-boundary", "1.0"));
-//        new SimplifyWay().simplifyWay(wayToAdd, Main.main.getCurrentDataSet(), threshold);
-
         cmds.add(new AddCommand(wayToAdd));
         Main.main.undoRedo.add(new SequenceCommand(tr("Create boundary"), cmds));

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -14 +14 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 
 public class DownloadWMSPlanImage {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
-class DuplicateLayerException extends Exception {
+public class DuplicateLayerException extends Exception {
     private static final long serialVersionUID = 1L;
 }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.io.Serializable;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.awt.AlphaComposite;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.awt.Color;
@@ -14 +14 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
 
 public class GrabThread extends Thread {

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.awt.Color;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.awt.Color;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.util.ArrayList;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import java.awt.Color;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
-class WMSException extends Exception {
+public class WMSException extends Exception {
     private String message;
     private static final long serialVersionUID = 1L;
 
-    WMSException(String message) {
+    public WMSException(String message) {
         super();
         this.message = message;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.fr.cadastre;
+package org.openstreetmap.josm.plugins.fr.cadastre.wms;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -41 +41 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.plugins.fr.cadastre.CadastrePlugin;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionCancelGrab;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionLoadFromCache;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionRefineGeoRef;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.MenuActionSaveRasterAs;
+import org.openstreetmap.josm.plugins.fr.cadastre.actions.mapmode.WMSAdjustAction;
+import org.openstreetmap.josm.plugins.fr.cadastre.preferences.CadastrePreferenceSetting;
 
 /**