1 files changed, 4 insertions, 23 deletions
diff --git a/java/src/IceGrid/TreeNode/ServiceTemplates.java b/java/src/IceGrid/TreeNode/ServiceTemplates.java
index edb2eb48b99..9afa4b8db4f 100755
--- a/java/src/IceGrid/TreeNode/ServiceTemplates.java
+++ b/java/src/IceGrid/TreeNode/ServiceTemplates.java
@@ -13,7 +13,6 @@ import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
 
 import IceGrid.Model;
@@ -122,19 +121,9 @@ class ServiceTemplates extends Templates
 	_model.setSelectionPath(t.getPath());
     }
 
-    boolean tryAdd(String newId, TemplateDescriptor descriptor)
+    void tryAdd(String newId, TemplateDescriptor descriptor)
+	throws UpdateFailedException
     {
-	if(findChild(newId) != null)
-	{
-	    JOptionPane.showMessageDialog(
-		_model.getMainFrame(),
-		"There is already a service template with the same id.",
-		"Duplicate id",
-		JOptionPane.INFORMATION_MESSAGE);
-	    return false;
-	}
-	_descriptors.put(newId, descriptor);
-	
 	try
 	{
 	    addChild(new ServiceTemplate(true, newId, descriptor, _model),
@@ -143,17 +132,9 @@ class ServiceTemplates extends Templates
 	catch(UpdateFailedException e)
 	{
 	    e.addParent(this);
-
-	    JOptionPane.showMessageDialog(
-		_model.getMainFrame(),
-		e.toString(),
-		"Apply failed",
-		JOptionPane.ERROR_MESSAGE);
-
-	    removeDescriptor(newId);
-	    return false;
+	    throw e;
 	}
-	return true;
+	_descriptors.put(newId, descriptor);
     }
 
     protected java.util.List findAllTemplateInstances(String templateId)