diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-07 20:02:29 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-07 20:02:29 +0000 |
| commit | 196551d1864fb20da5ecbdda5207e977f34da5c4 (patch) | |
| tree | b9b8a8ca53941fe73bbfc5cd52004233b10ae151 /java/src/IceGrid/TreeNode/Node.java | |
| parent | fix for bug 475: IcePack -> IceGrid (diff) | |
| download | ice-196551d1864fb20da5ecbdda5207e977f34da5c4.tar.bz2 ice-196551d1864fb20da5ecbdda5207e977f34da5c4.tar.xz ice-196551d1864fb20da5ecbdda5207e977f34da5c4.zip | |
Support for default template parameters
Diffstat (limited to 'java/src/IceGrid/TreeNode/Node.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Node.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/src/IceGrid/TreeNode/Node.java b/java/src/IceGrid/TreeNode/Node.java index 91e24049450..46ff6a05daf 100755 --- a/java/src/IceGrid/TreeNode/Node.java +++ b/java/src/IceGrid/TreeNode/Node.java @@ -86,7 +86,7 @@ class Node extends EditableParent implements InstanceParent static private class Backup
{
java.util.TreeSet removedElements;
- java.util.TreeMap parameterValues;
+ java.util.Map parameterValues;
}
public Object rebuild(CommonBase child, java.util.List editables)
@@ -188,7 +188,9 @@ class Node extends EditableParent implements InstanceParent // Build resolver
//
Utils.Resolver instanceResolver =
- new Utils.Resolver(_resolver, instanceDescriptor.parameterValues);
+ new Utils.Resolver(_resolver,
+ instanceDescriptor.parameterValues,
+ templateDescriptor.parameterDefaults);
String serverId = instanceResolver.substitute(serverDescriptor.id);
instanceResolver.put("server", serverId);
@@ -387,7 +389,9 @@ class Node extends EditableParent implements InstanceParent // Build resolver
//
Utils.Resolver instanceResolver =
- new Utils.Resolver(_resolver, instanceDescriptor.parameterValues);
+ new Utils.Resolver(_resolver,
+ instanceDescriptor.parameterValues,
+ templateDescriptor.parameterDefaults);
String serverId = instanceResolver.substitute(serverDescriptor.id);
instanceResolver.put("server", serverId);
@@ -593,7 +597,9 @@ class Node extends EditableParent implements InstanceParent // Build resolver
//
Utils.Resolver instanceResolver =
- new Utils.Resolver(_resolver, instanceDescriptor.parameterValues);
+ new Utils.Resolver(_resolver,
+ instanceDescriptor.parameterValues,
+ templateDescriptor.parameterDefaults);
String serverId = instanceResolver.substitute(serverDescriptor.id);
instanceResolver.put("server", serverId);
|