Changeset 20834 in osm for applications/editors

Timestamp:

2010-04-08T07:52:12+02:00 (14 years ago)

Author:

roland

Message:

Public Transport Plugin: Making UndoRedo possible

Location:

applications/editors/josm

Files:

• dist/public_transport.jar (modified) ( previous)
• plugins/public_transport/src/public_transport/StopImporterAction.java (modified) (2 diffs)
• plugins/public_transport/src/public_transport/StopImporterDialog.java (modified) (2 diffs)
• plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java (added)

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

@@ -66 +66 @@
   private static TrackReference currentTrack = null;
   private static WaypointTableModel waypointTM = null;
+  public boolean inEvent = false;
   
   public StopImporterAction()
@@ -128 +129 @@
     else if ("stopImporter.settingsGPSTimeStart".equals(event.getActionCommand()))
     {
-      if ((dialog.gpsTimeStartValid()) && (currentTrack != null))
-      {
+      if ((!inEvent) && (dialog.gpsTimeStartValid()) && (currentTrack != null))
+        Main.main.undoRedo.add(new TrackStoplistRelocateCommand(this));
+/*      {
         currentTrack.gpsSyncTime = dialog.getGpsTimeStart();
         currentTrack.relocateNodes();
-      }
+      }*/
     }
     else if ("stopImporter.settingsStopwatchStart".equals(event.getActionCommand()))
     {
-      if ((dialog.stopwatchStartValid()) && (currentTrack != null))
-      {
+      if ((!inEvent) && (dialog.stopwatchStartValid()) && (currentTrack != null))
+        Main.main.undoRedo.add(new TrackStoplistRelocateCommand(this));
+/*      {
         currentTrack.stopwatchStart = dialog.getStopwatchStart();
         currentTrack.relocateNodes();
-      }
+      }*/
     }
     else if ("stopImporter.settingsTimeWindow".equals(event.getActionCommand()))

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

@@ -575 +575 @@
   }
   
+  public void setGpsTimeStart(String s)
+  {
+    tfGPSTimeStart.setText(s);
+  }
+  
   public boolean stopwatchStartValid()
   {
@@ -593 +598 @@
   {
     return tfStopwatchStart.getText();
+  }
+  
+  public void setStopwatchStart(String s)
+  {
+    tfStopwatchStart.setText(s);
   }