summaryrefslogtreecommitdiff
path: root/java/src/IceGrid/TreeNode/NodeViewRoot.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-07-01 15:20:33 +0000
committerBernard Normier <bernard@zeroc.com>2005-07-01 15:20:33 +0000
commit1ff98f14066ee60dd8ef2109cf7d772235740a9b (patch)
tree3f6e809c3d470e1190d1f73bd02f1b8d9847e78a /java/src/IceGrid/TreeNode/NodeViewRoot.java
parentRemoved applicationSynced call, fixed node observer nodeUp method to not (diff)
downloadice-1ff98f14066ee60dd8ef2109cf7d772235740a9b.tar.bz2
ice-1ff98f14066ee60dd8ef2109cf7d772235740a9b.tar.xz
ice-1ff98f14066ee60dd8ef2109cf7d772235740a9b.zip
Added start/stop popup menu
Diffstat (limited to 'java/src/IceGrid/TreeNode/NodeViewRoot.java')
-rwxr-xr-xjava/src/IceGrid/TreeNode/NodeViewRoot.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/java/src/IceGrid/TreeNode/NodeViewRoot.java b/java/src/IceGrid/TreeNode/NodeViewRoot.java
index fe2497b3dfc..4566c672207 100755
--- a/java/src/IceGrid/TreeNode/NodeViewRoot.java
+++ b/java/src/IceGrid/TreeNode/NodeViewRoot.java
@@ -126,23 +126,19 @@ public class NodeViewRoot extends Parent
String nodeName = updatedInfo.name;
java.util.Map serverMap = new java.util.HashMap();
- System.err.println("nodeUp gives info on:");
for(int i = 0; i < updatedInfo.servers.length; ++i)
{
- System.err.println(updatedInfo.servers[i].name);
- if(updatedInfo.servers[i].state != ServerState.Destroyed)
- {
- serverMap.put(updatedInfo.servers[i].name, updatedInfo.servers[i]);
- }
+ assert(updatedInfo.servers[i].state != ServerState.Destroyed);
+ assert(updatedInfo.servers[i].state != ServerState.Inactive);
+
+ serverMap.put(updatedInfo.servers[i].name, updatedInfo.servers[i]);
}
java.util.Map adapterMap = new java.util.HashMap();
for(int i = 0; i < updatedInfo.adapters.length; ++i)
{
- if(updatedInfo.adapters[i].proxy != null)
- {
- adapterMap.put(updatedInfo.adapters[i].id, updatedInfo.adapters[i].proxy);
- }
+ assert(updatedInfo.adapters[i].proxy != null);
+ adapterMap.put(updatedInfo.adapters[i].id, updatedInfo.adapters[i].proxy);
}
_nodeServerInfoMap.put(nodeName, serverMap);
@@ -172,7 +168,8 @@ public class NodeViewRoot extends Parent
java.util.Map serverMap = (java.util.Map)_nodeServerInfoMap.get(nodeName);
if(serverMap != null)
{
- if(updatedInfo.state == ServerState.Destroyed)
+ if(updatedInfo.state == ServerState.Destroyed ||
+ updatedInfo.state == ServerState.Inactive)
{
serverMap.remove(updatedInfo.name);
}