summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rwxr-xr-xjava/src/IceGrid/MainPane.java14
-rwxr-xr-xjava/src/IceGrid/TreeNode/Server.java13
2 files changed, 24 insertions, 3 deletions
diff --git a/java/src/IceGrid/MainPane.java b/java/src/IceGrid/MainPane.java
index 4a91a7ce956..d6b949ffbae 100755
--- a/java/src/IceGrid/MainPane.java
+++ b/java/src/IceGrid/MainPane.java
@@ -128,14 +128,28 @@ public class MainPane extends JSplitPane
{
public void valueChanged(TreeSelectionEvent e)
{
+ System.err.println("SectionListener.valueChanged");
+
TreePath path = null;
if(e.isAddedPath())
{
+ System.err.println("added path");
path = e.getPath();
}
+ if(_model.getSelectedNode() == null)
+ {
+ System.err.println("No selected node");
+ }
+ else
+ {
+ System.err.println("There is a selected node");
+ }
+
if(path == null)
{
+ System.err.println("Display welcome screen");
+
if(_model.displayEnabled())
{
displayWelcomePanel();
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