Index: /applications/editors/josm/plugins/DirectDownload/build.xml
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 33849)
+++ /applications/editors/josm/plugins/DirectDownload/build.xml	(revision 33850)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java	(revision 33849)
+++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java	(revision 33850)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -26,8 +27,8 @@
 
         openaction = new DownloadAction();
-        MainMenu.add(Main.main.menu.gpsMenu, openaction);
+        MainMenu.add(MainApplication.getMenu().gpsMenu, openaction);
     }
 
-    class DownloadAction extends JosmAction {
+    static class DownloadAction extends JosmAction {
         public DownloadAction() {
             super(tr("Download Track ..."), "DownloadAction",
@@ -35,4 +36,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent event) {
             DownloadDataGui go = new DownloadDataGui();
@@ -52,5 +54,5 @@
 
             if (data.hasRoutePoints() || data.hasTrackPoints()) {
-                Main.getLayerManager().addLayer(gpxLayer);
+                MainApplication.getLayerManager().addLayer(gpxLayer);
             }
 
@@ -58,5 +60,5 @@
                 MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", track.filename), null, gpxLayer);
                 if (ml.data.size() > 0) {
-                    Main.getLayerManager().addLayer(ml);
+                    MainApplication.getLayerManager().addLayer(ml);
                 }
             }
Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java	(revision 33849)
+++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java	(revision 33850)
@@ -17,6 +17,4 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.UIManager;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.DefaultTableModel;
@@ -151,10 +149,4 @@
     }
 
-    class ListSelectionHandler implements ListSelectionListener {
-        @Override
-		public void valueChanged(ListSelectionEvent lse) {
-        }
-    }
-
     static class NamedResultCellRenderer extends JLabel implements TableCellRenderer {
 
Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java	(revision 33849)
+++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java	(revision 33850)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
@@ -36,14 +37,12 @@
             }
         } catch (IOException | OsmTransferException e) {
-            Main.warn(e);
+            Logging.warn(e);
             JOptionPane.showMessageDialog(Main.parent, tr("Error fetching URL {0}", urlString));
             return null;
         } catch (SAXException e) {
-            Main.warn(e);
+            Logging.warn(e);
             JOptionPane.showMessageDialog(Main.parent, tr("Error parsing data from URL {0}", urlString));
             return null;
-
         }
     }
-
 }
Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrackReader.java
===================================================================
--- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrackReader.java	(revision 33849)
+++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrackReader.java	(revision 33850)
@@ -1,23 +1,26 @@
 package org.openstreetmap.josm.plugins.directdownload;
 
-import org.openstreetmap.josm.Main;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmConnection;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
-
-import javax.swing.*;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class UserTrackReader extends OsmConnection {
@@ -42,12 +45,12 @@
 
             return handler.getResult();
-        } catch (java.net.MalformedURLException e) {
-            Main.error(e);
+        } catch (MalformedURLException e) {
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("Invalid URL {0}", urlString));
-        } catch (java.io.IOException | OsmTransferException e) {
-            Main.error(e);
+        } catch (IOException | OsmTransferException e) {
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("Error fetching URL {0}", urlString));
         } catch (SAXException | ParserConfigurationException e) {
-            Main.error(e);
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("Error parsing data from URL {0}", urlString));
         }