Ability to edit/delete/copy etc. nodes

1 files changed, 14 insertions, 12 deletions

diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index 4af0729545e..7af62cb4fbd 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -592,17 +592,19 @@ class Server extends EditableParent
 	if(!_ephemeral)

 	{

 	    Ice.IntHolder pid = new Ice.IntHolder();

-	    ServerState state = _model.getRoot().registerServer(_resolver.find("node"),

-								_id,

-								this,

-								pid);

-	    super.setParent(parent);

-	    updateDynamicInfo(state, pid.value);

-	}

-	else

-	{

-	    super.setParent(parent);

+	    _state = _model.getRoot().registerServer(_resolver.find("node"),

+						     _id,

+						     this,

+						     pid);

+	    

+	    _pid = pid.value;

+	    _toolTip = toolTip(_state, _pid);

+	    if(_state != null)

+	    {

+		_stateIconIndex = _state.value() + 1;

+	    }

 	}

+	super.setParent(parent);

     }

 

     public void clearParent()

@@ -715,7 +717,7 @@ class Server extends EditableParent
 	}

     }

 

-    private static String toolTip(ServerState state, int pid)

+    static private String toolTip(ServerState state, int pid)

     {

 	String result = (state == null ? "Unknown" : state.toString());

 

@@ -730,7 +732,7 @@ class Server extends EditableParent
     private boolean _enabled = true;

     private int _stateIconIndex = 0;

     private int _pid = 0;

-    private String _toolTip = toolTip(_state, _pid);

+    private String _toolTip;

 

     private ServerInstanceDescriptor _instanceDescriptor;

     private ServerDescriptor _serverDescriptor;