Fixed bug #1637

12 files changed, 45 insertions, 24 deletions

diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java
index ebde3ac6f7b..843ae690eb9 100755
--- a/java/src/IceGridGUI/Application/Adapter.java
+++ b/java/src/IceGridGUI/Application/Adapter.java
@@ -40,7 +40,7 @@ class Adapter extends TreeNode implements DescriptorHolder
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	
 	Object clipboard = getCoordinator().getClipboard();
 	actions[PASTE] = clipboard != null && 
diff --git a/java/src/IceGridGUI/Application/DbEnv.java b/java/src/IceGridGUI/Application/DbEnv.java
index 9f285f5d147..b0e2403ea52 100755
--- a/java/src/IceGridGUI/Application/DbEnv.java
+++ b/java/src/IceGridGUI/Application/DbEnv.java
@@ -57,7 +57,7 @@ class DbEnv extends TreeNode implements DescriptorHolder
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 
 	Object clipboard = getCoordinator().getClipboard();
 	actions[PASTE] = clipboard != null && 
diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java
index e4100c23930..ecf66403afc 100755
--- a/java/src/IceGridGUI/Application/Node.java
+++ b/java/src/IceGridGUI/Application/Node.java
@@ -248,7 +248,7 @@ class Node extends TreeNode implements PropertySetParent
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
 
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	actions[DELETE] = true;
 
 	Object descriptor =  getCoordinator().getClipboard();
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java
index e5a24e52092..db4e77b62e5 100755
--- a/java/src/IceGridGUI/Application/PlainServer.java
+++ b/java/src/IceGridGUI/Application/PlainServer.java
@@ -120,7 +120,6 @@ class PlainServer extends Communicator implements Server
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
 	
 	Object clipboard = getCoordinator().getClipboard();
 	if(clipboard != null && 
@@ -136,14 +135,15 @@ class PlainServer extends Communicator implements Server
 	actions[DELETE] = true;
 	if(!_ephemeral)
 	{
+	    actions[COPY] = true;
 	    actions[SHOW_VARS] = true;
 	    actions[SUBSTITUTE_VARS] = true;
+
+	    actions[NEW_ADAPTER] = !_services.initialized();
+	    actions[NEW_DBENV] = !_services.initialized();
+	    actions[NEW_SERVICE] = _services.initialized();
+	    actions[NEW_SERVICE_FROM_TEMPLATE] = _services.initialized();
 	}
-	
-	actions[NEW_ADAPTER] = !_services.initialized();
-	actions[NEW_DBENV] = !_services.initialized();
-	actions[NEW_SERVICE] = _services.initialized();
-	actions[NEW_SERVICE_FROM_TEMPLATE] = _services.initialized();
 	return actions;
     }
     public JPopupMenu getPopupMenu()
