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

Timestamp:

2016-11-12T04:29:54+01:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

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

Files:

• AStarAlgorithm.java (modified) (4 diffs)
• AbstractGTFSCatchJoinCommand.java (modified) (2 diffs)
• AbstractImporterDialog.java (modified) (3 diffs)
• GTFSAddCommand.java (modified) (2 diffs)
• GTFSCatchCommand.java (modified) (1 diff)
• GTFSDeleteCommand.java (modified) (2 diffs)
• GTFSImporterAction.java (modified) (7 diffs)
• GTFSImporterDialog.java (modified) (1 diff)
• GTFSJoinCommand.java (modified) (1 diff)
• GTFSStopTableModel.java (modified) (4 diffs)
• ItineraryTableModel.java (modified) (3 diffs)
• PublicTransportAStar.java (modified) (4 diffs)
• PublicTransportPlugin.java (modified) (1 diff)
• RoutePatternAction.java (modified) (16 diffs)
• RouteReference.java (added)
• SettingsStoptypeCommand.java (modified) (2 diffs)
• StopImporterAction.java (modified) (6 diffs)
• StopImporterDialog.java (modified) (4 diffs)
• StopReference.java (added)
• TrackReference.java (modified) (2 diffs)
• TrackStoplistAddCommand.java (modified) (1 diff)
• TrackStoplistDeleteCommand.java (modified) (3 diffs)
• TrackStoplistDetachCommand.java (modified) (2 diffs)
• TrackStoplistNameCommand.java (modified) (1 diff)
• TrackStoplistRelocateCommand.java (modified) (1 diff)
• TrackStoplistSortCommand.java (modified) (3 diffs)
• TrackStoplistTableModel.java (modified) (2 diffs)
• TrackSuggestStopsCommand.java (modified) (2 diffs)
• TransText.java (modified) (1 diff)
• WaypointTableModel.java (modified) (2 diffs)
• WaypointsDetachCommand.java (modified) (2 diffs)
• WaypointsDisableCommand.java (modified) (3 diffs)
• WaypointsEnableCommand.java (modified) (2 diffs)
• WaypointsNameCommand.java (modified) (1 diff)

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -11 +12 @@
     // AStarAlgorithm.
 
-    public static abstract class Vertex implements Comparable<Vertex> {
+    public abstract static class Vertex implements Comparable<Vertex> {
         @Override
         public abstract int compareTo(Vertex v);
-    };
+    }
 
-    public static abstract class Edge {
+    public abstract static class Edge {
         public abstract Vertex getBegin();
 
@@ -22 +23 @@
 
         public abstract double getLength();
-    };
+    }
 
     public abstract Vector<Edge> getNeighbors(Vertex vertex);
@@ -103 +104 @@
 
         Vector<Edge> result = new Vector<>();
-        for (int i = backwards.size() - 1; i >= 0; --i)
+        for (int i = backwards.size() - 1; i >= 0; --i) {
             result.add(backwards.elementAt(i));
+        }
         return result;
     }

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -24 +25 @@
 
     private String type = null;
-    
+
     private final boolean isCatch;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -20 +21 @@
 public abstract class AbstractImporterDialog<T extends JosmAction> {
 
-    private static final String[] stoptypes = new String[] { marktr("bus"), marktr("tram"),
-            marktr("light_rail"), marktr("subway"), marktr("rail") };
+    private static final String[] stoptypes = new String[] {
+            marktr("bus"),
+            marktr("tram"),
+            marktr("light_rail"),
+            marktr("subway"),
+            marktr("rail") };
 
     private final JDialog jDialog;
@@ -45 +50 @@
         cbStoptype = new JComboBox<>();
         cbStoptype.setEditable(false);
-        for (String type : stoptypes)
+        for (String type : stoptypes) {
             cbStoptype.addItem(new TransText(type));
+        }
         cbStoptype.setActionCommand(actionPrefix + ".settingsStoptype");
         cbStoptype.addActionListener(controller);

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -30 +31 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < gtfsStopTM.getRowCount(); ++i)
+            for (int i = 0; i < gtfsStopTM.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -30 +31 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < gtfsStopTM.getRowCount(); ++i)
+            for (int i = 0; i < gtfsStopTM.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -98 +99 @@
 
             refreshData();
-        }
-/*    else if ("stopImporter.settingsGPSTimeStart".equals(event.getActionCommand()))
+
+/*    } else if ("stopImporter.settingsGPSTimeStart".equals(event.getActionCommand()))
     {
       if ((!inEvent) && (dialog.gpsTimeStartValid()) && (currentTrack != null))
@@ -131 +132 @@
       Main.main.undoRedo.add(new TrackStoplistDetachCommand(this));
       dialog.getStoplistTable().clearSelection();
-    }*/
-        else if ("gtfsImporter.gtfsStopsAdd".equals(event.getActionCommand()))
+    */
+        } else if ("gtfsImporter.gtfsStopsAdd".equals(event.getActionCommand()))
             Main.main.undoRedo.add(new GTFSAddCommand(this));
         else if ("gtfsImporter.gtfsStopsDelete".equals(event.getActionCommand()))
