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

Timestamp:

2013-08-21T11:09:21+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] project updates/cleanups + update public_transport to JOSM 6169

Location:

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

Files:

• RoutePatternAction.java (modified) (1 diff)
• StopImporterAction.java (modified) (2 diffs)
• StopImporterDialog.java (modified) (1 diff)
• TrackStoplistNameCommand.java (modified) (1 diff)

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

@@ -1702 +1702 @@
     {
       Vector< RelationMember > itemsToReflect = new Vector< RelationMember >();
-      Vector< Double > distancesToReflect = new Vector< Double >();
       int insPos = stoplistTable.getSelectedRow();
 

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -77 +76 @@
   public void actionPerformed(ActionEvent event)
   {
-    DataSet mainDataSet = Main.main.getCurrentDataSet();
-
     if (dialog == null)
       dialog = new StopImporterDialog(this);

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

@@ -676 +676 @@
   public static double parseTime(String s)
   {
-    double result = 0;
     if ((s.charAt(2) != ':') || (s.charAt(2) != ':')
      || (s.length() < 8))

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
-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;
+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;
 
-  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 = (LatLon)node.getCoor().clone();
-    }
-    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");
+                        try {
+                                oldLatLon = node.getCoor().clone();
+                        } catch (CloneNotSupportedException e) {
+                                e.printStackTrace();
+                        }
+                }
+                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");
+        }
 };