Server creation/deletion/edit

1 files changed, 15 insertions, 14 deletions

diff --git a/java/src/IceGrid/TreeNode/ServerInstanceEditor.java b/java/src/IceGrid/TreeNode/ServerInstanceEditor.java
index 4f491f15c14..c451339ae22 100755
--- a/java/src/IceGrid/TreeNode/ServerInstanceEditor.java
+++ b/java/src/IceGrid/TreeNode/ServerInstanceEditor.java
@@ -24,14 +24,27 @@ import com.jgoodies.forms.builder.DefaultFormBuilder;
 

 import IceGrid.Model;

 import IceGrid.ParametersDialog;

+import IceGrid.ServerDescriptor;

 import IceGrid.ServerInstanceDescriptor;

 import IceGrid.TemplateDescriptor;

 import IceGrid.Utils;

 

-class ServerInstanceEditor extends Editor

+class ServerInstanceEditor extends AbstractServerEditor

 {

-    protected void applyUpdate()

+    protected void writeDescriptor()

     {

+	ServerInstanceDescriptor descriptor = getDescriptor();

+	ServerTemplate t = (ServerTemplate)_template.getSelectedItem();

+	

+	descriptor.template = t.getId();

+	descriptor.parameterValues = _parameterValuesMap;

+	((Server)_target).setServerDescriptor(

+	    (ServerDescriptor)((TemplateDescriptor)t.getDescriptor()).descriptor);

+    }

+    

+    protected boolean isSimpleUpdate()

+    {

+	return false;

     }

 

     ServerInstanceEditor(JFrame parentFrame)

@@ -106,18 +119,6 @@ class ServerInstanceEditor extends Editor
 	}

     }

 

-    void writeDescriptor()

-    {

-	ServerInstanceDescriptor descriptor = getDescriptor();

-	descriptor.template = ((ServerTemplate)_template.getSelectedItem()).getId();

-	descriptor.parameterValues = _parameterValuesMap;

-    }	    

-    

-    boolean isSimpleUpdate()

-    {

-	return false;

-    }

-

     void append(DefaultFormBuilder builder)

     { 

 	builder.append("Template", _template);