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/Node.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/Node.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Node.java | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java index 3483521f9d1..61a2b30956a 100755 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/LiveDeployment/Node.java @@ -190,6 +190,36 @@ class Node extends ListTreeNode add(appDesc, nodeDesc);
}
+ Editor.ExpandedPropertySet expand(PropertySetDescriptor descriptor,
+ String applicationName)
+ {
+ Editor.ExpandedPropertySet result = new Editor.ExpandedPropertySet();
+ result.references = new Editor.ExpandedPropertySet[descriptor.references.length];
+
+ for(int i = 0; i < descriptor.references.length; ++i)
+ {
+ result.references[i] = expand(
+ findNamedPropertySet(descriptor.references[i], applicationName), applicationName);
+ }
+
+ result.properties = descriptor.properties;
+ return result;
+ }
+
+ PropertySetDescriptor findNamedPropertySet(String name, String applicationName)
+ {
+ ApplicationData appData = (ApplicationData)_map.get(applicationName);
+ if(appData != null)
+ {
+ NodeDescriptor descriptor = appData.descriptor;
+ PropertySetDescriptor result = (PropertySetDescriptor)descriptor.propertySets.get(name);
+ if(result != null)
+ {
+ return result;
+ }
+ }
+ return getRoot().findNamedPropertySet(name, applicationName);
+ }
void add(ApplicationDescriptor appDesc, NodeDescriptor nodeDesc)
{
@@ -277,6 +307,10 @@ class Node extends ListTreeNode !update.variables.isEmpty();
}
+ nodeDesc.propertySets.keySet().removeAll(
+ java.util.Arrays.asList(update.removePropertySets));
+ nodeDesc.propertySets.putAll(update.propertySets);
+
//
// Remove servers
//
|