Force top level name in hierarchy include position

For example sys would become sys-0

2 files changed, 7 insertions, 3 deletions

diff --git a/src/com/ibm/ServerWizard2/controller/TargetWizardController.java b/src/com/ibm/ServerWizard2/controller/TargetWizardController.java
index 1f21c57..ad033d0 100644
--- a/src/com/ibm/ServerWizard2/controller/TargetWizardController.java
+++ b/src/com/ibm/ServerWizard2/controller/TargetWizardController.java
@@ -98,7 +98,7 @@ public class TargetWizardController {
 			targetInstance = new Target(targetModel);
 		}
 		targetInstance.setName(nameOverride);
-		model.updateTargetPosition(targetInstance, parentTarget, -1);
+		model.updateTargetPosition(targetInstance, parentTarget, -1, modelCreationMode);
 		try {
 			model.addTarget(parentTarget, targetInstance, modelCreationMode);
 			view.updateInstanceTree(targetInstance, parentItem);
diff --git a/src/com/ibm/ServerWizard2/model/SystemModel.java b/src/com/ibm/ServerWizard2/model/SystemModel.java
index 4140111..9038239 100644
--- a/src/com/ibm/ServerWizard2/model/SystemModel.java
+++ b/src/com/ibm/ServerWizard2/model/SystemModel.java
@@ -778,14 +778,18 @@ public class SystemModel {
 		}
 	}
 
-	public void updateTargetPosition(Target target, Target parentTarget, int position) {
+	public void updateTargetPosition(Target target, Target parentTarget, int position, Boolean modelCreationMode) {
 		if (position > 0) {
 			target.setPosition(position);
 			return;
 		}
 		if (parentTarget == null) {
 			target.setName(target.getIdPrefix());
-			target.setPosition(-1);
+			if (modelCreationMode) {
+				target.setPosition(-1);
+			} else {
+				target.setPosition(0);
+			}
 			return;
 		}
 		int p = -1;