diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-05-04 16:15:21 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-05-04 16:15:21 +0000 |
| commit | 87ed29e743f1c53e01878259a2c8ba1b352d3933 (patch) | |
| tree | cf7de9d5ef8ac0362839c6122cad9d5217867e7f /java/src/IceGridGUI/LiveDeployment/Service.java | |
| parent | Fixed typo. (diff) | |
| download | ice-87ed29e743f1c53e01878259a2c8ba1b352d3933.tar.bz2 ice-87ed29e743f1c53e01878259a2c8ba1b352d3933.tar.xz ice-87ed29e743f1c53e01878259a2c8ba1b352d3933.zip | |
Better PropertySets support
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Service.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Service.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java index 9c91d22a807..0900a651f32 100755 --- a/java/src/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/LiveDeployment/Service.java @@ -125,6 +125,26 @@ class Service extends ListArrayTreeNode return _instanceDescriptor;
}
+ java.util.Map getProperties()
+ {
+ Utils.ExpandedPropertySet instancePropertySet = null;
+ Node node = (Node)_parent.getParent();
+
+ String applicationName = ((Server)_parent).getApplication().name;
+
+ if(_instanceDescriptor != null)
+ {
+ instancePropertySet = node.expand(_instanceDescriptor.propertySet,
+ applicationName, _resolver);
+ }
+
+ Utils.ExpandedPropertySet propertySet =
+ node.expand(_serviceDescriptor.propertySet,
+ applicationName, _resolver);
+
+ return Utils.propertySetToMap(propertySet, instancePropertySet, _resolver);
+ }
+
private void createAdapters()
{
java.util.Iterator p = _serviceDescriptor.adapters.iterator();
|