Version 14, October 2012

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

diff --git a/tim/prune/undo/UndoDeletePoint.java b/tim/prune/undo/UndoDeletePoint.java
index ebc4d89c9fcdf236448ea78caac40540f1b652c0..9919d0d3a7dd9cac197bc2059a15a38c996bb88e 100644 (file)
--- a/tim/prune/undo/UndoDeletePoint.java
+++ b/tim/prune/undo/UndoDeletePoint.java
@@ -2,7 +2,6 @@ package tim.prune.undo;
 \r
 import tim.prune.I18nManager;\r
 import tim.prune.data.DataPoint;\r
-import tim.prune.data.Field;\r
 import tim.prune.data.TrackInfo;\r
 \r
 /**\r
@@ -12,17 +11,27 @@ public class UndoDeletePoint implements UndoOperation
 {\r
        private int _pointIndex = -1;\r
        private DataPoint _point = null;\r
+       private int _photoIndex = -1;\r
+       private int _audioIndex = -1;\r
+       private boolean _segmentStart = false;\r
 \r
 \r
        /**\r
         * Constructor\r
-        * @param inIndex index number of point within track\r
+        * @param inPointIndex index number of point within track\r
         * @param inPoint data point\r
+        * @param inPhotoIndex index number of photo within photo list\r
+        * @param inAudioIndex index number of audio within audio list\r
+        * @param inSegmentStart true if following track point starts new segment\r
         */\r
-       public UndoDeletePoint(int inIndex, DataPoint inPoint)\r
+       public UndoDeletePoint(int inPointIndex, DataPoint inPoint, int inPhotoIndex, int inAudioIndex,\r
+               boolean inSegmentStart)\r
        {\r
-               _pointIndex = inIndex;\r
+               _pointIndex = inPointIndex;\r
                _point = inPoint;\r
+               _photoIndex = inPhotoIndex;\r
+               _audioIndex = inAudioIndex;\r
+               _segmentStart = inSegmentStart;\r
        }\r
 \r
 \r
@@ -32,7 +41,7 @@ public class UndoDeletePoint implements UndoOperation
        public String getDescription()\r
        {\r
                String desc = I18nManager.getText("undo.deletepoint");\r
-               String pointName = _point.getFieldValue(Field.WAYPT_NAME);\r
+               String pointName = _point.getWaypointName();\r
                if (pointName != null && !pointName.equals(""))\r
                        desc = desc + " " + pointName;\r
                return desc;\r
@@ -41,7 +50,7 @@ public class UndoDeletePoint implements UndoOperation
 \r
        /**\r
         * Perform the undo operation on the given Track\r
-        * @param inTrack Track object on which to perform the operation\r
+        * @param inTrackInfo TrackInfo object on which to perform the operation\r
         */\r
        public void performUndo(TrackInfo inTrackInfo) throws UndoException\r
        {\r
@@ -50,5 +59,35 @@ public class UndoDeletePoint implements UndoOperation
                {\r
                        throw new UndoException(getDescription());\r
                }\r
+               // Re-attach / Re-insert photo into list if necessary\r
+               if (_point.getPhoto() != null && _photoIndex > -1)\r
+               {\r
+                       // Check if photo is still in list\r
+                       if (!inTrackInfo.getPhotoList().contains(_point.getPhoto()))\r
+                       {\r
+                               // photo has been removed - need to reinsert\r
+                               inTrackInfo.getPhotoList().addPhoto(_point.getPhoto(), _photoIndex);\r
+                       }\r
+                       // Ensure that photo is associated with point\r
+                       if (_point.getPhoto().getDataPoint() != _point) {\r
+                               _point.getPhoto().setDataPoint(_point);\r
+                       }\r
+               }\r
+               // Re-add audio as well if necessary\r
+               if (_point.getAudio() != null && _audioIndex > -1)\r
+               {\r
+                       // add audio object to list\r
+                       inTrackInfo.getAudioList().addAudio(_point.getAudio(), _audioIndex);\r
+                       _point.getAudio().setDataPoint(_point);\r
+               }\r
+               // Restore previous status of following track point if necessary\r
+               if (!_segmentStart)\r
+               {\r
+                       // Deletion of point can only set following point to true, so only need to set it back to false\r
+                       DataPoint nextTrackPoint = inTrackInfo.getTrack().getNextTrackPoint(_pointIndex + 1);\r
+                       if (nextTrackPoint != null) {\r
+                               nextTrackPoint.setSegmentStart(false);\r
+                       }\r
+               }\r
        }\r
-}
\ No newline at end of file
+}\r