Index: applications/editors/josm/plugins/public_transport/src/public_transport/AbstractImporterDialog.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/AbstractImporterDialog.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/AbstractImporterDialog.java (revision 32902) @@ -139,5 +139,5 @@ public static double parseTime(String s) { - if ((s.charAt(2) != ':') || (s.charAt(2) != ':') || (s.length() < 8)) + if ((s.charAt(2) != ':') || (s.charAt(5) != ':') || (s.length() < 8)) return -1; int hour = Integer.parseInt(s.substring(0, 2)); Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java (revision 32902) @@ -34,5 +34,5 @@ } else { for (int i = 0; i < gtfsStopTM.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java (revision 32902) @@ -34,5 +34,5 @@ } else { for (int i = 0; i < gtfsStopTM.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java (revision 32902) @@ -7,6 +7,7 @@ import java.io.File; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.text.DecimalFormat; import java.text.Format; @@ -148,8 +149,5 @@ private void importData(final File file) { - try { - FileReader is = new FileReader(file); - final BufferedReader r = new BufferedReader(is); - + try (BufferedReader r = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { if (data == null) data = new Vector<>(); @@ -260,5 +258,5 @@ } else { for (int i = 0; i < table.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } return consideredLines; Index: applications/editors/josm/plugins/public_transport/src/public_transport/ItineraryTableModel.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/ItineraryTableModel.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/ItineraryTableModel.java (revision 32902) @@ -57,5 +57,5 @@ buf[0] = curName; else - buf[0] = tr("[ID] {0}", (new Long(way.getId())).toString()); + buf[0] = tr("[ID] {0}", (Long.valueOf(way.getId())).toString()); buf[1] = role; if (insPos == -1) { Index: applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportAStar.java (revision 32902) @@ -2,4 +2,5 @@ import java.util.Iterator; +import java.util.Objects; import java.util.TreeMap; import java.util.TreeSet; @@ -30,4 +31,9 @@ return false; return node.equals(((NodeVertex) o).node); + } + + @Override + public int hashCode() { + return Objects.hashCode(node); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (revision 32902) @@ -57,5 +57,5 @@ public static int STOPLIST_ROLE_COLUMN = 2; - private class RoutesLSL implements ListSelectionListener { + private static class RoutesLSL implements ListSelectionListener { RoutePatternAction root = null; @@ -70,5 +70,5 @@ } - private class RouteReference implements Comparable { + private static class RouteReference implements Comparable { Relation route; @@ -141,5 +141,5 @@ } - private class TagTableModel extends DefaultTableModel implements TableModelListener { + private static class TagTableModel extends DefaultTableModel implements TableModelListener { Relation relation = null; @@ -216,5 +216,5 @@ } - private class CustomCellEditorTable extends JTable { + private static class CustomCellEditorTable extends JTable { TreeMap col1 = null; @@ -230,7 +230,7 @@ TableCellEditor editor = null; if (column == 0) - editor = col1.get(new Integer(row)); + editor = col1.get(Integer.valueOf(row)); else - editor = col2.get(new Integer(row)); + editor = col2.get(Integer.valueOf(row)); if (editor == null) return new DefaultCellEditor(new JTextField()); @@ -241,11 +241,11 @@ public void setCellEditor(int row, int column, TableCellEditor editor) { if (column == 0) - col1.put(new Integer(row), editor); + col1.put(Integer.valueOf(row), editor); else - col2.put(new Integer(row), editor); + col2.put(Integer.valueOf(row), editor); } } - private class StoplistTableModel extends DefaultTableModel { + private static class StoplistTableModel extends DefaultTableModel { public Vector nodes = new Vector<>(); @@ -278,5 +278,5 @@ buf[0] = curName; } else { - buf[0] = tr("[ID] {0}", (new Long(node.getId())).toString()); + buf[0] = tr("[ID] {0}", (Long.valueOf(node.getId())).toString()); } String curRef = node.get("ref"); @@ -311,5 +311,5 @@ } - private class SegmentMetric { + private static class SegmentMetric { public double aLat, aLon; @@ -347,5 +347,5 @@ } - private class StopReference implements Comparable { + private static class StopReference implements Comparable { public int index = 0; Index: applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java (revision 32902) @@ -13,5 +13,5 @@ public class SettingsStoptypeCommand extends Command { - private class HighwayRailway { + private static class HighwayRailway { public HighwayRailway(Node node) { this.node = node; Index: applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java (revision 32902) @@ -281,5 +281,5 @@ } else { for (int i = 0; i < table.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } return consideredLines; @@ -392,5 +392,5 @@ } - private class FocusWaypointNameAction extends AbstractAction { + private static class FocusWaypointNameAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { @@ -412,5 +412,5 @@ } - private class FocusWaypointShelterAction extends AbstractAction { + private static class FocusWaypointShelterAction extends AbstractAction { private String defaultShelter = null; @@ -438,5 +438,5 @@ } - private class FocusTrackStoplistNameAction extends AbstractAction { + private static class FocusTrackStoplistNameAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { @@ -458,5 +458,5 @@ } - private class FocusTrackStoplistShelterAction extends AbstractAction { + private static class FocusTrackStoplistShelterAction extends AbstractAction { private String defaultShelter = null; Index: applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java (revision 32902) @@ -12,5 +12,5 @@ public class TrackStoplistDeleteCommand extends Command { - private class NodeTimeName { + private static class NodeTimeName { NodeTimeName(Node node, String time, String name, TransText shelter) { this.node = node; @@ -48,5 +48,5 @@ } else { for (int i = 0; i < stoplistTM.getRowCount(); ++i) - workingLines.add(new Integer(i)); + workingLines.add(Integer.valueOf(i)); } } Index: applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java (revision 32902) @@ -30,5 +30,5 @@ } else { for (int i = 0; i < stoplistTM.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java (revision 32902) @@ -40,5 +40,5 @@ } else { for (int i = 0; i < stoplistTM.getRowCount(); ++i) - workingLines.add(new Integer(i)); + workingLines.add(Integer.valueOf(i)); } } @@ -91,5 +91,5 @@ } - private class NodeSortEntry implements Comparable { + private static class NodeSortEntry implements Comparable { public Node node = null; Index: applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java (revision 32902) @@ -30,5 +30,5 @@ } else { for (int i = 0; i < waypointTM.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java (revision 32902) @@ -31,5 +31,5 @@ } else { for (int i = 0; i < waypointTM.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); } Index: applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java =================================================================== --- applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java (revision 32901) +++ applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java (revision 32902) @@ -31,5 +31,5 @@ } else { for (int i = 0; i < waypointTM.getRowCount(); ++i) - consideredLines.add(new Integer(i)); + consideredLines.add(Integer.valueOf(i)); }