Better PropertySets support

1 files changed, 1 insertions, 16 deletions

diff --git a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java
index 0d611fd0e7a..802df44cdcb 100755
--- a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java
@@ -26,22 +26,7 @@ class ServiceEditor extends CommunicatorEditor
 	ServiceDescriptor descriptor = service.getServiceDescriptor();

 	Utils.Resolver resolver = service.getResolver();

 

-	String application = ((Server)service.getParent()).getApplication().name;

-	Node node = (Node)service.getParent().getParent();

-

-	ExpandedPropertySet propertySet = 

-	    node.expand(descriptor.propertySet, application);	

-

-	ExpandedPropertySet instancePropertySet = null;

-	ServiceInstanceDescriptor instanceDescriptor = 

-	    service.getInstanceDescriptor();

-	if(instanceDescriptor != null)

-	{

-	    instancePropertySet = node.expand(instanceDescriptor.propertySet,

-					      application);	      

-	}

-

-	show(descriptor, propertySet, instancePropertySet, resolver);

+	show(descriptor, service.getProperties(), resolver);

 	_entry.setText(resolver.substitute(descriptor.entry));

     }