Version 9, February 2010

[GpsPrune.git] / tim / prune / undo / UndoLoad.java

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