Fixed case of stderr and stdout

5 files changed, 12 insertions, 12 deletions

diff --git a/java/src/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/LiveActions.java
index 7f504bcabc6..1c847da7aea 100755
--- a/java/src/IceGridGUI/LiveActions.java
+++ b/java/src/IceGridGUI/LiveActions.java
@@ -131,7 +131,7 @@ public class LiveActions
 					       "Write message to stdout or stderr");
 	
 
-	_array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve Stdout")
+	_array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve stdout")
 	    {
 		public void actionPerformed(ActionEvent e) 
 		{
@@ -141,7 +141,7 @@ public class LiveActions
 	_array[TreeNode.RETRIEVE_STDOUT].putValue(Action.SHORT_DESCRIPTION, 
 					       "Retrieve stdout");
 
-	_array[TreeNode.RETRIEVE_STDERR] = new AbstractAction("Retrieve Stderr")
+	_array[TreeNode.RETRIEVE_STDERR] = new AbstractAction("Retrieve stderr")
 	    {
 		public void actionPerformed(ActionEvent e) 
 		{
diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java
index 00d93939009..0b238b47206 100755
--- a/java/src/IceGridGUI/LiveDeployment/Node.java
+++ b/java/src/IceGridGUI/LiveDeployment/Node.java
@@ -62,7 +62,7 @@ class Node extends ListTreeNode
 
 		public String getTitle()
 		{
-		    return "Node " + _id + " " + (stdout ? "Stdout" : "Stderr");
+		    return "Node " + _id + " " + (stdout ? "stdout" : "stderr");
 		}
 
 		public String getDefaultFilename()
diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java
index 4939410fbd4..c67c97b9a2a 100755
--- a/java/src/IceGridGUI/LiveDeployment/Root.java
+++ b/java/src/IceGridGUI/LiveDeployment/Root.java
@@ -560,7 +560,7 @@ public class Root extends ListArrayTreeNode
 	}
 	else
 	{
-	    Slave newSlave = new Slave(this, info);
+	    Slave newSlave = new Slave(this, info, _replicaName);
 
 	    int i;
 	    for(i = 0; i < _slaves.size(); ++i)
@@ -930,14 +930,13 @@ public class Root extends ListArrayTreeNode
 
 		public String getTitle()
 		{
-		    return "Registry " + _label + " " + (stdout ? "Stdout" : "Stderr");
+		    return "Registry " + _label + " " + (stdout ? "stdout" : "stderr");
 		}
 		
 		public String getDefaultFilename()
 		{
 		    return _replicaName + (stdout ? ".out" : ".err");
 		}
-
 	    });
     } 
 
@@ -998,8 +997,7 @@ public class Root extends ListArrayTreeNode
 
 	storeLogPrefs();
     }
-
-    
+   
     private void loadLogPrefs()
     {
 	Preferences logPrefs = _coordinator.getPrefs().node("Log");
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index 6a872b6a755..e2bdab1af37 100755
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -191,7 +191,7 @@ class Server extends ListArrayTreeNode
 
 		public String getTitle()
 		{
-		    return "Server " + _id + " " + (stdout ? "Stdout" : "Stderr");
+		    return "Server " + _id + " " + (stdout ? "stdout" : "stderr");
 		}
 
 		public String getDefaultFilename()
diff --git a/java/src/IceGridGUI/LiveDeployment/Slave.java b/java/src/IceGridGUI/LiveDeployment/Slave.java
index 17530d6f22c..83f6da5157f 100644
--- a/java/src/IceGridGUI/LiveDeployment/Slave.java
+++ b/java/src/IceGridGUI/LiveDeployment/Slave.java
@@ -102,7 +102,7 @@ class Slave extends TreeNode
 
 		public String getTitle()
 		{
-		    return "Slave Registry " + _id + " " + (stdout ? "Stdout" : "Stderr");
+		    return "Registry " + _title + " " + (stdout ? "stdout" : "stderr");
 		}
 		
 		public String getDefaultFilename()
@@ -163,13 +163,15 @@ class Slave extends TreeNode
 	    tree, value, sel, expanded, leaf, row, hasFocus);
     }
 
-    Slave(TreeNode parent, RegistryInfo info)
+    Slave(TreeNode parent, RegistryInfo info, String instanceName)
     {
 	super(parent, info.name);
 	_info = info;
+        _title = instanceName + " (" + info.name + ")";
     }   
 
-    private RegistryInfo _info;
+    private final RegistryInfo _info;
+    private final String _title;
 
     static private DefaultTreeCellRenderer _cellRenderer;
     static private SlaveEditor _editor;