X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fundo%2FUndoLoad.java;h=5c0818fc94a65eade07b5d0fd391f482ebbc4469;hb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;hp=d354b9dd8fb7a0e754d86fce62e12e30c1b4dc98;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git

diff --git a/tim/prune/undo/UndoLoad.java b/tim/prune/undo/UndoLoad.java
index d354b9d..5c0818f 100644
--- a/tim/prune/undo/UndoLoad.java
+++ b/tim/prune/undo/UndoLoad.java
@@ -2,6 +2,7 @@ package tim.prune.undo;
 
 import tim.prune.I18nManager;
 import tim.prune.data.DataPoint;
+import tim.prune.data.FileInfo;
 import tim.prune.data.PhotoList;
 import tim.prune.data.TrackInfo;
 
@@ -13,8 +14,8 @@ public class UndoLoad implements UndoOperation
 	private int _cropIndex = -1;
 	private int _numLoaded = -1;
 	private DataPoint[] _contents = null;
-	private String _previousFilename = null;
 	private PhotoList _photoList = null;
+	private FileInfo _oldFileInfo = null;
 
 
 	/**
@@ -27,13 +28,12 @@ public class UndoLoad implements UndoOperation
 		_cropIndex = inIndex;
 		_numLoaded = inNumLoaded;
 		_contents = null;
-		_previousFilename = null;
 	}
 
 
 	/**
 	 * Constructor for replacing
-	 * @param inOldTrack track being replaced
+	 * @param inOldTrackInfo track info being replaced
 	 * @param inNumLoaded number of points loaded
 	 * @param inPhotoList photo list, if any
 	 */
@@ -42,8 +42,7 @@ public class UndoLoad implements UndoOperation
 		_cropIndex = -1;
 		_numLoaded = inNumLoaded;
 		_contents = inOldTrackInfo.getTrack().cloneContents();
-		if (inOldTrackInfo.getFileInfo().getNumFiles() == 1)
-			_previousFilename = inOldTrackInfo.getFileInfo().getFilename();
+		_oldFileInfo = inOldTrackInfo.getFileInfo().clone();
 		_photoList = inPhotoList;
 	}
 
@@ -66,11 +65,12 @@ public class UndoLoad implements UndoOperation
 	 */
 	public void performUndo(TrackInfo inTrackInfo) throws UndoException
 	{
-		// remove file from fileinfo
-		inTrackInfo.getFileInfo().removeFile();
-		if (_previousFilename != null)
-		{
-			inTrackInfo.getFileInfo().setFile(_previousFilename);
+		// remove source from fileinfo
+		if (_oldFileInfo == null) {
+			inTrackInfo.getFileInfo().removeSource();
+		}
+		else {
+			inTrackInfo.setFileInfo(_oldFileInfo);
 		}
 		// Crop / replace
 		if (_contents == null)