Version 3, August 2007

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

diff --git a/tim/prune/undo/UndoLoad.java b/tim/prune/undo/UndoLoad.java
index 8bf22183c5162c787fa8c7350f602a1da2c5f4df..d354b9dd8fb7a0e754d86fce62e12e30c1b4dc98 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.PhotoList;\r
 import tim.prune.data.TrackInfo;\r
 \r
 /**\r
@@ -13,6 +14,7 @@ public class UndoLoad implements UndoOperation
        private int _numLoaded = -1;\r
        private DataPoint[] _contents = null;\r
        private String _previousFilename = null;\r
+       private PhotoList _photoList = null;\r
 \r
 \r
        /**\r
@@ -33,14 +35,16 @@ public class UndoLoad implements UndoOperation
         * Constructor for replacing\r
         * @param inOldTrack track 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
+               _photoList = inPhotoList;\r
        }\r
 \r
 \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