More fixes

1 files changed, 7 insertions, 43 deletions

diff --git a/java/src/IceGrid/TreeNode/Adapters.java b/java/src/IceGrid/TreeNode/Adapters.java
index be467bc29a7..a7482fac2c4 100755
--- a/java/src/IceGrid/TreeNode/Adapters.java
+++ b/java/src/IceGrid/TreeNode/Adapters.java
@@ -14,56 +14,20 @@ import IceGrid.Utils;
 

 class Adapters extends Parent

 {

-    //

-    // In server or service template

-    //

-    Adapters(java.util.List descriptors, Model model)

-    {

-	this(descriptors, true, null, model);

-    }

-    

-    //

-    // In server or service instance

-    //

     Adapters(java.util.List descriptors, boolean editable, 

-	     java.util.Map[] variables,

-	     Model model)

+	     Utils.Resolver resolver, Model model)

     {

 	super("Adapters", model);

-	_descriptors = descriptors;

-	_editable = editable;

-	_variables = variables;

-

-	java.util.Iterator p = _descriptors.iterator();

+	java.util.Iterator p = descriptors.iterator();

 	while(p.hasNext())

 	{

 	    AdapterDescriptor descriptor = (AdapterDescriptor)p.next();

 	    

-	    String adapterName = descriptor.name;

-	    if(_variables != null)

-	    {

-		adapterName = Utils.substituteVariables(adapterName, 

-							_variables);

-	    }

-

-	    Adapter child = new Adapter(adapterName, descriptor, 

-					_editable, _variables, 

-					_model);

-	    addChild(child);

-	}

-    }

-

-    void unregisterAll()

-    {

-	java.util.Iterator p = _children.iterator();

-	while(p.hasNext())

-	{

-	    Adapter adapter = (Adapter)p.next();

-	    adapter.unregister();

+	    String adapterName = Utils.substitute(descriptor.name,

+						  resolver);

+	    

+	    addChild(new Adapter(adapterName, descriptor, editable, 

+				 resolver, _model));

 	}

     }

-

-    private java.util.List _descriptors;

-    private boolean _editable;

-    private java.util.Map[] _variables;

 }