summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/LiveDeployment/ServerEditor.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/ServerEditor.java')
-rwxr-xr-xjava/src/IceGridGUI/LiveDeployment/ServerEditor.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java
index fad35395110..4564c07c629 100755
--- a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java
@@ -109,7 +109,22 @@ class ServerEditor extends CommunicatorEditor
_application.setText(resolver.find("application"));
- super.show(descriptor, resolver);
+ Node node = (Node)server.getParent();
+
+ ExpandedPropertySet propertySet =
+ node.expand(descriptor.propertySet,
+ server.getApplication().name);
+
+ ExpandedPropertySet instancePropertySet = null;
+ ServerInstanceDescriptor instanceDescriptor =
+ server.getInstanceDescriptor();
+ if(instanceDescriptor != null)
+ {
+ instancePropertySet = node.expand(instanceDescriptor.propertySet,
+ server.getApplication().name);
+ }
+
+ super.show(descriptor, propertySet, instancePropertySet, resolver);
_exe.setText(resolver.substitute(descriptor.exe));
_pwd.setText(resolver.substitute(descriptor.pwd));