X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fundo%2FUndoDeleteRange.java;h=ba2b31ab5ef89540b8496be4e8908f0a9855ae7e;hp=e2a76995ebb478ec868c9e4a8c68b8a9d4fcfed8;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hpb=f1b92378a792131ac8fb33a869405851d5b2d1f7

diff --git a/tim/prune/undo/UndoDeleteRange.java b/tim/prune/undo/UndoDeleteRange.java
index e2a7699..ba2b31a 100644
--- a/tim/prune/undo/UndoDeleteRange.java
+++ b/tim/prune/undo/UndoDeleteRange.java
@@ -1,6 +1,7 @@
 package tim.prune.undo;
 
 import tim.prune.I18nManager;
+import tim.prune.data.AudioList;
 import tim.prune.data.DataPoint;
 import tim.prune.data.PhotoList;
 import tim.prune.data.TrackInfo;
@@ -10,37 +11,116 @@ import tim.prune.data.TrackInfo;
  */
 public class UndoDeleteRange implements UndoOperation
 {
-	private int _startIndex = -1;
-	private DataPoint[] _points = null;
+	/**
+	 * Inner class to hold a single range information set
+	 */
+	class RangeInfo
+	{
+		public int _startIndex = -1;
+		public DataPoint[] _points = null;
+		public DataPoint _nextTrackPoint = null;
+		public boolean _segmentStart = false;
+
+		/**
+		 * @param inPoint next track point after deleted section, or null
+		 */
+		public void setNextTrackPoint(DataPoint inPoint)
+		{
+			_nextTrackPoint = inPoint;
+			if (inPoint != null) {
+				_segmentStart = inPoint.getSegmentStart();
+			}
+
+		}
+
+		/**
+		 * @return true if the range is valid
+		 */
+		public boolean isValid()
+		{
+			return _startIndex >= 0 && _points != null && _points.length > 0;
+		}
+	}
+
+
+	// Instance variables for UndoDeleteRange
+	private RangeInfo _rangeInfo1 = null;
+	private RangeInfo _rangeInfo2 = null;
 	private PhotoList _photoList = null;
-	private DataPoint _nextTrackPoint = null;
-	private boolean _segmentStart = false;
+	private AudioList _audioList = null;
+	private String _nameKey = null;
+	private int _totalDeleted = 0;
 
 
 	/**
 	 * Constructor
 	 * @param inTrackInfo track info object
+	 * @param inNameKey key to use for undo text
+	 * @param inStartIndex1 start index of first deleted segment
+	 * @param inDeleteMedias1 flags to delete media for range1
+	 * @param inStartIndex2 start index of second segment
+	 * @param inDeleteMedias2 flags to delete media for range2
 	 */
-	public UndoDeleteRange(TrackInfo inTrackInfo)
+	public UndoDeleteRange(TrackInfo inTrackInfo, String inNameKey,
+		int inStartIndex1, boolean[] inDeleteMedias1,
+		int inStartIndex2, boolean[] inDeleteMedias2)
 	{
-		_startIndex = inTrackInfo.getSelection().getStart();
-		_points = inTrackInfo.cloneSelectedRange();
-		_photoList = inTrackInfo.getPhotoList().cloneList();
-		// Save segment flag of following track point
-		_nextTrackPoint = inTrackInfo.getTrack().getNextTrackPoint(_startIndex + _points.length);
-		if (_nextTrackPoint != null) {
-			_segmentStart = _nextTrackPoint.getSegmentStart();
+		_nameKey = inNameKey;
+		boolean mediaDeleted = false;
+		_totalDeleted = 0;
+		// Check if there's a valid first range
+		if (inStartIndex1 >= 0 && inDeleteMedias1 != null)
+		{
+			final int numPoints = inDeleteMedias1.length;
+			if (numPoints > 0)
+			{
+				_totalDeleted += numPoints;
+				_rangeInfo1 = new RangeInfo();
+				_rangeInfo1._startIndex = inStartIndex1;
+
+				for (int i=0; i<numPoints && !mediaDeleted; i++) {
+					if (inDeleteMedias1[i]) mediaDeleted = true;
+				}
+				// Clone points
+				_rangeInfo1._points = inTrackInfo.getTrack().cloneRange(inStartIndex1, inStartIndex1 + numPoints - 1);
+				// Save segment flag of following track point
+				_rangeInfo1.setNextTrackPoint(inTrackInfo.getTrack().getNextTrackPoint(inStartIndex1 + numPoints));
+			}
+		}
+		// And the same for the second range, if any
+		if (inStartIndex2 >= 0 && inDeleteMedias2 != null)
+		{
+			final int numPoints = inDeleteMedias2.length;
+			if (numPoints > 0)
+			{
+				_totalDeleted += numPoints;
+				_rangeInfo2 = new RangeInfo();
+				_rangeInfo2._startIndex = inStartIndex2;
+				for (int i=0; i<numPoints && !mediaDeleted; i++) {
+					if (inDeleteMedias2[i]) mediaDeleted = true;
+				}
+
+				// Clone points
+				_rangeInfo2._points = inTrackInfo.getTrack().cloneRange(inStartIndex2, inStartIndex2 + numPoints - 1);
+				// Save segment flag of following track point
+				_rangeInfo2.setNextTrackPoint(inTrackInfo.getTrack().getNextTrackPoint(inStartIndex2 + numPoints));
+			}
+		}
+		// If any media have been deleted, then the lists must be copied
+		if (mediaDeleted)
+		{
+			_photoList = inTrackInfo.getPhotoList().cloneList();
+			_audioList = inTrackInfo.getAudioList().cloneList();
 		}
 	}
 
 
 	/**
-	 * @return description of operation including range length
+	 * @return description of operation including number of points deleted
 	 */
 	public String getDescription()
 	{
-		return I18nManager.getText("undo.deleterange")
-			+ " (" + _points.length + ")";
+		return I18nManager.getText(_nameKey) + " (" + _totalDeleted + ")";
 	}
 
 
@@ -50,22 +130,48 @@ public class UndoDeleteRange implements UndoOperation
 	 */
 	public void performUndo(TrackInfo inTrackInfo)
 	{
-		// restore photos to how they were before
-		inTrackInfo.getPhotoList().restore(_photoList);
-		// reconnect photos to points
-		for (int i=0; i<_points.length; i++)
+		// restore photos and audios to how they were before
+		if (_photoList != null) {
+			inTrackInfo.getPhotoList().restore(_photoList);
+		}
+		if (_audioList != null) {
+			inTrackInfo.getAudioList().restore(_audioList);
+		}
+
+		// Undo both the ranges
+		performUndo(inTrackInfo, _rangeInfo1);
+		performUndo(inTrackInfo, _rangeInfo2);
+	}
+
+	/**
+	 * Perform the undo on a single deleted range
+	 * @param inTrackInfo track info object
+	 * @param inRangeInfo info object describing deleted range
+	 */
+	private void performUndo(TrackInfo inTrackInfo, RangeInfo inRangeInfo)
+	{
+		if (inRangeInfo == null || !inRangeInfo.isValid()) return;
+
+		// reconnect photos and audios to points
+		final int numPoints = inRangeInfo._points.length;
+		for (int i=0; i<numPoints; i++)
 		{
-			DataPoint point = _points[i];
-			if (point != null && point.getPhoto() != null)
+			DataPoint point = inRangeInfo._points[i];
+			if (point != null && point.hasMedia())
 			{
-				point.getPhoto().setDataPoint(point);
+				if (point.getPhoto() != null) {
+					point.getPhoto().setDataPoint(point);
+				}
+				if (point.getAudio() != null) {
+					point.getAudio().setDataPoint(point);
+				}
 			}
 		}
 		// restore point array into track
-		inTrackInfo.getTrack().insertRange(_points, _startIndex);
+		inTrackInfo.getTrack().insertRange(inRangeInfo._points, inRangeInfo._startIndex);
 		// Restore segment flag of following track point
-		if (_nextTrackPoint != null) {
-			_nextTrackPoint.setSegmentStart(_segmentStart);
+		if (inRangeInfo._nextTrackPoint != null) {
+			inRangeInfo._nextTrackPoint.setSegmentStart(inRangeInfo._segmentStart);
 		}
 	}
-}
\ No newline at end of file
+}