Fixed build

1 files changed, 25 insertions, 5 deletions

diff --git a/java/src/IceGrid/TreeNode/ServiceTemplate.java b/java/src/IceGrid/TreeNode/ServiceTemplate.java
index bfc0c177609..7cee10443ca 100755
--- a/java/src/IceGrid/TreeNode/ServiceTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServiceTemplate.java
@@ -11,18 +11,31 @@ package IceGrid.TreeNode;
 import IceGrid.TemplateDescriptor;

 import IceGrid.Model;

 

-class ServiceTemplate extends PropertiesHolder

+class ServiceTemplate extends EditableParent

 {

-    ServiceTemplate(String name, TemplateDescriptor descriptor, Model model)

+    ServiceTemplate(boolean brandNew, String name, 

+		    TemplateDescriptor descriptor, Model model)

+	throws DuplicateIdException

     {

-	super(name, model);

+	super(brandNew, name, model);

 	rebuild(descriptor);

     }

+    

+    ServiceTemplate(ServiceTemplate o)

+    {

+	super(o, true);

+	_templateDescriptor = o._templateDescriptor;

+	_adapters = o._adapters;

+	_dbEnvs = o._dbEnvs;

+	_propertiesHolder = new PropertiesHolder(_templateDescriptor.descriptor, this);

+    }

+

 

     void rebuild(TemplateDescriptor descriptor)

+	throws DuplicateIdException

     {

 	_templateDescriptor = descriptor;

-	_descriptor = _templateDescriptor.descriptor;

+	_propertiesHolder = new PropertiesHolder(_templateDescriptor.descriptor, this);

 	clearChildren();

 

 	//

@@ -31,7 +44,7 @@ class ServiceTemplate extends PropertiesHolder
 	java.util.Collections.sort(_templateDescriptor.parameters);

 	

 	_adapters = new Adapters(_templateDescriptor.descriptor.adapters, true, 

-				 null, _model);

+				 null, null, _model);

 	addChild(_adapters);

 

 	_dbEnvs = new DbEnvs(_templateDescriptor.descriptor.dbEnvs, true,

@@ -39,6 +52,11 @@ class ServiceTemplate extends PropertiesHolder
 	addChild(_dbEnvs);

     }

 

+    public PropertiesHolder getPropertiesHolder()

+    {

+	return _propertiesHolder;

+    }

+

     public String toString()

     {

 	return templateLabel(_id, _templateDescriptor.parameters);

@@ -47,4 +65,6 @@ class ServiceTemplate extends PropertiesHolder
     private TemplateDescriptor _templateDescriptor;

     private Adapters _adapters;

     private DbEnvs _dbEnvs;

+

+    private PropertiesHolder _propertiesHolder;

 }