From: Frédéric Perrin <fred@fperrin.net>
Date: Sun, 30 Dec 2018 13:39:17 +0000 (+0000)
Subject: Duplicate point before converting it to waypoint
X-Git-Tag: v19.2.fp1~4^2
X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=233caff53e56e12a838813dbb0d67d1ad3d1acb0

Duplicate point before converting it to waypoint
---

diff --git a/src/tim/prune/function/edit/PointEditor.java b/src/tim/prune/function/edit/PointEditor.java
index c66201b..546a65e 100644
--- a/src/tim/prune/function/edit/PointEditor.java
+++ b/src/tim/prune/function/edit/PointEditor.java
@@ -307,10 +307,23 @@ public class PointEditor
 			if (_model.getChanged(i))
 			{
 				Field field = fieldList.getField(i);
+				if (field == field.WAYPT_NAME) {
+					if (wasNameAdded(_model.getValue(i))) {
+						_app.createPoint(_point.clonePoint());
+					}
+				}
 				editList.addEdit(new FieldEdit(field, _model.getValue(i)));
 				undoList.addEdit(new FieldEdit(field, _point.getFieldValue(field)));
 			}
 		}
 		_app.completePointEdit(editList, undoList);
 	}
+
+	private boolean wasNameAdded(String newName)
+	{
+		String prevName = _point.getWaypointName();
+		boolean prevNull = (prevName == null || prevName.equals(""));
+		boolean newNull = (newName == null || newName.equals(""));
+		return (prevNull && !newNull);
+	}
 }
diff --git a/src/tim/prune/function/edit/PointNameEditor.java b/src/tim/prune/function/edit/PointNameEditor.java
index 53e1f83..9e6e343 100644
--- a/src/tim/prune/function/edit/PointNameEditor.java
+++ b/src/tim/prune/function/edit/PointNameEditor.java
@@ -206,7 +206,11 @@ public class PointNameEditor extends GenericFunction
 		// Check whether name has really changed
 		if (hasNameChanged())
 		{
-			// Make lists for edit and undo, and add the changed field
+			// If a new name has been added, changing the point
+			// from trackpoint to waypoint, duplicate it
+			_app.createPoint(_point.clonePoint());
+			
+			// make lists for edit and undo, and add the changed field
 			FieldEditList editList = new FieldEditList();
 			FieldEditList undoList = new FieldEditList();
 			editList.addEdit(new FieldEdit(Field.WAYPT_NAME, _nameField.getText().trim()));
@@ -231,4 +235,17 @@ public class PointNameEditor extends GenericFunction
 			|| (!prevNull && newNull)
 			|| (!prevNull && !newNull && !prevName.equals(newName));
 	}
+
+	/**
+	 * Check whether a new name has been added
+	 * @return true if it has indeed
+	 */
+	private boolean wasNameAdded()
+	{
+		String prevName = _point.getWaypointName();
+		String newName = _nameField.getText().trim();
+		boolean prevNull = (prevName == null || prevName.equals(""));
+		boolean newNull = (newName == null || newName.equals(""));
+		return (prevNull && !newNull);
+	}
 }