Changeset 31114 in osm for applications/editors/josm/plugins/public_transport/src

Timestamp:

2015-05-03T18:52:19+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] update to JOSM 7817

Location:

applications/editors/josm/plugins/public_transport/src/public_transport

Files:

• GTFSImporterAction.java (modified) (3 diffs)
• RoutePatternAction.java (modified) (18 diffs)
• StopImporterAction.java (modified) (10 diffs)

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

@@ -67 +67 @@
   }
 
-  public void actionPerformed(ActionEvent event) {
+  @Override
+public void actionPerformed(ActionEvent event) {
 
     if (dialog == null)
@@ -316 +317 @@
       return;
     box.enlargeBoundingBox();
-    Main.map.mapView.recalculateCenterScale(box);
+    Main.map.mapView.zoomTo(box);
   }
 
@@ -357 +358 @@
   private class FocusAddAction extends AbstractAction
   {
+    @Override
     public void actionPerformed(ActionEvent e)
     {

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

@@ -64 +64 @@
     }
 
+    @Override
     public void valueChanged(ListSelectionEvent e) {
       root.routesSelectionChanged();
@@ -76 +77 @@
     }
 
+    @Override
     public int compareTo(RouteReference rr) {
       if (route.get("route") != null)
@@ -124 +126 @@
     }
 
+    @Override
     public String toString() {
       String buf = route.get("route");
@@ -162 +165 @@
     }
 
+    @Override
     public boolean isCellEditable(int row, int column) {
       if ((column == 0) && (hasFixedKeys))
@@ -207 +211 @@
     }
 
+    @Override
     public void tableChanged(TableModelEvent e)
     {
@@ -242 +247 @@
     }
 
+    @Override
     public TableCellEditor getCellEditor(int row, int column) {
       TableCellEditor editor = null;
@@ -266 +272 @@
     public Vector<Node> nodes = new Vector<Node>();
 
+    @Override
     public boolean isCellEditable(int row, int column) {
       if (column != STOPLIST_ROLE_COLUMN)
@@ -272 +279 @@
     }
 
+    @Override
     public void addRow(Object[] obj) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public void insertRow(int insPos, Object[] obj) {
       throw new UnsupportedOperationException();
@@ -323 +332 @@
 
   private class StoplistTableModelListener implements TableModelListener {
+    @Override
     public void tableChanged(TableModelEvent e)
     {
@@ -383 +393 @@
     }
 
+    @Override
     public int compareTo(StopReference sr) {
       if (this.index < sr.index)
@@ -426 +437 @@
   }
 
-  public void actionPerformed(ActionEvent event) {
+  @Override
+public void actionPerformed(ActionEvent event) {
     Frame frame = JOptionPane.getFrameForComponent(Main.parent);
     DataSet mainDataSet = Main.main.getCurrentDataSet();
@@ -1078 +1090 @@
       for (int i = 0; i < relsListModel.size(); ++i)
       {
-    if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
+    if (currentRoute == relsListModel.elementAt(i).route)
       relsList.setSelectedIndex(i);
       }
@@ -1093 +1105 @@
       for (int i = 0; i < relsListModel.size(); ++i)
       {
-    if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
+    if (currentRoute == relsListModel.elementAt(i).route)
       relsList.setSelectedIndex(i);
       }
@@ -1151 +1163 @@
       for (int i = 0; i < relsListModel.size(); ++i)
       {
-        if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
+        if (currentRoute == relsListModel.elementAt(i).route)
           relsList.setSelectedIndex(i);
       }
@@ -1231 +1243 @@
         return;
       box.enlargeBoundingBox();
-      Main.map.mapView.recalculateCenterScale(box);
+      Main.map.mapView.zoomTo(box);
     }
     else if ("routePattern.itineraryMark".equals(event.getActionCommand()))
@@ -1514 +1526 @@
         return;
       box.enlargeBoundingBox();
-      Main.map.mapView.recalculateCenterScale(box);
+      Main.map.mapView.zoomTo(box);
     }
     else if ("routePattern.stoplistMark".equals(event.getActionCommand()))
@@ -2064 +2076 @@
     if (relsList.isSelectedIndex(selectedPos))
     {
-      currentRoute = ((RouteReference)relsListModel.elementAt(selectedPos)).route;
+      currentRoute = relsListModel.elementAt(selectedPos).route;
       tabbedPane.setEnabledAt(1, true);
       tabbedPane.setEnabledAt(2, true);
@@ -2163 +2175 @@
         if (!(way.isIncomplete()))
         {
-          if ("backward".equals((String)(itineraryData.getValueAt(i, 1))))
+          if ("backward".equals((itineraryData.getValueAt(i, 1))))
           {
             for (int j = way.getNodesCount()-2; j >= 0; --j)

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

@@ -74 +74 @@
   }
 
-  public void actionPerformed(ActionEvent event)
+  @Override
+public void actionPerformed(ActionEvent event)
   {
     if (dialog == null)
@@ -246 +247 @@
     if (selectedPos >= 0)
     {
-      currentTrack = ((TrackReference)tracksListModel.elementAt(selectedPos));
+      currentTrack = (tracksListModel.elementAt(selectedPos));
       dialog.setTrackValid(true);
 
@@ -256 +257 @@
       //Prepare Stoplist
       dialog.setStoplistTableModel
-          (((TrackReference)tracksListModel.elementAt(selectedPos)).stoplistTM);
+          (tracksListModel.elementAt(selectedPos).stoplistTM);
     }
     else
@@ -354 +355 @@
       return;
     box.enlargeBoundingBox();
-    Main.map.mapView.recalculateCenterScale(box);
+    Main.map.mapView.zoomTo(box);
   }
 
@@ -402 +403 @@
     return new AbstractAction()
     {
-      public void actionPerformed(ActionEvent e)
+      @Override
+    public void actionPerformed(ActionEvent e)
       {
         JTable table = dialog.getWaypointsTable();
@@ -430 +432 @@
     return new AbstractAction()
     {
-      public void actionPerformed(ActionEvent e)
+      @Override
+    public void actionPerformed(ActionEvent e)
       {
         JTable table = dialog.getStoplistTable();
@@ -446 +449 @@
   private class FocusWaypointNameAction extends AbstractAction
   {
+    @Override
     public void actionPerformed(ActionEvent e)
     {
@@ -476 +480 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e)
     {
@@ -499 +504 @@
   private class FocusTrackStoplistNameAction extends AbstractAction
   {
+    @Override
     public void actionPerformed(ActionEvent e)
     {
@@ -529 +535 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e)
     {