Index: applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- applications/editors/josm/plugins/globalsat/build.xml	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/build.xml	(revision 33854)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12840"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Dg100Config.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Dg100Config.java	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Dg100Config.java	(revision 33854)
@@ -12,5 +12,5 @@
 import java.util.Properties;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -466,5 +466,5 @@
             props.store(os, "dg100 config");
         } catch (Exception ex) {
-            Main.error(ex);
+            Logging.error(ex);
             throw ex;
         }
@@ -477,5 +477,5 @@
             props.load(is);
         } catch (Exception ex) {
-            Main.error(ex);;
+            Logging.error(ex);;
             throw ex;
         }
Index: applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/FileInfoRec.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/FileInfoRec.java	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/FileInfoRec.java	(revision 33854)
@@ -24,4 +24,5 @@
     }
 
+    @Override
     public String toString()
     {
Index: applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java	(revision 33854)
@@ -68,7 +68,5 @@
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
+    @Override
     public boolean equals(Object arg0)
     {
@@ -142,4 +140,5 @@
     }
 
+    @Override
     public String toString()
     {
@@ -230,6 +229,6 @@
         int scale = 1000000;
         double deg = 9999.9999;
-        double degScaled = (double)(gsLatOrLon / scale);
-        double minScaled = ((double)(gsLatOrLon - degScaled * scale)) / 600000.0;
+        double degScaled = gsLatOrLon / scale;
+        double minScaled = (gsLatOrLon - degScaled * scale) / 600000.0;
         deg = degScaled + minScaled;
         return deg;
@@ -432,10 +431,10 @@
     public double getAltitude()
     {
-        return dg100Altitude / (double)10000.0;
+        return dg100Altitude / 10000.0;
     }
 
     public double getSpeed()
     {
-        return dg100Speed / (double)360.0;
+        return dg100Speed / 360.0;
     }
 
Index: applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java	(revision 33854)
@@ -33,5 +33,5 @@
 public class GlobalsatConfigDialog extends JPanel {
 
-    public class IntegerTextField extends JTextField {
+    public static class IntegerTextField extends JTextField {
 
         IntegerTextField() {
Index: applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 33854)
@@ -38,5 +38,5 @@
 public class GlobalsatDg100 {
 
-    public class ConnectionException extends Exception {
+    public static class ConnectionException extends Exception {
         ConnectionException(Exception cause) {
             super(cause);
Index: applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java	(revision 33853)
+++ applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java	(revision 33854)
@@ -15,4 +15,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.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -20,4 +21,5 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
@@ -59,5 +61,5 @@
         @Override protected void finish() {
             if (deleteAfter && GlobalsatPlugin.dg100().isCanceled() == false) {
-                Main.pref.put("globalsat.deleteAfterDownload", true);
+                Main.pref.putBoolean("globalsat.deleteAfterDownload", true);
                 try {
                     GlobalsatPlugin.dg100().deleteData();
@@ -66,9 +68,9 @@
                 }
             } else {
-                Main.pref.put("globalsat.deleteAfterDownload", false);
+                Main.pref.putBoolean("globalsat.deleteAfterDownload", false);
             }
             if (data != null && data.hasTrackPoints()) {
-                Main.getLayerManager().addLayer(new GpxLayer(data, tr("imported data from {0}", "DG 100")));
-                Main.map.repaint();
+                MainApplication.getLayerManager().addLayer(new GpxLayer(data, tr("imported data from {0}", "DG 100")));
+                MainApplication.getMap().repaint();
             } else {
                 JOptionPane.showMessageDialog(Main.parent, tr("No data found on device."));
@@ -99,5 +101,5 @@
             String msg = tr("Cannot load library rxtxSerial. If you need support to install it try Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/");
             // CHECKSTYLE.ON: LineLength
-            Main.error(msg);
+            Logging.error(msg);
             if (!GraphicsEnvironment.isHeadless()) {
                 JOptionPane.showMessageDialog(Main.parent, "<html>" + msg + "</html>");
@@ -106,9 +108,9 @@
         if (!error) {
             importAction = new GlobalsatImportAction();
-            Main.main.menu.toolsMenu.add(importAction);
+            MainApplication.getMenu().toolsMenu.add(importAction);
         }
     }
 
-    class GlobalsatImportAction extends JosmAction {
+    static class GlobalsatImportAction extends JosmAction {
         GlobalsatImportAction() {
             super(tr("Globalsat Import"), "globalsatImport",
@@ -127,5 +129,5 @@
                 setPortIdent(dialog.getPort());
                 ImportTask task = new ImportTask(dialog.deleteFilesAfterDownload());
-                Main.worker.execute(task);
+                MainApplication.worker.execute(task);
             }
             dlg.dispose();