Index: /applications/editors/josm/plugins/rasterfilters/build.xml
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/build.xml	(revision 33584)
+++ /applications/editors/josm/plugins/rasterfilters/build.xml	(revision 33585)
@@ -10,6 +10,6 @@
 	
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="10580" />
-	<property name="plugin.version" value="1.0.1"/>
+	<property name="plugin.main.version" value="12782" />
+	<property name="plugin.version" value="1.0.2"/>
 
     <property name="plugin.icon" value="images/josm_filters_48.png"/>
Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java	(revision 33584)
+++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java	(revision 33585)
@@ -8,4 +8,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.SideButton;
@@ -25,5 +26,5 @@
 import org.openstreetmap.josm.plugins.rasterfilters.preferences.FiltersDownloader;
 import org.openstreetmap.josm.plugins.rasterfilters.preferences.RasterFiltersPreferences;
-
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -41,5 +42,5 @@
     public RasterFiltersPlugin(PluginInformation info) {
         super(info);
-        Main.debug("Loading RasterFiltersPlugin");
+        Logging.debug("Loading RasterFiltersPlugin");
 
         File file = new File(getPluginDir());
@@ -52,5 +53,5 @@
                     file.createNewFile();
                 } catch (IOException e) {
-                    Main.debug("Cannot create file" + file.getAbsolutePath() + "\n" + e.getMessage());
+                    Logging.debug("Cannot create file" + file.getAbsolutePath() + "\n" + e.getMessage());
                 }
             }
@@ -62,7 +63,7 @@
     @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-        if (Main.isDisplayingMapView()) {
-            Main.getLayerManager().addLayerChangeListener(this);
-            Main.getLayerManager().addActiveLayerChangeListener(this);
+        if (MainApplication.isDisplayingMapView()) {
+            MainApplication.getLayerManager().addLayerChangeListener(this);
+            MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         }
     }
