Fixed build

1 files changed, 5 insertions, 16 deletions

diff --git a/java/src/IceGrid/TreeNode/ServiceInstance.java b/java/src/IceGrid/TreeNode/ServiceInstance.java
index 55d333115f6..3cf2ddf41ac 100755
--- a/java/src/IceGrid/TreeNode/ServiceInstance.java
+++ b/java/src/IceGrid/TreeNode/ServiceInstance.java
@@ -13,11 +13,10 @@ import IceGrid.TemplateDescriptor;
 

 class ServiceInstance extends Parent

 {

-    ServiceInstance(ServiceInstanceDescriptor descriptor,

-		    TemplateDescriptor templateDescriptor)

+    ServiceInstance(ServiceInstanceDescriptor descriptor)

     {

+	super(descriptor.descriptor.name);

 	_descriptor = descriptor;

-	_templateDescriptor = templateDescriptor;

 	

 	if(_descriptor.descriptor != null)

 	{

@@ -31,27 +30,17 @@ class ServiceInstance extends Parent
 

     public String toString()

     {

-	String result = "";

+	String result = _descriptor.descriptor.name;

 

-	//

-	// The if Temporary

-	//

-	if(_descriptor.descriptor != null)

-	{

-	    result = _descriptor.descriptor.name;

-	}

-

-	if(_templateDescriptor != null)

+	if(!_descriptor.template.equals(""))

 	{

 	    result += ": " + templateLabel(_descriptor.template, 

-					   _templateDescriptor.parameters,

-					   _descriptor.parameterValues);

+					   _descriptor.parameterValues.values());

 	}

 	return result;

     }

 

     private ServiceInstanceDescriptor _descriptor;

-    private TemplateDescriptor _templateDescriptor;

     private Adapters _adapters;

     private DbEnvs _dbEnvs;

 }