@@ -155 +156 @@
                 data.clear();
 
-            while (r.ready())
+            while (r.ready()) {
                 data.add(r.readLine());
+            }
         } catch (FileNotFoundException e) {
             Main.error(e);
@@ -254 +256 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < table.getRowCount(); ++i)
+            for (int i = 0; i < table.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
         return consideredLines;
@@ -278 +282 @@
 
     /**
-     * shows the nodes that correspond to the marked lines in the table. 
+     * shows the nodes that correspond to the marked lines in the table.
      * If no lines are marked in the table, show all nodes from the vector
      */
@@ -296 +300 @@
 
     /**
-     * marks the nodes that correspond to the marked lines in the table. 
+     * marks the nodes that correspond to the marked lines in the table.
      * If no lines are marked in the table, mark all nodes from the vector
      */
     public static void markNodesFromTable(JTable table, Vector<Node> nodes) {
-        OsmPrimitive[] osmp = { null };
+        OsmPrimitive[] osmp = {null};
         DataSet ds = Main.getLayerManager().getEditDataSet();
         ds.setSelected(osmp);

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -19 +20 @@
     private GTFSImporterAction controller = null;
 
-    public Vector<Node> nodes = new Vector<Node>();
-
-    public Vector<LatLon> coors = new Vector<LatLon>();
+    public Vector<Node> nodes = new Vector<>();
+
+    public Vector<LatLon> coors = new Vector<>();
 
     private int idCol = -1;
@@ -99 +100 @@
     }
 
-    /*
-     * tokenizes a line as follows: any comma outside a pair of double quotation marks is taken as field separator. In particular, neither \" nor \,
-     * have a special meaning. Returns the position of the next field separator, if any. Otherwise it returns -1. s - the string to tokenize. startPos
+    /**
+     * tokenizes a line as follows: any comma outside a pair of double quotation marks is taken as field separator.
+     * In particular, neither \" nor \, have a special meaning. Returns the position of the next field separator, if any.
+     * Otherwise it returns -1. s - the string to tokenize. startPos
      * - the position of the last field separator plus 1 or the value 0.
      */
@@ -130 +132 @@
 
     public void insertRow(int insPos, String s, Vector<Node> existingStops) {
-        String[] buf = { "", "", tr("pending") };
+        String[] buf = {"", "", tr("pending")};
         int pos = tokenize(s, 0);
         int oldPos = 0;

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -48 +49 @@
 
     public void insertRow(int insPos, Way way, String role) {
-        String[] buf = { "", "" };
+        String[] buf = {"", ""};
         String curName = way.get("name");
         if (way.isIncomplete())
@@ -99 +100 @@
                 --i;
             } else if ((i > 0) && gapRequired && (ways.elementAt(i - 1) != null)) {
-                String[] buf = { "", "" };
+                String[] buf = {"", ""};
                 buf[0] = tr("[gap]");
                 insertRow(i, buf);

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -32 +33 @@
             return node.equals(((NodeVertex) o).node);
         }
-        
+
         @Override
         public int hashCode() {
@@ -68 +69 @@
 
             double totalDistance = 0;
-            for (int i = min; i < max; ++i)
-                totalDistance += way.getNode(i).getCoor()
-                        .greatCircleDistance(way.getNode(i + 1).getCoor());
+            for (int i = min; i < max; ++i) {
+                totalDistance += way.getNode(i).getCoor().greatCircleDistance(way.getNode(i + 1).getCoor());
+            }
             return totalDistance;
         }
@@ -140 +141 @@
                 .greatCircleDistance(nodeVertex.node.getCoor());
     }
-};
+}

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -60 +61 @@
         RoutePatternAction root = null;
 
