X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2FApp.java;h=07f68b1222e5dbc4b2214e94dfacc91405c8f896;hp=ab9724b3bb90bd99de28f882a0ef4337bac39e42;hb=c0387c124840c9407e040600fda88f3c3e8f6aa6;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c

diff --git a/tim/prune/App.java b/tim/prune/App.java
index ab9724b..07f68b1 100644
--- a/tim/prune/App.java
+++ b/tim/prune/App.java
@@ -10,6 +10,7 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
 import tim.prune.data.Altitude;
+import tim.prune.data.Checker;
 import tim.prune.data.DataPoint;
 import tim.prune.data.Field;
 import tim.prune.data.LatLonRectangle;
@@ -578,14 +579,13 @@ public class App
 	{
 		// create undo object
 		UndoCreatePoint undo = new UndoCreatePoint();
+		_undoStack.add(undo);
 		// add point to track
 		inPoint.setSegmentStart(true);
 		_track.appendPoints(new DataPoint[] {inPoint});
 		// ensure track's field list contains point's fields
 		_track.extendFieldList(inPoint.getFieldList());
 		_trackInfo.selectPoint(_trackInfo.getTrack().getNumPoints()-1);
-		// add undo object to stack
-		_undoStack.add(undo);
 		// update listeners
 		UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.createpoint"));
 	}
@@ -647,8 +647,8 @@ public class App
 	 * @param inAltFormat altitude format
 	 * @param inSourceInfo information about the source of the data
 	 */
-	public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray, Altitude.Format inAltFormat,
-		SourceInfo inSourceInfo)
+	public void informDataLoaded(Field[] inFieldArray, Object[][] inDataArray,
+		Altitude.Format inAltFormat, SourceInfo inSourceInfo)
 	{
 		// Check whether loaded array can be properly parsed into a Track
 		Track loadedTrack = new Track();
@@ -660,6 +660,11 @@ public class App
 			loadNextFile();
 			return;
 		}
+		// Check for doubled track
+		if (Checker.isDoubledTrack(loadedTrack)) {
+			JOptionPane.showMessageDialog(_frame, I18nManager.getText("dialog.open.contentsdoubled"),
+				I18nManager.getText("function.open"), JOptionPane.WARNING_MESSAGE);
+		}
 		// Decide whether to load or append
 		if (_track.getNumPoints() > 0)
 		{
@@ -716,7 +721,8 @@ public class App
 		}
 		UpdateMessageBroker.informSubscribers();
 		// Update status bar
-		UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.loadfile") + " '" + inSourceInfo.getName() + "'");
+		UpdateMessageBroker.informSubscribers(I18nManager.getText("confirm.loadfile")
+			+ " '" + inSourceInfo.getName() + "'");
 		// update menu
 		_menuManager.informFileLoaded();
 		// load next file if there's a queue