Changeset 33764 in osm for applications/editors/josm

Timestamp:

2017-11-04T18:09:15+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12643

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/public_transport/GTFSImporterAction.java (modified) (4 diffs)
• src/public_transport/PublicTransportPlugin.java (modified) (2 diffs)
• src/public_transport/RoutePatternAction.java (modified) (3 diffs)
• src/public_transport/StopImporterAction.java (modified) (2 diffs)

applications/editors/josm/plugins/public_transport/build.xml

@@ -5 +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="12636"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>

applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.tools.Logging;
 
 public class GTFSImporterAction extends JosmAction {
@@ -52 +53 @@
                 false);
         putValue("toolbar", "publictransport/gtfsimporter");
-        Main.toolbar.register(this);
+        MainApplication.getToolbar().register(this);
     }
 
@@ -161 +162 @@
             }
         } catch (FileNotFoundException e) {
-            Main.error(e);
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("File \"{0}\" does not exist", file.getName()));
         } catch (IOException e) {
-            Main.error(e);
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("IOException \"{0}\" occurred", e.toString()));
         }
@@ -297 +298 @@
             return;
         box.enlargeBoundingBox();
-        Main.map.mapView.zoomTo(box);
+        MainApplication.getMap().mapView.zoomTo(box);
     }
 

applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportPlugin.java

@@ -9 +9 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -24 +24 @@
 
     public static void refreshMenu() {
-        MainMenu menu = Main.main.menu;
+        MainMenu menu = MainApplication.getMenu();
 
         if (jMenu == null)

applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java

@@ -326 +326 @@
                 false);
         putValue("toolbar", "publictransport/routepattern");
-        Main.toolbar.register(this);
+        MainApplication.getToolbar().register(this);
     }
 
@@ -1102 +1102 @@
                 return;
             box.enlargeBoundingBox();
-            Main.map.mapView.zoomTo(box);
+            MainApplication.getMap().mapView.zoomTo(box);
         } else if ("routePattern.itineraryMark".equals(event.getActionCommand())) {
             OsmPrimitive[] osmp = {null};
@@ -1332 +1332 @@
                 return;
             box.enlargeBoundingBox();
-            Main.map.mapView.zoomTo(box);
+            MainApplication.getMap().mapView.zoomTo(box);
         } else if ("routePattern.stoplistMark".equals(event.getActionCommand())) {
             OsmPrimitive[] osmp = {null};

applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java

@@ -58 +58 @@
                 false);
         putValue("toolbar", "publictransport/stopimporter");
-        Main.toolbar.register(this);
+        MainApplication.getToolbar().register(this);
     }
 
@@ -319 +319 @@
             return;
         box.enlargeBoundingBox();
-        Main.map.mapView.zoomTo(box);
+        MainApplication.getMap().mapView.zoomTo(box);
     }