-        public RoutesLSL(RoutePatternAction rpa) {
+        RoutesLSL(RoutePatternAction rpa) {
             root = rpa;
         }
@@ -70 +71 @@
     }
 
-    private static class RouteReference implements Comparable<RouteReference> {
-        Relation route;
-
-        public RouteReference(Relation route) {
-            this.route = route;
-        }
-
-        @Override
-        public int compareTo(RouteReference rr) {
-            if (route.get("route") != null) {
-                if (rr.route.get("route") == null)
-                    return -1;
-                int result = route.get("route").compareTo(rr.route.get("route"));
-                if (result != 0)
-                    return result;
-            } else if (rr.route.get("route") != null)
-                return 1;
-            if (route.get("ref") != null) {
-                if (rr.route.get("ref") == null)
-                    return -1;
-                int result = route.get("ref").compareTo(rr.route.get("ref"));
-                if (result != 0)
-                    return result;
-            } else if (rr.route.get("ref") != null)
-                return 1;
-            if (route.get("to") != null) {
-                if (rr.route.get("to") == null)
-                    return -1;
-                int result = route.get("to").compareTo(rr.route.get("to"));
-                if (result != 0)
-                    return result;
-            } else if (rr.route.get("to") != null)
-                return 1;
-            if (route.get("direction") != null) {
-                if (rr.route.get("direction") == null)
-                    return -1;
-                int result = route.get("direction").compareTo(rr.route.get("direction"));
-                if (result != 0)
-                    return result;
-            } else if (rr.route.get("direction") != null)
-                return 1;
-            if (route.getId() < rr.route.getId())
-                return -1;
-            else if (route.getId() > rr.route.getId())
-                return 1;
-            return 0;
-        }
-
-        @Override
-        public String toString() {
-            String buf = route.get("route");
-            if ((route.get("ref") != null) && (route.get("ref") != "")) {
-                buf += " " + route.get("ref");
-            }
-            if ((route.get("loc_ref") != null) && (route.get("loc_ref") != "")) {
-                buf += " [" + route.get("loc_ref") + "]";
-            }
-
-            if ((route.get("to") != null) && (route.get("to") != "")) {
-                buf += ": " + route.get("to");
-            } else if ((route.get("direction") != null) && (route.get("direction") != "")) {
-                buf += " " + route.get("ref") + ": " + route.get("direction");
-            } else {
-                buf += " " + route.get("ref");
-            }
-            buf += tr(" [ID] {0}", Long.toString(route.getId()));
-
-            return buf;
-        }
-    }
-
     private static class TagTableModel extends DefaultTableModel implements TableModelListener {
         Relation relation = null;
@@ -148 +78 @@
         boolean hasFixedKeys = true;
 
-        public TagTableModel(boolean hasFixedKeys) {
+        TagTableModel(boolean hasFixedKeys) {
             this.hasFixedKeys = hasFixedKeys;
         }
@@ -221 +151 @@
         TreeMap<Integer, TableCellEditor> col2 = null;
 
-        public CustomCellEditorTable() {
+        CustomCellEditorTable() {
             col1 = new TreeMap<>();
             col2 = new TreeMap<>();
@@ -273 +203 @@
 
         public void insertRow(int insPos, Node node, String role, double distance) {
-            String[] buf = { "", "", "", "" };
+            String[] buf = {"", "", "", ""};
             String curName = node.get("name");
             if (curName != null) {
@@ -320 +250 @@
         public double distance;
 
-        public SegmentMetric(double fromLat, double fromLon, double toLat, double toLon,
+        SegmentMetric(double fromLat, double fromLon, double toLat, double toLon,
                 double distance) {
             this.distance = distance;
@@ -344 +274 @@
             d2 = d2 * Math.cos(fromLat * Math.PI / 180.0);
             o2 = o2 * Math.cos(fromLat * Math.PI / 180.0);
-        }
-    }
-
-    private static class StopReference implements Comparable<StopReference> {
-        public int index = 0;
-
-        public double pos = 0;
-
-        public double distance = 0;
-
-        public String name = "";
-
-        public String role = "";
-
-        public Node node;
-
-        public StopReference(int inIndex, double inPos, double inDistance, String inName,
-                String inRole, Node inNode) {
-            index = inIndex;
-            pos = inPos;
-            distance = inDistance;
-            name = inName;
-            role = inRole;
-            node = inNode;
-        }
-
-        @Override
-        public int compareTo(StopReference sr) {
-            if (this.index < sr.index)
-                return -1;
-            if (this.index > sr.index)
-                return 1;
-            if (this.pos < sr.pos)
-                return -1;
-            if (this.pos > sr.pos)
-                return 1;
-            return 0;
         }
     }
@@ -480 +373 @@
             relsList = new JList<>(relsListModel);
             JScrollPane rpListSP = new JScrollPane(relsList);
-            String[] data = { "1", "2", "3", "4", "5", "6" };
+            String[] data = {"1", "2", "3", "4", "5", "6"};
             relsListModel.copyInto(data);
             relsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -1141 +1034 @@
 
             currentRoute.setMembers(null);
-            for (int i = itemsToReflect.size() - 1; i >= 0; --i)
+            for (int i = itemsToReflect.size() - 1; i >= 0; --i) {
                 currentRoute.addMember(itemsToReflect.elementAt(i));
-            for (int i = 0; i < otherItems.size(); ++i)
+            }
+            for (int i = 0; i < otherItems.size(); ++i) {
                 currentRoute.addMember(otherItems.elementAt(i));
+            }
 
             refreshData();
@@ -1155 +1050 @@
             // Temp
             /*
-             * if (firstNode != null) { Vector< AStarAlgorithm.Edge > path = new PublicTransportAStar(firstNode, lastNode).shortestPath(); Iterator<
+             * if (firstNode != null) {
+             * Vector< AStarAlgorithm.Edge > path = new PublicTransportAStar(firstNode, lastNode).shortestPath(); Iterator<
              * AStarAlgorithm.Edge > iter = path.iterator(); while (iter.hasNext()) { PublicTransportAStar.PartialWayEdge edge =
              * (PublicTransportAStar.PartialWayEdge)iter.next(); System.out.print(edge.way.getUniqueId()); System.out.print("\t");
@@ -1207 +1103 @@
             Main.map.mapView.zoomTo(box);
         } else if ("routePattern.itineraryMark".equals(event.getActionCommand())) {
-            OsmPrimitive[] osmp = { null };
+            OsmPrimitive[] osmp = {null};
             Main.getLayerManager().getEditDataSet().setSelected(osmp);
             markedWays.clear();
@@ -1266 +1162 @@
             if ((insPos > 0) && (insPos < itineraryData.getRowCount())) {
                 while ((insPos < itineraryData.getRowCount())
-                        && (itineraryData.ways.elementAt(insPos) == null))
+                        && (itineraryData.ways.elementAt(insPos) == null)) {
                     ++insPos;
+                }
                 itineraryTable.removeRowSelectionInterval(0, itineraryData.getRowCount() - 1);
                 if (insPos < itineraryData.getRowCount())
@@ -1436 +1333 @@
             Main.map.mapView.zoomTo(box);
         } else if ("routePattern.stoplistMark".equals(event.getActionCommand())) {
-            OsmPrimitive[] osmp = { null };
+            OsmPrimitive[] osmp = {null};
             Main.getLayerManager().getEditDataSet().setSelected(osmp);
             markedNodes.clear();
@@ -1497 +1394 @@
             if ((insPos > 0) && (insPos < stoplistData.getRowCount())) {
                 while ((insPos < stoplistData.getRowCount())
-                        && (stoplistData.nodes.elementAt(insPos) == null))
+                        && (stoplistData.nodes.elementAt(insPos) == null)) {
                     ++insPos;
+                }
                 stoplistTable.removeRowSelectionInterval(0, stoplistData.getRowCount() - 1);
                 if (insPos < stoplistData.getRowCount())
@@ -1726 +1624 @@
 
             Iterator<RouteReference> iter = relRefs.iterator();
-            while (iter.hasNext())
+            while (iter.hasNext()) {
                 relsListModel.addElement(iter.next());
+            }
         } else {
             JOptionPane.showMessageDialog(null,

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -14 +15 @@
 public class SettingsStoptypeCommand extends Command {
     private static class HighwayRailway {
-        public HighwayRailway(Node node) {
+        HighwayRailway(Node node) {
             this.node = node;
             highway = node.get("highway");

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -199 +200 @@
 
             Iterator<TrackReference> iter = trackRefs.iterator();
-            while (iter.hasNext())
+            while (iter.hasNext()) {
                 tracksListModel.addElement(iter.next());
+            }
 
             waypointTM = new WaypointTableModel(this);
@@ -277 +279 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < table.getRowCount(); ++i)
+            for (int i = 0; i < table.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
         return consideredLines;
@@ -321 +325 @@
      */
     public static void markNodesFromTable(JTable table, Vector<Node> nodes) {
-        OsmPrimitive[] osmp = { null };
+        OsmPrimitive[] osmp = {null};
         DataSet ds = Main.getLayerManager().getEditDataSet();
         ds.setSelected(osmp);
@@ -415 +419 @@
         private String defaultShelter = null;
 
-        public FocusWaypointShelterAction(String defaultShelter) {
+        FocusWaypointShelterAction(String defaultShelter) {
             this.defaultShelter = defaultShelter;
         }
@@ -461 +465 @@
         private String defaultShelter = null;
 
-        public FocusTrackStoplistShelterAction(String defaultShelter) {
+        FocusTrackStoplistShelterAction(String defaultShelter) {
             this.defaultShelter = defaultShelter;
         }

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -68 +69 @@
         tracksList = new JList<>(tracksListModel);
         JScrollPane rpListSP = new JScrollPane(tracksList);
-        String[] data = { "1", "2", "3", "4", "5", "6" };
+        String[] data = {"1", "2", "3", "4", "5", "6"};
         tracksListModel.copyInto(data);
         tracksList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -537 +538 @@
         StopImporterAction root = null;
 
-        public TracksLSL(StopImporterAction sia) {
+        TracksLSL(StopImporterAction sia) {
             root = sia;
         }
@@ -549 +550 @@
                 root.tracksSelectionChanged(-1);
         }
-    };
+    }
 }

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -181 +182 @@
         }
     }
-};
+}

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -47 +48 @@
             }
         } else {
-            for (int i = 0; i < stoplistTM.getRowCount(); ++i)
+            for (int i = 0; i < stoplistTM.getRowCount(); ++i) {
                 workingLines.add(Integer.valueOf(i));
+            }
         }
     }
