Changeset 20791 in osm for applications/editors/josm

Timestamp:

2010-04-06T10:55:39+02:00 (15 years ago)

Author:

roland

Message:

Public Transport Plugin: Making UndoRedo possible

Location:

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

Files:

• StopImporterAction.java (modified) (1 diff)
• WaypointTableModel.java (modified) (4 diffs)
• WaypointsNameCommand.java (added)

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

@@ -304 +304 @@
   {
     Node node = new Node(latLon);
-    if ("bus".equals(type))
-      node.put("highway", "bus_stop");
-    else if ("tram".equals(type))
-      node.put("railway", "tram_stop");
-    else if ("light_rail".equals(type))
-      node.put("railway", "station");
-    else if ("subway".equals(type))
-      node.put("railway", "station");
-    else if ("rail".equals(type))
-      node.put("railway", "station");
+    setTagsWrtType(node, type);
     node.put("name", name);
     if (Main.main.getCurrentDataSet() == null)

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

@@ -9 +9 @@
 import javax.swing.table.DefaultTableModel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -17 +18 @@
 {
   private StopImporterAction controller = null;
+  public boolean inEvent = false;
   public Vector< Node > nodes = new Vector< Node >();
   public Vector< LatLon > coors = new Vector< LatLon >();
@@ -86 +88 @@
     if (e.getType() == TableModelEvent.UPDATE)
     {
+      if (inEvent)
+        return;
+      Main.main.undoRedo.add(new WaypointsNameCommand
+          (this, e.getFirstRow(), (String)getValueAt(e.getFirstRow(), 1)));
+    }
+/*    {
       if (nodes.elementAt(e.getFirstRow()) != null)
       {
@@ -91 +99 @@
         node.put("name", (String)getValueAt(e.getFirstRow(), 1));
       }
-    }
+    }*/
   }
 };