Changeset 30358 in osm

Timestamp:

2014-03-24T22:26:05+01:00 (11 years ago)

Author:

donvip

Message:

[josm_public_transport] code cleanup

Location:

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

Files:

• AStarAlgorithm.java (modified) (1 diff)
• StopImporterAction.java (modified) (1 diff)
• TrackStoplistNameCommand.java (modified) (1 diff)

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

@@ -93 +93 @@
                 if (knownDistance == null || distance < knownDistance.doubleValue())
                 {
-                    openList.put(edge.getEnd(), distance);
+            openList.put(edge.getEnd(), distance);
                     pathTail.put(edge.getEnd(), edge);
                 }

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

@@ -171 +171 @@
         is = new FileInputStream(file);
       // Workaround for SAX BOM bug
-      // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835
+      // https://bugs.openjdk.java.net/browse/JDK-6206835
       if (!((is.read() == 0xef) && (is.read() == 0xbb) && (is.read() == 0xbf)))
       {

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

@@ -11 +11 @@
 
 public class TrackStoplistNameCommand extends Command {
-        private int workingLine = 0;
-        private TrackReference trackref = null;
-        private String oldName = null;
-        private String name = null;
-        private String oldTime = null;
-        private String time = null;
-        private String oldShelter = null;
-        private TransText shelter = null;
-        private LatLon oldLatLon = null;
+    private int workingLine = 0;
+    private TrackReference trackref = null;
+    private String oldName = null;
+    private String name = null;
+    private String oldTime = null;
+    private String time = null;
+    private String oldShelter = null;
+    private TransText shelter = null;
+    private LatLon oldLatLon = null;
 
-        public TrackStoplistNameCommand(TrackReference trackref, int workingLine) {
-                this.trackref = trackref;
-                this.workingLine = workingLine;
-                Node node = trackref.stoplistTM.nodeAt(workingLine);
-                if (node != null) {
-                        oldName = node.get("name");
-                        oldTime = trackref.stoplistTM.timeAt(workingLine);
-                        oldShelter = node.get("shelter");
-                        oldLatLon = node.getCoor();
-                }
-                this.time = (String) trackref.stoplistTM.getValueAt(workingLine, 0);
-                this.name = (String) trackref.stoplistTM.getValueAt(workingLine, 1);
-                this.shelter = (TransText) trackref.stoplistTM.getValueAt(workingLine, 2);
-                if ("".equals(this.shelter.text))
-                        this.shelter = null;
-        }
+    public TrackStoplistNameCommand(TrackReference trackref, int workingLine) {
+        this.trackref = trackref;
+        this.workingLine = workingLine;
+        Node node = trackref.stoplistTM.nodeAt(workingLine);
+        if (node != null) {
+            oldName = node.get("name");
+            oldTime = trackref.stoplistTM.timeAt(workingLine);
+            oldShelter = node.get("shelter");
+            oldLatLon = node.getCoor();
+        }
+        this.time = (String) trackref.stoplistTM.getValueAt(workingLine, 0);
+        this.name = (String) trackref.stoplistTM.getValueAt(workingLine, 1);
+        this.shelter = (TransText) trackref.stoplistTM.getValueAt(workingLine, 2);
+        if ("".equals(this.shelter.text))
+            this.shelter = null;
+    }
 
-        public boolean executeCommand() {
-                Node node = trackref.stoplistTM.nodeAt(workingLine);
-                if (node != null) {
-                        node.put("name", name);
-                        node.put("shelter", shelter.text);
-                        double dTime = StopImporterDialog.parseTime(time);
-                        node.setCoor(trackref.computeCoor(dTime));
-                }
-                trackref.inEvent = true;
-                if (time == null)
-                        trackref.stoplistTM.setValueAt("", workingLine, 0);
-                else
-                        trackref.stoplistTM.setValueAt(time, workingLine, 0);
-                if (name == null)
-                        trackref.stoplistTM.setValueAt("", workingLine, 1);
-                else
-                        trackref.stoplistTM.setValueAt(name, workingLine, 1);
-                trackref.stoplistTM.setValueAt(shelter, workingLine, 2);
-                trackref.inEvent = false;
-                return true;
-        }
+    public boolean executeCommand() {
+        Node node = trackref.stoplistTM.nodeAt(workingLine);
+        if (node != null) {
+            node.put("name", name);
+            node.put("shelter", shelter.text);
+            double dTime = StopImporterDialog.parseTime(time);
+            node.setCoor(trackref.computeCoor(dTime));
+        }
+        trackref.inEvent = true;
+        if (time == null)
+            trackref.stoplistTM.setValueAt("", workingLine, 0);
+        else
+            trackref.stoplistTM.setValueAt(time, workingLine, 0);
+        if (name == null)
+            trackref.stoplistTM.setValueAt("", workingLine, 1);
+        else
+            trackref.stoplistTM.setValueAt(name, workingLine, 1);
+        trackref.stoplistTM.setValueAt(shelter, workingLine, 2);
+        trackref.inEvent = false;
+        return true;
+    }
 
-        public void undoCommand() {
-                Node node = trackref.stoplistTM.nodeAt(workingLine);
-                if (node != null) {
-                        node.put("name", oldName);
-                        node.put("shelter", oldShelter);
-                        node.setCoor(oldLatLon);
-                }
-                trackref.inEvent = true;
-                if (oldTime == null)
-                        trackref.stoplistTM.setValueAt("", workingLine, 0);
-                else
-                        trackref.stoplistTM.setValueAt(oldTime, workingLine, 0);
-                if (oldName == null)
-                        trackref.stoplistTM.setValueAt("", workingLine, 1);
-                else
-                        trackref.stoplistTM.setValueAt(oldName, workingLine, 1);
-                trackref.stoplistTM.setValueAt(new TransText(oldShelter), workingLine, 2);
-                trackref.inEvent = false;
-        }
+    public void undoCommand() {
+        Node node = trackref.stoplistTM.nodeAt(workingLine);
+        if (node != null) {
+            node.put("name", oldName);
+            node.put("shelter", oldShelter);
+            node.setCoor(oldLatLon);
+        }
+        trackref.inEvent = true;
+        if (oldTime == null)
+            trackref.stoplistTM.setValueAt("", workingLine, 0);
+        else
+            trackref.stoplistTM.setValueAt(oldTime, workingLine, 0);
+        if (oldName == null)
+            trackref.stoplistTM.setValueAt("", workingLine, 1);
+        else
+            trackref.stoplistTM.setValueAt(oldName, workingLine, 1);
+        trackref.stoplistTM.setValueAt(new TransText(oldShelter), workingLine, 2);
+        trackref.inEvent = false;
+    }
 
-        public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
-                        Collection<OsmPrimitive> added) {
-        }
+    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
+            Collection<OsmPrimitive> added) {
+    }
 
-        @Override
-        public String getDescriptionText() {
-                return tr("Public Transport: Edit track stop list");
-        }
+    @Override
+    public String getDescriptionText() {
+        return tr("Public Transport: Edit track stop list");
+    }
 };