X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fundo%2FUndoDeletePoint.java;h=beddfbf32588eec6a16a0657c6935f5878740ce4;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=57abc98814ebef54551fc529f3c49be934d2eca1;hpb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;p=GpsPrune.git

diff --git a/tim/prune/undo/UndoDeletePoint.java b/tim/prune/undo/UndoDeletePoint.java
index 57abc98..beddfbf 100644
--- a/tim/prune/undo/UndoDeletePoint.java
+++ b/tim/prune/undo/UndoDeletePoint.java
@@ -7,11 +7,12 @@ import tim.prune.data.TrackInfo;
 /**
  * Operation to undo a delete of a single point
  */
-public class UndoDeletePoint implements UndoOperation
+public class UndoDeletePoint extends UndoDeleteOperation
 {
 	private int _pointIndex = -1;
 	private DataPoint _point = null;
 	private int _photoIndex = -1;
+	private int _audioIndex = -1;
 	private boolean _segmentStart = false;
 
 
@@ -20,13 +21,16 @@ public class UndoDeletePoint implements UndoOperation
 	 * @param inPointIndex index number of point within track
 	 * @param inPoint data point
 	 * @param inPhotoIndex index number of photo within photo list
+	 * @param inAudioIndex index number of audio within audio list
 	 * @param inSegmentStart true if following track point starts new segment
 	 */
-	public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex, boolean inSegmentStart)
+	public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex, int inAudioIndex,
+		boolean inSegmentStart)
 	{
 		_pointIndex = inPointIndex;
 		_point = inPoint;
 		_photoIndex = inPhotoIndex;
+		_audioIndex = inAudioIndex;
 		_segmentStart = inSegmentStart;
 	}
 
@@ -65,7 +69,16 @@ public class UndoDeletePoint implements UndoOperation
 				inTrackInfo.getPhotoList().addPhoto(_point.getPhoto(), _photoIndex);
 			}
 			// Ensure that photo is associated with point
-			_point.getPhoto().setDataPoint(_point);
+			if (_point.getPhoto().getDataPoint() != _point) {
+				_point.getPhoto().setDataPoint(_point);
+			}
+		}
+		// Re-add audio as well if necessary
+		if (_point.getAudio() != null && _audioIndex > -1)
+		{
+			// add audio object to list
+			inTrackInfo.getAudioList().addAudio(_point.getAudio(), _audioIndex);
+			_point.getAudio().setDataPoint(_point);
 		}
 		// Restore previous status of following track point if necessary
 		if (!_segmentStart)
@@ -76,5 +89,7 @@ public class UndoDeletePoint implements UndoOperation
 				nextTrackPoint.setSegmentStart(false);
 			}
 		}
+		// If there's a current point or range selected, maybe need to adjust start and/or end
+		modifySelection(inTrackInfo, _pointIndex, _pointIndex);
 	}
 }