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 8bf22183c5162c787fa8c7350f602a1da2c5f4df..5c0818fc94a65eade07b5d0fd391f482ebbc4469 100644 (file)
--- a/tim/prune/undo/UndoLoad.java
+++ b/tim/prune/undo/UndoLoad.java
@@ -2,6 +2,8 @@ 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
 /**\r
@@ -12,7 +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
@@ -25,22 +28,22 @@ public class UndoLoad implements UndoOperation
                _cropIndex = inIndex;\r
                _numLoaded = inNumLoaded;\r
                _contents = null;\r
-               _previousFilename = null;\r
        }\r
 \r
 \r
        /**\r
         * Constructor for replacing\r
-        * @param inOldTrack track being replaced\r
+        * @param inOldTrackInfo track info being replaced\r
         * @param inNumLoaded number of points loaded\r
+        * @param inPhotoList photo list, if any\r
         */\r
-       public UndoLoad(TrackInfo inOldTrackInfo, int inNumLoaded)\r
+       public UndoLoad(TrackInfo inOldTrackInfo, int inNumLoaded, PhotoList inPhotoList)\r
        {\r
                _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
 \r
@@ -62,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
@@ -76,6 +80,11 @@ public class UndoLoad implements UndoOperation
                }\r
                else\r
                {\r
+                       // replace photos how they were\r
+                       if (_photoList != null)\r
+                       {\r
+                               inTrackInfo.getPhotoList().restore(_photoList);\r
+                       }\r
                        // replace track contents with old\r
                        if (!inTrackInfo.getTrack().replaceContents(_contents))\r
                        {\r