summaryrefslogtreecommitdiff
path: root/java/src/IceGrid/TreeNode/Server.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceGrid/TreeNode/Server.java')
-rwxr-xr-xjava/src/IceGrid/TreeNode/Server.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index 34ce428b1e6..554265b2a7a 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -415,7 +415,7 @@ class Server extends EditableParent
_instanceDescriptor = o._instanceDescriptor;
_serverDescriptor = o._serverDescriptor;
- Utils.Resolver _resolver = o._resolver;
+ _resolver = o._resolver;
_services = o._services;
_adapters = o._adapters;
@@ -437,8 +437,7 @@ class Server extends EditableParent
clearChildren();
boolean isEditable = (instanceDescriptor == null);
- _propertiesHolder = new PropertiesHolder(serverDescriptor,
- isEditable ? this : null);
+ _propertiesHolder = new PropertiesHolder(serverDescriptor);
if(serverDescriptor instanceof IceBoxDescriptor)
{
@@ -494,7 +493,7 @@ class Server extends EditableParent
_stateIconIndex = _state.value() + 1;
//
- // Change the node representation in all views
+ // Change the node representation
//
fireNodeChangedEvent(this);
}
@@ -565,10 +564,15 @@ class Server extends EditableParent
return _state;
}
- ServerInstanceDescriptor getDescriptor()
+ ServerInstanceDescriptor getInstanceDescriptor()
{
return _instanceDescriptor;
}
+
+ ServerDescriptor getDescriptor()
+ {
+ return _serverDescriptor;
+ }
public String toString()
{