diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-05-01 22:10:14 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-05-01 22:10:14 +0000 |
| commit | 6d1afe97d80c63e34e5a26a636f690daa5d330cb (patch) | |
| tree | af44668c9d23c3bb1441f4c771f208d456425396 /java/src/IceGridGUI/LiveDeployment/ServerEditor.java | |
| parent | Fixed W32 compiles for string converters (diff) | |
| download | ice-6d1afe97d80c63e34e5a26a636f690daa5d330cb.tar.bz2 ice-6d1afe97d80c63e34e5a26a636f690daa5d330cb.tar.xz ice-6d1afe97d80c63e34e5a26a636f690daa5d330cb.zip | |
The LiveDeployment pane now handles property sets correctly
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/ServerEditor.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/ServerEditor.java | 17 |
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));
|