1 files changed, 22 insertions, 10 deletions

diff --git a/java/src/IceGrid/TreeNode/Adapter.java b/java/src/IceGrid/TreeNode/Adapter.java
index dc94dfc21f4..7062875b55d 100755
--- a/java/src/IceGrid/TreeNode/Adapter.java
+++ b/java/src/IceGrid/TreeNode/Adapter.java
@@ -117,12 +117,9 @@ class Adapter extends Leaf
 	    //
 	    // In a server instance
 	    //
-	    _instanceId 
-		= new AdapterInstanceId(_resolver.find("server"),
-					_resolver.substitute(_descriptor.id));
-	    
+	    _adapterId = _resolver.substitute(_descriptor.id);
 	    _proxy = _model.getRoot().registerAdapter(_resolver.find("node"),
-						      _instanceId,
+						      _adapterId,
 						      this);
 	    createToolTip();
 	    //
@@ -130,16 +127,22 @@ class Adapter extends Leaf
 	    //  
 	}
 	super.setParent(parent);
+	
+	CommonBase grandParent = parent.getParent();
+	
+	_defaultAdapterId = (grandParent instanceof Service || 
+			     grandParent instanceof ServiceTemplate) ? 
+	    "${server}.${service}." + _id: "${server}." + _id;
     }
 
     public void clearParent()
     {
 	if(_parent != null)
 	{
-	    if(_instanceId != null)
+	    if(_adapterId != null)
 	    {
 		_model.getRoot().unregisterAdapter(_resolver.find("node"),
-						   _instanceId, this);
+						   _adapterId, this);
 	    }
 	    super.clearParent();
 	}
@@ -235,16 +238,23 @@ class Adapter extends Leaf
 		   newEndpoints);
     }
 
-    AdapterInstanceId getInstanceId()
+    String getAdapterId()
+    {
+	return _adapterId;
+    }
+    
+    String getDefaultAdapterId()
     {
-	return _instanceId;
+	return _defaultAdapterId;
     }
 
+
     public boolean isEphemeral()
     {
 	return _ephemeral;
     }
 
+
     private void createToolTip()
     {
 	if(_proxy == null)
@@ -261,10 +271,12 @@ class Adapter extends Leaf
     private AdapterDescriptor _descriptor;
     private Utils.Resolver _resolver;
 
-    private AdapterInstanceId _instanceId;
     private Ice.ObjectPrx _proxy;
     private String _toolTip;
 
+    private String _adapterId; // resolved adapter id, null when _resolver == null
+    private String _defaultAdapterId;
+
     static private DefaultTreeCellRenderer _cellRenderer;
     static private AdapterEditor _editor;
 }