Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java
===================================================================
--- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java	(revision 33179)
+++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java	(revision 33579)
@@ -68,4 +68,6 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Divider;
 import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Leaf;
@@ -77,7 +79,7 @@
 import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -134,5 +136,5 @@
     protected void buttonAction(int i, ActionEvent evt) {
         if (i == 0) { // OK Button
-            Collection<OsmPrimitive> selPrim = Main.getLayerManager().getEditDataSet().getSelected();
+            Collection<OsmPrimitive> selPrim = MainApplication.getLayerManager().getEditDataSet().getSelected();
             if (!selPrim.isEmpty()) {
                 Main.pref.put("plugin.roadsigns.addTrafficSignTag", addTrafficSignTag.isSelected());
@@ -140,5 +142,5 @@
                 Command cmd = createCommand(selPrim);
                 if (cmd != null) {
-                    Main.main.undoRedo.add(cmd);
+                    MainApplication.undoRedo.add(cmd);
                 }
             }
@@ -159,5 +161,5 @@
                     xmlenc.writeObject(model);
                 } catch (FileNotFoundException ex) {
-                    Main.warn("unable to write dialog layout: "+ex);
+                    Logging.warn("unable to write dialog layout: "+ex);
                 }
             }
Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java
===================================================================
--- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java	(revision 33179)
+++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java	(revision 33579)
@@ -97,4 +97,5 @@
    * gets displayed.
    */
+  @Override
   public String getMessage() {
     if (!specialConstructor) {
Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java
===================================================================
--- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java	(revision 33179)
+++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java	(revision 33579)
@@ -91,4 +91,5 @@
    * Returns the image.
    */
+  @Override
   public String toString()
   {
Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java
===================================================================
--- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java	(revision 33179)
+++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java	(revision 33579)
@@ -115,4 +115,5 @@
     * from this method for such cases in the release version of your parser.
     */
+   @Override
    public String getMessage() {
       return super.getMessage();