Index: /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java	(revision 20748)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java	(revision 20748)
@@ -0,0 +1,88 @@
+package public_transport;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+import java.util.Collection;
+import java.util.Vector;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+
+public class WaypointsDisableCommand extends Command
+{
+  private Vector< Integer > workingLines = null;
+  private Vector< Node > nodesForUndo = null;
+  private StopImporterAction.WaypointTableModel waypointTM = null;
+  private String type = null;
+  
+  public WaypointsDisableCommand(StopImporterAction controller)
+  {
+    waypointTM = controller.getWaypointTableModel();
+    type = controller.getDialog().getStoptype();
+    workingLines = new Vector< Integer >();
+    nodesForUndo = new Vector< Node >();
+    
+    // use either selected lines or all lines if no line is selected
+    int[] selectedLines = controller.getDialog().getWaypointsTable().getSelectedRows();
+    Vector< Integer > consideredLines = new Vector< Integer >();
+    if (selectedLines.length > 0)
+    {
+      for (int i = 0; i < selectedLines.length; ++i)
+	consideredLines.add(selectedLines[i]);
+    }
+    else
+    {
+      for (int i = 0; i < waypointTM.getRowCount(); ++i)
+	consideredLines.add(new Integer(i));
+    }
+    
+    // keep only lines where a node can be added
+    for (int i = 0; i < consideredLines.size(); ++i)
+    {
+      if (waypointTM.nodes.elementAt(consideredLines.elementAt(i)) != null)
+	workingLines.add(consideredLines.elementAt(i));
+    }
+  }
+  
+  public boolean executeCommand()
+  {
+    nodesForUndo.clear();
+    for (int i = 0; i < workingLines.size(); ++i)
+    {
+      int j = workingLines.elementAt(i).intValue();
+      Node node = waypointTM.nodes.elementAt(j);
+      nodesForUndo.add(node);
+      if (node == null)
+	continue;
+      waypointTM.nodes.set(j, null);
+      Main.main.getCurrentDataSet().removePrimitive(node);
+      node.setDeleted(true);
+    }
+    return true;
+  }
+  
+  public void undoCommand()
+  {
+    for (int i = 0; i < workingLines.size(); ++i)
+    {
+      int j = workingLines.elementAt(i).intValue();
+      Node node = nodesForUndo.elementAt(i);
+      node.setDeleted(false);
+      Main.main.getCurrentDataSet().addPrimitive(node);
+      waypointTM.nodes.set(j, node);
+    }
+  }
+  
+  public void fillModifiedData
+    (Collection< OsmPrimitive > modified, Collection< OsmPrimitive > deleted,
+     Collection< OsmPrimitive > added)
+  {
+  }
+  
+  public MutableTreeNode description()
+  {
+    return new DefaultMutableTreeNode("public_transport.Waypoints.Disable");
+  }
+};
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java	(revision 20748)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java	(revision 20748)
@@ -0,0 +1,81 @@
+package public_transport;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+import java.util.Collection;
+import java.util.Vector;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
+
+public class WaypointsEnableCommand extends Command
+{
+  private Vector< Integer > workingLines = null;
+  private StopImporterAction.WaypointTableModel waypointTM = null;
+  private String type = null;
+  
+  public WaypointsEnableCommand(StopImporterAction controller)
+  {
+    waypointTM = controller.getWaypointTableModel();
+    type = controller.getDialog().getStoptype();
+    workingLines = new Vector< Integer >();
+    
+    // use either selected lines or all lines if no line is selected
+    int[] selectedLines = controller.getDialog().getWaypointsTable().getSelectedRows();
+    Vector< Integer > consideredLines = new Vector< Integer >();
+    if (selectedLines.length > 0)
+    {
+      for (int i = 0; i < selectedLines.length; ++i)
+	consideredLines.add(selectedLines[i]);
+    }
+    else
+    {
+      for (int i = 0; i < waypointTM.getRowCount(); ++i)
+	consideredLines.add(new Integer(i));
+    }
+    
+    // keep only lines where a node can be added
+    for (int i = 0; i < consideredLines.size(); ++i)
+    {
+      if (waypointTM.nodes.elementAt(consideredLines.elementAt(i)) == null)
+	workingLines.add(consideredLines.elementAt(i));
+    }
+  }
+  
+  public boolean executeCommand()
+  {
+    for (int i = 0; i < workingLines.size(); ++i)
+    {
+      int j = workingLines.elementAt(i).intValue();
+      Node node = StopImporterAction.createNode
+        (waypointTM.coors.elementAt(j), type, (String)waypointTM.getValueAt(j, 1));
+      waypointTM.nodes.set(j, node);
+    }
+    return true;
+  }
+  
+  public void undoCommand()
+  {
+    for (int i = 0; i < workingLines.size(); ++i)
+    {
+      int j = workingLines.elementAt(i).intValue();
+      Node node = waypointTM.nodes.elementAt(j);
+      waypointTM.nodes.set(j, null);
+      Main.main.getCurrentDataSet().removePrimitive(node);
+      node.setDeleted(true);
+    }
+  }
+  
+  public void fillModifiedData
+    (Collection< OsmPrimitive > modified, Collection< OsmPrimitive > deleted,
+     Collection< OsmPrimitive > added)
+  {
+  }
+  
+  public MutableTreeNode description()
+  {
+    return new DefaultMutableTreeNode("public_transport.Waypoints.Enable");
+  }
+};