summaryrefslogtreecommitdiff
path: root/java/src/IceGrid/TreeNode/Server.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-10-17 15:08:31 +0000
committerBernard Normier <bernard@zeroc.com>2005-10-17 15:08:31 +0000
commit2fee5ead788e99ffdb4009195c5a72304d594c03 (patch)
tree86fe416403c421c3fa97aafeffb8b88a18196aae /java/src/IceGrid/TreeNode/Server.java
parentSynchronize default id in Adapter editor (diff)
downloadice-2fee5ead788e99ffdb4009195c5a72304d594c03.tar.bz2
ice-2fee5ead788e99ffdb4009195c5a72304d594c03.tar.xz
ice-2fee5ead788e99ffdb4009195c5a72304d594c03.zip
Added tracing to track down MacOS problem
Diffstat (limited to 'java/src/IceGrid/TreeNode/Server.java')
-rwxr-xr-xjava/src/IceGrid/TreeNode/Server.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index 2c2774ea48d..8f328d472aa 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -177,8 +177,8 @@ class Server extends EditableParent
actions[START] = state == ServerState.Inactive
&& _enabled;
actions[STOP] = state != ServerState.Inactive;
- actions[ENABLE] = true || !_enabled;
- actions[DISABLE] = true || _enabled;
+ actions[ENABLE] = !_enabled;
+ actions[DISABLE] = _enabled;
if(!_model.isUpdateInProgress())
{
@@ -760,7 +760,14 @@ class Server extends EditableParent
_enabled = enabled;
_toolTip = toolTip(_state, _pid, _enabled);
- _stateIconIndex = _state.value() + 1;
+ if(_state == null)
+ {
+ _stateIconIndex = 0;
+ }
+ else
+ {
+ _stateIconIndex = _state.value() + 1;
+ }
//
// Change the node representation