Changeset 33765 in osm

Timestamp:

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

Author:

donvip

Message:

refactor packages to ease maintenability

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/org (added)
• src/org/openstreetmap (added)
• src/org/openstreetmap/josm (added)
• src/org/openstreetmap/josm/plugins (added)
• src/org/openstreetmap/josm/plugins/public_transport (added)
• src/org/openstreetmap/josm/plugins/public_transport/AStarAlgorithm.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/AStarAlgorithm.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/PublicTransportPlugin.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportPlugin.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/TransText.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TransText.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/actions (added)
• src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands (added)
• src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/AbstractGTFSCatchJoinCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSCatchCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSCatchCommand.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSJoinCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSJoinCommand.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistAddCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/dialogs (added)
• src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/AbstractImporterDialog.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/dialogs/GTFSImporterDialog.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterDialog.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/dialogs/StopImporterDialog.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/models (added)
• src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/GTFSStopTableModel.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/ItineraryTableModel.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/models/TrackStoplistTableModel.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistTableModel.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/models/WaypointTableModel.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/WaypointTableModel.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/refs (added)
• src/org/openstreetmap/josm/plugins/public_transport/refs/RouteReference.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/RouteReference.java ) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/refs/StopReference.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/StopReference.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java (copied) (copied from applications/editors/josm/plugins/public_transport/src/public_transport/TrackReference.java ) (2 diffs)
• src/public_transport (deleted)

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

@@ -8 +8 @@
 
     <property name="plugin.author" value="Roland M. Olbricht"/>
-    <property name="plugin.class" value="public_transport.PublicTransportPlugin"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.public_transport.PublicTransportPlugin"/>
     <property name="plugin.description" value="This plugin simplifies the mapping and editing of public transport routes."/>
     <!-- <property name="plugin.icon" value=""/> -->

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/AStarAlgorithm.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport;
 
 import java.util.Iterator;

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport;
 
 import java.util.Iterator;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.actions.RoutePatternAction;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
 
 public class PublicTransportPlugin extends Plugin {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/TransText.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSAddCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSCatchCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSDeleteCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSJoinCommand;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.GTFSImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
 import org.openstreetmap.josm.tools.Logging;
 

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -54 +54 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.models.ItineraryTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.RouteReference;
+import org.openstreetmap.josm.plugins.public_transport.refs.StopReference;
 
 public class RoutePatternAction extends JosmAction {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.actions;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -36 +36 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.plugins.public_transport.commands.SettingsStoptypeCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistAddCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistDeleteCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistDetachCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistRelocateCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistSortCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackSuggestStopsCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsDetachCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsDisableCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsEnableCommand;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
 import org.xml.sax.SAXException;
 

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
 
 public abstract class AbstractGTFSCatchJoinCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
 
 public class GTFSAddCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSCatchCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
 
 public class GTFSCatchCommand extends AbstractGTFSCatchJoinCommand {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
 
 public class GTFSDeleteCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSJoinCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
 
 public class GTFSJoinCommand extends AbstractGTFSCatchJoinCommand {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
 
 public class SettingsStoptypeCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -8 +8 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
 
 public class TrackStoplistAddCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
 
 public class TrackStoplistDeleteCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
 
 public class TrackStoplistDetachCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
 
 public class TrackStoplistNameCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
 
 public class TrackStoplistRelocateCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
 
 public class TrackStoplistSortCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
 
 public class TrackSuggestStopsCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
 
 public class WaypointsDetachCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
 
 public class WaypointsDisableCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
 
 public class WaypointsEnableCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.commands;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -8 +8 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
 
 public class WaypointsNameCommand extends Command {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.dialogs;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
 
 /**

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/GTFSImporterDialog.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.dialogs;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -14 +14 @@
 import javax.swing.JTable;
 import javax.swing.KeyStroke;
+
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
 
 public class GTFSImporterDialog extends AbstractImporterDialog<GTFSImporterAction> {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/StopImporterDialog.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.dialogs;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -23 +23 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+
 public class StopImporterDialog extends AbstractImporterDialog<StopImporterAction> {
     private JList<TrackReference> tracksList = null;

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.models;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
 
 public class GTFSStopTableModel extends DefaultTableModel implements TableModelListener {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.models;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.public_transport.actions.RoutePatternAction;
 
 public class ItineraryTableModel extends DefaultTableModel implements TableModelListener {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/TrackStoplistTableModel.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.models;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
 
 public class TrackStoplistTableModel extends DefaultTableModel {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/WaypointTableModel.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.models;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -14 +14 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsNameCommand;
 
 public class WaypointTableModel extends DefaultTableModel implements TableModelListener {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/RouteReference.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.refs;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -7 +7 @@
 
 public class RouteReference implements Comparable<RouteReference> {
-    Relation route;
+    public final Relation route;
 
     public RouteReference(Relation route) {

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/StopReference.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.refs;
 
 import org.openstreetmap.josm.data.osm.Node;

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package public_transport;
+package org.openstreetmap.josm.plugins.public_transport.refs;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -18 +18 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistNameCommand;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
 
 public class TrackReference implements Comparable<TrackReference>, TableModelListener {