diff --git a/java/src/IceGridGUI/Application/PlainService.java b/java/src/IceGridGUI/Application/PlainService.java
index f4e244b63d4..48491e40b0f 100755
--- a/java/src/IceGridGUI/Application/PlainService.java
+++ b/java/src/IceGridGUI/Application/PlainService.java
@@ -57,7 +57,7 @@ class PlainService extends Communicator implements Service, Cloneable
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	
 	Object clipboard = getCoordinator().getClipboard();
 	if(clipboard != null && 
diff --git a/java/src/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/Application/PropertySet.java
index bd0dbd9d274..ad7206ec5c5 100755
--- a/java/src/IceGridGUI/Application/PropertySet.java
+++ b/java/src/IceGridGUI/Application/PropertySet.java
@@ -51,7 +51,7 @@ class PropertySet extends TreeNode
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	
 	if(((TreeNode)_parent).getAvailableActions()[PASTE])
 	{
diff --git a/java/src/IceGridGUI/Application/ReplicaGroup.java b/java/src/IceGridGUI/Application/ReplicaGroup.java
index ca234ec1ed5..40c161d4756 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroup.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroup.java
@@ -49,7 +49,7 @@ class ReplicaGroup extends TreeNode
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	
 	if(((TreeNode)_parent).getAvailableActions()[PASTE])
 	{
diff --git a/java/src/IceGridGUI/Application/ServerInstance.java b/java/src/IceGridGUI/Application/ServerInstance.java
index 1f1cdd68aa4..67338efac94 100755
--- a/java/src/IceGridGUI/Application/ServerInstance.java
+++ b/java/src/IceGridGUI/Application/ServerInstance.java
@@ -44,7 +44,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	
 	Object clipboard = getCoordinator().getClipboard();
 	if(clipboard != null && 
diff --git a/java/src/IceGridGUI/Application/ServerTemplate.java b/java/src/IceGridGUI/Application/ServerTemplate.java
index 5809ab07c48..d6f5455e169 100755
--- a/java/src/IceGridGUI/Application/ServerTemplate.java
+++ b/java/src/IceGridGUI/Application/ServerTemplate.java
@@ -91,7 +91,7 @@ class ServerTemplate extends Communicator
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 
 	if(((TreeNode)_parent).getAvailableActions()[PASTE])
 	{
@@ -108,10 +108,13 @@ class ServerTemplate extends Communicator
 
 	actions[DELETE] = true;
 
-	actions[NEW_ADAPTER] = !_services.initialized();
-	actions[NEW_SERVICE] = _services.initialized();
-	actions[NEW_SERVICE_FROM_TEMPLATE] = _services.initialized();
-	actions[NEW_DBENV] = _dbEnvs.initialized();
+	if(!_ephemeral)
+	{
+	    actions[NEW_ADAPTER] = !_services.initialized();
+	    actions[NEW_SERVICE] = _services.initialized();
+	    actions[NEW_SERVICE_FROM_TEMPLATE] = _services.initialized();
+	    actions[NEW_DBENV] = _dbEnvs.initialized();
+	}
 
 	return actions;
     }
diff --git a/java/src/IceGridGUI/Application/ServiceInstance.java b/java/src/IceGridGUI/Application/ServiceInstance.java
index c58439b0320..94c3421a3d1 100755
--- a/java/src/IceGridGUI/Application/ServiceInstance.java
+++ b/java/src/IceGridGUI/Application/ServiceInstance.java
@@ -72,7 +72,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+	actions[COPY] = !_ephemeral;
 	
 	if(((TreeNode)_parent).getAvailableActions()[PASTE])
 	{
diff --git a/java/src/IceGridGUI/Application/ServiceTemplate.java b/java/src/IceGridGUI/Application/ServiceTemplate.java
index 42869f6c440..5791175a863 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplate.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplate.java
@@ -60,7 +60,7 @@ class ServiceTemplate extends Communicator
     public boolean[] getAvailableActions()
     {
 	boolean[] actions = new boolean[ACTION_COUNT];
-	actions[COPY] = true;
+
 	if(((TreeNode)_parent).getAvailableActions()[PASTE])
 	{
 	    actions[PASTE] = true;
@@ -75,9 +75,13 @@ class ServiceTemplate extends Communicator
 
 	actions[DELETE] = true;
 
-	actions[NEW_ADAPTER] = !_ephemeral;
-	actions[NEW_DBENV] = !_ephemeral;
-
+	if(!_ephemeral)
+	{	
+	    actions[COPY] = true;
+	    actions[NEW_ADAPTER] = true;
+	    actions[NEW_DBENV] = true;
+	}
+	
 	return actions;
     }
     public void copy()
diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java
index 21762f500f7..29d178396a7 100755
--- a/java/src/IceGridGUI/ApplicationPane.java
+++ b/java/src/IceGridGUI/ApplicationPane.java
@@ -444,7 +444,21 @@ public class ApplicationPane extends JSplitPane implements Tab
 			}
 			else
 			{
-			    showNode((TreeNode)path.getLastPathComponent());
+			    TreeNode node = (TreeNode)path.getLastPathComponent();
+			    Root root = node.getRoot();
+			    if(root.hasNode(node))
+			    {
+				showNode(node);
+			    }
+			    else
+			    {
+				node = root.findNodeLike(path, false);
+				if(node == null)
+				{
+				    node = root;
+				}
+				root.setSelectedNode(node);
+			    }
 			}
 		    }
 		    else