Skip to content

Commit 51c4191

Browse files
committed
Force top level name in hierarchy include position
For example sys would become sys-0
1 parent 3115594 commit 51c4191

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/com/ibm/ServerWizard2/controller/TargetWizardController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void addTargetInstance(Target targetModel, Target parentTarget,
9898
targetInstance = new Target(targetModel);
9999
}
100100
targetInstance.setName(nameOverride);
101-
model.updateTargetPosition(targetInstance, parentTarget, -1);
101+
model.updateTargetPosition(targetInstance, parentTarget, -1, modelCreationMode);
102102
try {
103103
model.addTarget(parentTarget, targetInstance, modelCreationMode);
104104
view.updateInstanceTree(targetInstance, parentItem);

src/com/ibm/ServerWizard2/model/SystemModel.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -778,14 +778,18 @@ public void addUnitInstances() {
778778
}
779779
}
780780

781-
public void updateTargetPosition(Target target, Target parentTarget, int position) {
781+
public void updateTargetPosition(Target target, Target parentTarget, int position, Boolean modelCreationMode) {
782782
if (position > 0) {
783783
target.setPosition(position);
784784
return;
785785
}
786786
if (parentTarget == null) {
787787
target.setName(target.getIdPrefix());
788-
target.setPosition(-1);
788+
if (modelCreationMode) {
789+
target.setPosition(-1);
790+
} else {
791+
target.setPosition(0);
792+
}
789793
return;
790794
}
791795
int p = -1;

0 commit comments

Comments
 (0)