Index: applications/editors/josm/plugins/public_transport/build.xml =================================================================== --- applications/editors/josm/plugins/public_transport/build.xml (revision 33736) +++ applications/editors/josm/plugins/public_transport/build.xml (revision 33737) @@ -5,5 +5,5 @@ - + Index: applications/editors/josm/plugins/public_transport/src/public_transport/AbstractGTFSCatchJoinCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/AbstractGTFSCatchJoinCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/AbstractGTFSCatchJoinCommand.java (revision 33737) @@ -9,9 +9,9 @@ import java.util.List; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public abstract class AbstractGTFSCatchJoinCommand extends Command { @@ -45,5 +45,5 @@ return false; Node dest = null; - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); Iterator iter = ds.getSelectedNodes().iterator(); int j = workingLines.get(0); @@ -88,5 +88,5 @@ int j = workingLines.get(0); - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); Node node = gtfsStopTM.nodes.elementAt(j); if (node != null) { Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java (revision 33737) @@ -7,8 +7,8 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public class GTFSAddCommand extends Command { @@ -70,5 +70,5 @@ if (node == null) continue; - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java (revision 33737) @@ -7,8 +7,8 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public class GTFSDeleteCommand extends Command { @@ -60,5 +60,5 @@ gtfsStopTM.nodes.set(j, null); gtfsStopTM.setValueAt(tr("skipped"), j, 2); - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); } @@ -76,5 +76,5 @@ continue; node.setDeleted(false); - Main.getLayerManager().getEditDataSet().addPrimitive(node); + MainApplication.getLayerManager().getEditDataSet().addPrimitive(node); } } Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java (revision 33737) @@ -30,4 +30,5 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.MainApplication; public class GTFSImporterAction extends JosmAction { @@ -172,5 +173,5 @@ Vector existingStops = new Vector<>(); - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); if (ds == null) { JOptionPane.showMessageDialog(null, @@ -236,5 +237,5 @@ node.put("stop_id", id); node.put("name", name); - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); if (ds == null) { JOptionPane.showMessageDialog(null, @@ -269,5 +270,5 @@ /** marks the table items whose nodes are marked on the map */ public static void findNodesInTable(JTable table, Vector nodes) { - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); if (ds == null) return; @@ -305,5 +306,5 @@ public static void markNodesFromTable(JTable table, Vector nodes) { OsmPrimitive[] osmp = {null}; - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); ds.setSelected(osmp); Vector consideredLines = getConsideredLines(table); Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSStopTableModel.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSStopTableModel.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSStopTableModel.java (revision 33737) @@ -11,9 +11,9 @@ import javax.swing.table.DefaultTableModel; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.DataSource; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.gui.MainApplication; public class GTFSStopTableModel extends DefaultTableModel implements TableModelListener { @@ -162,5 +162,5 @@ LatLon coor = new LatLon(lat, lon); - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); if (ds != null) { boolean inside = false; Index: applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java (revision 33737) @@ -8,7 +8,7 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MainApplication; public class PublicTransportAStar extends AStarAlgorithm { @@ -87,5 +87,5 @@ waysPerNode = new TreeMap<>(); - Iterator iter = Main.getLayerManager().getEditDataSet().getWays().iterator(); + Iterator iter = MainApplication.getLayerManager().getEditDataSet().getWays().iterator(); while (iter.hasNext()) { Way way = iter.next(); Index: applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (revision 33737) @@ -53,4 +53,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.MainApplication; public class RoutePatternAction extends JosmAction { @@ -331,5 +332,5 @@ public void actionPerformed(ActionEvent event) { Frame frame = JOptionPane.getFrameForComponent(Main.parent); - DataSet mainDataSet = Main.getLayerManager().getEditDataSet(); + DataSet mainDataSet = MainApplication.getLayerManager().getEditDataSet(); if (jDialog == null) { @@ -1057,5 +1058,5 @@ */ } else if ("routePattern.overviewDelete".equals(event.getActionCommand())) { - DeleteAction.deleteRelation(Main.getLayerManager().getEditLayer(), currentRoute); + DeleteAction.deleteRelation(MainApplication.getLayerManager().getEditLayer(), currentRoute); currentRoute = null; @@ -1104,5 +1105,5 @@ } else if ("routePattern.itineraryMark".equals(event.getActionCommand())) { OsmPrimitive[] osmp = {null}; - Main.getLayerManager().getEditDataSet().setSelected(osmp); + MainApplication.getLayerManager().getEditDataSet().setSelected(osmp); markedWays.clear(); if (itineraryTable.getSelectedRowCount() > 0) { @@ -1334,5 +1335,5 @@ } else if ("routePattern.stoplistMark".equals(event.getActionCommand())) { OsmPrimitive[] osmp = {null}; - Main.getLayerManager().getEditDataSet().setSelected(osmp); + MainApplication.getLayerManager().getEditDataSet().setSelected(osmp); markedNodes.clear(); if (stoplistTable.getSelectedRowCount() > 0) { @@ -1526,5 +1527,5 @@ // Determine for each member its position on the itinerary: position means here the // point on the itinerary that has minimal distance to the coor - mainDataSet = Main.getLayerManager().getEditDataSet(); + mainDataSet = MainApplication.getLayerManager().getEditDataSet(); if (mainDataSet != null) { String stopKey = ""; @@ -1596,5 +1597,5 @@ currentRoute = copy; - DataSet mainDataSet = Main.getLayerManager().getEditDataSet(); + DataSet mainDataSet = MainApplication.getLayerManager().getEditDataSet(); if (mainDataSet != null) { Vector relRefs = new Vector<>(); Index: applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java (revision 33737) @@ -34,4 +34,5 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.io.GpxReader; import org.xml.sax.SAXException; @@ -243,5 +244,5 @@ setTagsWrtType(node, type); node.put("name", name); - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); if (ds == null) { JOptionPane.showMessageDialog(null, @@ -292,5 +293,5 @@ /** marks the table items whose nodes are marked on the map */ public static void findNodesInTable(JTable table, Vector nodes) { - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); if (ds == null) return; @@ -326,5 +327,5 @@ public static void markNodesFromTable(JTable table, Vector nodes) { OsmPrimitive[] osmp = {null}; - DataSet ds = Main.getLayerManager().getEditDataSet(); + DataSet ds = MainApplication.getLayerManager().getEditDataSet(); ds.setSelected(osmp); Vector consideredLines = getConsideredLines(table); Index: applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java (revision 33737) @@ -7,8 +7,8 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public class TrackStoplistDeleteCommand extends Command { @@ -65,5 +65,5 @@ if (node == null) continue; - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); } @@ -80,5 +80,5 @@ continue; ntn.node.setDeleted(false); - Main.getLayerManager().getEditDataSet().addPrimitive(ntn.node); + MainApplication.getLayerManager().getEditDataSet().addPrimitive(ntn.node); } } Index: applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java (revision 33737) @@ -8,5 +8,4 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.coor.LatLon; @@ -15,4 +14,5 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public class TrackSuggestStopsCommand extends Command { @@ -65,5 +65,5 @@ if (node == null) continue; - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); } @@ -173,5 +173,5 @@ if (node == null) continue; - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); } @@ -186,5 +186,5 @@ continue; node.setDeleted(false); - Main.getLayerManager().getEditDataSet().addPrimitive(node); + MainApplication.getLayerManager().getEditDataSet().addPrimitive(node); } } Index: applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java (revision 33737) @@ -7,8 +7,8 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public class WaypointsDisableCommand extends Command { @@ -54,5 +54,5 @@ continue; waypointTM.nodes.set(j, null); - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); } @@ -69,5 +69,5 @@ continue; node.setDeleted(false); - Main.getLayerManager().getEditDataSet().addPrimitive(node); + MainApplication.getLayerManager().getEditDataSet().addPrimitive(node); } } Index: applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java (revision 33736) +++ applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java (revision 33737) @@ -7,8 +7,8 @@ import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.MainApplication; public class WaypointsEnableCommand extends Command { @@ -65,5 +65,5 @@ if (node == null) continue; - Main.getLayerManager().getEditDataSet().removePrimitive(node); + MainApplication.getLayerManager().getEditDataSet().removePrimitive(node); node.setDeleted(true); }