Changeset 33579 in osm for applications/editors/josm/plugins/roadsigns/src

Timestamp:

2017-08-27T22:22:31+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12678

Location:

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns

Files:

• RoadSignInputDialog.java (modified) (5 diffs)
• javacc/ParseException.java (modified) (1 diff)
• javacc/Token.java (modified) (1 diff)
• javacc/TokenMgrError.java (modified) (1 diff)

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java

@@ -68 +68 @@
 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 +79 @@
 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 +136 @@
     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 +142 @@
                 Command cmd = createCommand(selPrim);
                 if (cmd != null) {
-                    Main.main.undoRedo.add(cmd);
+                    MainApplication.undoRedo.add(cmd);
                 }
             }
@@ -159 +161 @@
                     xmlenc.writeObject(model);
                 } catch (FileNotFoundException ex) {
-                    Main.warn("unable to write dialog layout: "+ex);
+                    Logging.warn("unable to write dialog layout: "+ex);
                 }
             }

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java

@@ -97 +97 @@
    * gets displayed.
    */
+  @Override
   public String getMessage() {
     if (!specialConstructor) {

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/Token.java

@@ -91 +91 @@
    * Returns the image.
    */
+  @Override
   public String toString()
   {

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java

@@ -115 +115 @@
     * from this method for such cases in the release version of your parser.
     */
+   @Override
    public String getMessage() {
       return super.getMessage();