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/ServiceEditor.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/ServiceEditor.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/ServiceEditor.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java index 1164338ef28..0d611fd0e7a 100755 --- a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java @@ -26,7 +26,22 @@ class ServiceEditor extends CommunicatorEditor ServiceDescriptor descriptor = service.getServiceDescriptor();
Utils.Resolver resolver = service.getResolver();
- show(descriptor, resolver);
+ String application = ((Server)service.getParent()).getApplication().name;
+ Node node = (Node)service.getParent().getParent();
+
+ ExpandedPropertySet propertySet =
+ node.expand(descriptor.propertySet, application);
+
+ ExpandedPropertySet instancePropertySet = null;
+ ServiceInstanceDescriptor instanceDescriptor =
+ service.getInstanceDescriptor();
+ if(instanceDescriptor != null)
+ {
+ instancePropertySet = node.expand(instanceDescriptor.propertySet,
+ application);
+ }
+
+ show(descriptor, propertySet, instancePropertySet, resolver);
_entry.setText(resolver.substitute(descriptor.entry));
}
|