@@ -70,5 +71,5 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        if (!(Main.getLayerManager().getActiveLayer() instanceof ImageryLayer)) {
+        if (!(MainApplication.getLayerManager().getActiveLayer() instanceof ImageryLayer)) {
             filterButton.setEnabled(false);
         } else {
@@ -121,5 +122,5 @@
         }
 
-        if (Main.getLayerManager().getLayers().isEmpty()) {
+        if (MainApplication.getLayerManager().getLayers().isEmpty()) {
             Container container = filterButton.getParent();
             if (container != null) {
@@ -131,6 +132,6 @@
         }
 
-        Main.getLayerManager().removeLayerChangeListener(this);
-        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().removeLayerChangeListener(this);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
     }
 
Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowFiltersDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowFiltersDialogAction.java	(revision 33584)
+++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/actions/ShowFiltersDialogAction.java	(revision 33585)
@@ -10,5 +10,5 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.plugins.rasterfilters.gui.FiltersDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -48,5 +49,5 @@
     public void actionPerformed(ActionEvent e) {
 
-        Layer layer = Main.getLayerManager().getActiveLayer();
+        Layer layer = MainApplication.getLayerManager().getActiveLayer();
 
         if (layer instanceof ImageryLayer) {
@@ -64,5 +65,5 @@
             }
         } else {
-            Main.debug("The layer is not the instance of " + ImageryLayer.class.getCanonicalName());
+            Logging.debug("The layer is not the instance of " + ImageryLayer.class.getCanonicalName());
         }
     }
Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java	(revision 33584)
+++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/gui/FilterPanel.java	(revision 33585)
@@ -31,4 +31,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.rasterfilters.model.FiltersManager;
+import org.openstreetmap.josm.tools.Logging;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -245,6 +246,6 @@
             int initValue = json.getInt("default");
 
-            Main.debug("Slider is integer\n");
-            Main.debug("minValue: " + String.valueOf(minValue)
+            Logging.debug("Slider is integer\n");
+            Logging.debug("minValue: " + String.valueOf(minValue)
                     + "maxValue: " + String.valueOf(maxValue));
             try {
@@ -265,9 +266,9 @@
         } else if (valueType.equals("float")) {
 
-            Main.debug("Slider is float\n");
+            Logging.debug("Slider is float\n");
             // every value is supplied by 10 to be integer for slider
             double minValueDouble = array.getJsonNumber(0).doubleValue();
             double maxValueDouble = array.getJsonNumber(1).doubleValue();
-            Main.debug("DminValue: " + String.valueOf(minValueDouble)
+            Logging.debug("DminValue: " + String.valueOf(minValueDouble)
                     + "DmaxValue: " + String.valueOf(maxValueDouble));
 
Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java	(revision 33584)
+++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/model/FiltersManager.java	(revision 33585)
@@ -25,6 +25,5 @@
 
 import com.bric.swing.ColorPicker;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.ImageProcessor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.rasterfilters.filters.Filter;
 import org.openstreetmap.josm.plugins.rasterfilters.gui.FilterGuiListener;
@@ -32,4 +31,6 @@
 import org.openstreetmap.josm.plugins.rasterfilters.gui.FiltersDialog;
 import org.openstreetmap.josm.plugins.rasterfilters.preferences.FiltersDownloader;
+import org.openstreetmap.josm.tools.ImageProcessor;
+import org.openstreetmap.josm.tools.Logging;
 
 
@@ -75,5 +76,5 @@
 
         try {
-            Main.debug("ClassName for loading " + filterState.getFilterClassName());
+            Logging.debug("ClassName for loading " + filterState.getFilterClassName());
             clazz = FiltersDownloader.loader.loadClass(filterState
                     .getFilterClassName());
@@ -81,5 +82,5 @@
 
         } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
 
@@ -130,5 +131,5 @@
             filter.changeFilterState(filterState.encodeJson());
         }
-        Main.getLayerManager().getActiveLayer().setFilterStateChanged();
+        MainApplication.getLayerManager().getActiveLayer().setFilterStateChanged();
 
         fp.createBottomPanel(this);
@@ -136,5 +137,5 @@
         filterListener.setFilterState(filterState);
 
-        Main.debug("The number of elems in the Filters map is equal \n"
+        Logging.debug("The number of elems in the Filters map is equal \n"
                 + filtersMap.size());
 
@@ -154,6 +155,6 @@
         }
 
-        if (Main.getLayerManager().getActiveLayer() != null) {
-            Main.getLayerManager().getActiveLayer().setFilterStateChanged();
+        if (MainApplication.getLayerManager().getActiveLayer() != null) {
+            MainApplication.getLayerManager().getActiveLayer().setFilterStateChanged();
         }
 
@@ -238,5 +239,5 @@
         }
 
-        Main.getLayerManager().getActiveLayer().setFilterStateChanged();
+        MainApplication.getLayerManager().getActiveLayer().setFilterStateChanged();
 
     }
@@ -254,5 +255,5 @@
             disabledFilters.add(filtersMap.get(filterId));
 
-            Main.getLayerManager().getActiveLayer().setFilterStateChanged();
+            MainApplication.getLayerManager().getActiveLayer().setFilterStateChanged();
 
         } else {
@@ -261,5 +262,5 @@
             disabledFilters.remove(filtersMap.get(filterId));
 
-            Main.getLayerManager().getActiveLayer().setFilterStateChanged();
+            MainApplication.getLayerManager().getActiveLayer().setFilterStateChanged();
 
         }
Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java
===================================================================
--- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java	(revision 33584)
+++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java	(revision 33585)
@@ -38,4 +38,5 @@
 import org.jsoup.select.Elements;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -225,5 +226,5 @@
     public static void initFilters() {
         File file = new File(pluginDir, "urls.map");
-        Main.debug("EXIST FILE? " + file.exists());
+        Logging.debug("EXIST FILE? " + file.exists());
 
         try (BufferedReader br = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
@@ -237,8 +238,8 @@
                     try {
                         url = new URL("jar", "", fileUrl.toURI().toURL() + "!/");
-                        Main.debug("binaryUrl: " + url.toString());
+                        Logging.debug("binaryUrl: " + url.toString());
                         binariesLocalUrls.add(url);
                     } catch (MalformedURLException e) {
-                        Main.debug("Initializing filters with unknown protocol. \n"
+                        Logging.debug("Initializing filters with unknown protocol. \n"
                                 + e.getMessage());
                     }
@@ -249,5 +250,5 @@
         }
 
-        Main.debug("BinariesLocal : " + binariesLocalUrls.toString());
+        Logging.debug("BinariesLocal : " + binariesLocalUrls.toString());
 
         loader = new URLClassLoader(
@@ -286,5 +287,5 @@
 
         File file = new File(pluginDir, "urls.map");
-        Main.debug("pluginDir and urls map" + file.getAbsoluteFile());
+        Logging.debug("pluginDir and urls map" + file.getAbsoluteFile());
 
         try (BufferedWriter writer = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
@@ -317,5 +318,5 @@
     public static String loadBinaryToFile(String fromUrl) {
 
-        // Main.debug("Need to load binary from " + fromUrl);
+        // Logging.debug("Need to load binary from " + fromUrl);
 
         URL url = null;
@@ -327,12 +328,10 @@
         String localFile = null;
         File plugin = new File(pluginDir);
-        Main.debug("plugin dir" + plugin.getAbsolutePath());
+        Logging.debug("plugin dir" + plugin.getAbsolutePath());
 
         if (m.find()) {
-
             if (plugin.exists()) {
-
                 localFile = fromUrl.substring(m.end());
-                Main.debug("localFile: " + localFile);
+                Logging.debug("localFile: " + localFile);
             }
         }
@@ -343,8 +342,8 @@
             String plugDir = plugin.getAbsolutePath();
             File file = new File(plugDir, localFile);
-            Main.debug("Binary file: " + file.getAbsolutePath());
+            Logging.debug("Binary file: " + file.getAbsolutePath());
 
             if (file.exists()) {
-                Main.debug("File " + localFile + " already exists");
+                Logging.debug("File " + localFile + " already exists");
 
                 return file.getAbsolutePath();