@@ -91 +93 @@
         return tr("Public Transport: Delete track stop");
     }
-};
+}

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -26 +27 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < stoplistTM.getRowCount(); ++i)
+            for (int i = 0; i < stoplistTM.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -36 +37 @@
         int[] selectedLines = controller.getDialog().getStoplistTable().getSelectedRows();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 workingLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < stoplistTM.getRowCount(); ++i)
+            for (int i = 0; i < stoplistTM.getRowCount(); ++i) {
                 workingLines.add(Integer.valueOf(i));
+            }
         }
     }
@@ -102 +105 @@
         public double startTime = 0;
 
-        public NodeSortEntry(Node node, String time, String name, TransText shelter,
+        NodeSortEntry(Node node, String time, String name, TransText shelter,
                 double startTime) {
             this.node = node;

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -93 +94 @@
 
     public void insertRow(int insPos, Node node, String time, String name, TransText shelter) {
-        Object[] buf = { time, name, shelter };
+        Object[] buf = {time, name, shelter};
         if (insPos == -1) {
             nodes.addElement(node);

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -73 +74 @@
         while (siter.hasNext()) {
             Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();
-            while (witer.hasNext())
+            while (witer.hasNext()) {
                 wayPoints.add(witer.next());
+            }
         }
         Vector<Double> wayPointsDist = new Vector<>(wayPoints.size());

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -62 +63 @@
         Node node = controller.createNode(wp.getCoor(), name);
 
-        Object[] buf = { time, name, new TransText(null) };
+        Object[] buf = {time, name, new TransText(null)};
         if (insPos == -1) {
             nodes.addElement(node);

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -26 +27 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < waypointTM.getRowCount(); ++i)
+            for (int i = 0; i < waypointTM.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -27 +28 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < waypointTM.getRowCount(); ++i)
+            for (int i = 0; i < waypointTM.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
 
@@ -79 +82 @@
         return tr("Public Transport: Disable waypoints");
     }
-};
+}

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;
 
@@ -27 +28 @@
         Vector<Integer> consideredLines = new Vector<>();
         if (selectedLines.length > 0) {
-            for (int i = 0; i < selectedLines.length; ++i)
+            for (int i = 0; i < selectedLines.length; ++i) {
                 consideredLines.add(selectedLines[i]);
+            }
         } else {
-            for (int i = 0; i < waypointTM.getRowCount(); ++i)
+            for (int i = 0; i < waypointTM.getRowCount(); ++i) {
                 consideredLines.add(Integer.valueOf(i));
+            }
         }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package public_transport;