diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-09-22 22:54:37 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-09-22 22:54:37 +0000 |
| commit | 3edcb2644f19293797bc1cc3295a89fbd0cd9e27 (patch) | |
| tree | 98a8c5be210d8a94b97f91985d74aa208c726947 /java/src/IceGrid/TreeNode/Services.java | |
| parent | vc6 fix (diff) | |
| download | ice-3edcb2644f19293797bc1cc3295a89fbd0cd9e27.tar.bz2 ice-3edcb2644f19293797bc1cc3295a89fbd0cd9e27.tar.xz ice-3edcb2644f19293797bc1cc3295a89fbd0cd9e27.zip | |
Refactoring to use the same service sub-editor for plain services, service
instances, and service templates
Diffstat (limited to 'java/src/IceGrid/TreeNode/Services.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Services.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/java/src/IceGrid/TreeNode/Services.java b/java/src/IceGrid/TreeNode/Services.java index 87a46a73046..a9a97a1fb2b 100755 --- a/java/src/IceGrid/TreeNode/Services.java +++ b/java/src/IceGrid/TreeNode/Services.java @@ -225,10 +225,11 @@ class Services extends SimpleContainer //
// Make sure descriptor.template points to a real template
//
- if(getApplication().findServiceTemplate(descriptor.template) == null)
+ ServiceTemplate t = getApplication().findServiceTemplate(descriptor.template);
+
+ if(t == null)
{
- CommonBase t = (CommonBase)
- getApplication().getServiceTemplates().getChildAt(0);
+ t = (ServiceTemplate)getApplication().getServiceTemplates().getChildAt(0);
if(t == null)
{
@@ -242,8 +243,17 @@ class Services extends SimpleContainer else
{
descriptor.template = t.getId();
+ descriptor.parameterValues = new java.util.TreeMap();
}
}
+
+ //
+ // Validate/update parameterValues
+ //
+ TemplateDescriptor td = (TemplateDescriptor)t.getDescriptor();
+ descriptor.parameterValues = Editor.makeParameterValues(descriptor.parameterValues,
+ td.parameters);
+
}
Service service = new Service(name, descriptor, _model);
|