More fixes

11 files changed, 155 insertions, 41 deletions

diff --git a/java/src/IceGrid/TreeNode/Adapter.java b/java/src/IceGrid/TreeNode/Adapter.java
index daf8ebdefa1..4057169999e 100755
--- a/java/src/IceGrid/TreeNode/Adapter.java
+++ b/java/src/IceGrid/TreeNode/Adapter.java
@@ -11,6 +11,7 @@ package IceGrid.TreeNode;
 import java.awt.Component;

 import javax.swing.JButton;

 import javax.swing.JCheckBox;

+import javax.swing.JComboBox;

 import javax.swing.JComponent;

 import javax.swing.JScrollPane;

 import javax.swing.JTextField;

@@ -51,8 +52,8 @@ class Adapter extends Leaf
 		builder.append(_name, 3);

 		builder.nextLine();

 		

-		builder.append("Id" );

-		builder.append(_id, 3);

+		builder.append("Id", _id );

+		builder.append(_idButton);

 		builder.nextLine();

 		

 		builder.append("Endpoints" );

@@ -81,28 +82,47 @@ class Adapter extends Leaf
 	    _adapter = adapter;

 	    AdapterDescriptor descriptor = adapter.getDescriptor();

 

-	    boolean editable = adapter.isEditable();

-	    final Utils.Resolver resolver = adapter.getResolver();

+	    final Utils.Resolver resolver = adapter.getModel().substitute() ? adapter.getResolver() : null;

+	    boolean editable = adapter.isEditable() && resolver == null;

 

 	    _name.setText(

 		Utils.substitute(descriptor.name, resolver));

 	    _name.setEditable(editable);

 

-	    _id.setText(

-		Utils.substitute(descriptor.id, resolver));

+	    ReplicatedAdapters replicatedAdapters =

+		adapter.getApplication().getReplicatedAdapters();

+	    _id.setModel(replicatedAdapters.createComboBoxModel());

+

+	    String adapterId = Utils.substitute(descriptor.id, resolver);

+	    ReplicatedAdapter replicatedAdapter = 

+		(ReplicatedAdapter) replicatedAdapters.findChild(adapterId);

+	    

+	    if(replicatedAdapter != null)

+	    {

+		_id.setSelectedItem(replicatedAdapter);

+	    }

+	    else

+	    {

+		_id.setSelectedItem(adapterId);

+	    }

 	    _id.setEditable(editable);

+	    _id.setEnabled(editable);

+	   

+	    _endpoints.setText(

+		Utils.substitute(adapter.getEndpoints(), resolver));

+	    _endpoints.setEditable(editable);

 

 	    Ice.StringHolder toolTipHolder = new Ice.StringHolder();

-	   

+

 	    Utils.Stringifier stringifier = new Utils.Stringifier()

 	    {

 		public String toString(Object obj)

 		{

 		    ObjectDescriptor od = (ObjectDescriptor)obj;

-		    Ice.Identity sid = new Ice.Identity(

-			Utils.substitute(od.id.name, resolver),

-			Utils.substitute(od.id.category, resolver));

-

+		    Ice.Identity sid =

+			sid = new Ice.Identity(

+			    Utils.substitute(od.id.name, resolver),

+			    Utils.substitute(od.id.category, resolver));

 		    return Ice.Util.identityToString(sid)

 			+ " as '"

 			+ Utils.substitute(od.type, resolver)

@@ -126,12 +146,13 @@ class Adapter extends Leaf
 	}

 

 	private JTextField _name = new JTextField(20);

-	private JTextField _id = new JTextField(20);

+	private JComboBox _id = new JComboBox();

 	private JTextField _endpoints = new JTextField(20);

 	private JCheckBox _registerProcess = new JCheckBox("Register Process");

-	private JCheckBox _waitForActivation = new JCheckBox("Wait for me");

+	private JCheckBox _waitForActivation = new JCheckBox("Wait for Activation");

 	private JTextField _objects = new JTextField(20);

 	private JButton _objectsButton = new JButton("...");

+	private JButton _idButton = new JButton("->");

 

 	private Adapter _adapter;

 	private JScrollPane _scrollPane;

@@ -235,6 +256,23 @@ class Adapter extends Leaf
 	return _editable;

     }

 

+    String getEndpoints()

+    {

+	PropertiesHolder ph = (PropertiesHolder)getParent().getParent();

+	return ph.get(_descriptor.name + ".Endpoints");

+    }

+

+    void setEndpoints(String newEndpoints)

+    {

+	PropertiesHolder ph = (PropertiesHolder)getParent().getParent();

+	ph.put(_descriptor.name + ".Endpoints", newEndpoints);

+    }

+

+    Application getApplication()

+    {

+	return (Application)_path.getPath()[1];

+    }

+

     private void createToolTip()

     {

 	if(_proxy == null)

diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index efb03b7ce82..07501665182 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -138,6 +138,11 @@ class Application extends Parent
 	return _serverTemplates;

     }

 

+    ReplicatedAdapters getReplicatedAdapters()

+    {

+	return _replicatedAdapters;

+    }

+

     //

     // Should only be used for reading

     //

diff --git a/java/src/IceGrid/TreeNode/CommonBase.java b/java/src/IceGrid/TreeNode/CommonBase.java
index 4b6dff10522..24c4357482a 100755
--- a/java/src/IceGrid/TreeNode/CommonBase.java
+++ b/java/src/IceGrid/TreeNode/CommonBase.java
@@ -15,6 +15,8 @@ import javax.swing.JPanel;
 

 import com.jgoodies.uif_lite.panel.SimpleInternalFrame;

 

+import IceGrid.Model;

+

 //

 // CommonBase is similar to javax.swing.tree.TreeNode

 //

@@ -31,7 +33,8 @@ public interface CommonBase extends TreeCellRenderer
     //

     String getId();

 

-    

+    Model getModel();

+

     //

     // Clean-up when removed from the tree

     //

diff --git a/java/src/IceGrid/TreeNode/CommonBaseI.java b/java/src/IceGrid/TreeNode/CommonBaseI.java
index 74253d9a2e8..8b601197a17 100755
--- a/java/src/IceGrid/TreeNode/CommonBaseI.java
+++ b/java/src/IceGrid/TreeNode/CommonBaseI.java
@@ -185,7 +185,7 @@ abstract class CommonBaseI implements CommonBase
 	}

     }

 

-    Model getModel()

+    public Model getModel()

     {

 	return _model;

     }

diff --git a/java/src/IceGrid/TreeNode/Parent.java b/java/src/IceGrid/TreeNode/Parent.java
index 017df494734..46b36a597d4 100755
--- a/java/src/IceGrid/TreeNode/Parent.java
+++ b/java/src/IceGrid/TreeNode/Parent.java
@@ -44,6 +44,7 @@ class Parent extends CommonBaseI
 	public void setSelectedItem(Object obj)

 	{

 	    _selectedItem = obj;

+	    fireContentsChanged(this, -1, -1);

 	}

 

 	private Object _selectedItem;

@@ -441,7 +442,7 @@ class Parent extends CommonBaseI
 	_model.getTreeModel().fireNodesRemovedEvent(event);

     }

 

-    javax.swing.ComboBoxModel getComboBoxModel()

+    javax.swing.ComboBoxModel createComboBoxModel()

     {

 	return new ComboBoxModel();

     }

diff --git a/java/src/IceGrid/TreeNode/PropertiesHolder.java b/java/src/IceGrid/TreeNode/PropertiesHolder.java
new file mode 100755
index 00000000000..27cef9dc611
--- /dev/null
+++ b/java/src/IceGrid/TreeNode/PropertiesHolder.java
@@ -0,0 +1,61 @@
+// **********************************************************************

+//

+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.

+//

+// This copy of Ice is licensed to you under the terms described in the

+// ICE_LICENSE file included in this distribution.

+//

+// **********************************************************************

+package IceGrid.TreeNode;

+

+import IceGrid.CommunicatorDescriptor;

+import IceGrid.Model;

+import IceGrid.PropertyDescriptor;

+

+class PropertiesHolder extends Parent

+{

+    String get(String key)

+    {

+	assert _descriptor != null;

+

+	java.util.Iterator p = _descriptor.properties.iterator();

+	while(p.hasNext())

+	{

+	    PropertyDescriptor pd = (PropertyDescriptor)p.next();

+	    if(pd.name.equals(key))

+	    {

+		return pd.value;

+	    }

+	}

+	return null;

+    }

+

+    void put(String key, String value)

+    {

+	//

+	// TODO mark-modified?

+	//

+

+	assert _descriptor != null;

+	

+	java.util.Iterator p = _descriptor.properties.iterator();

+	while(p.hasNext())

+	{

+	    PropertyDescriptor pd = (PropertyDescriptor)p.next();

+	    if(pd.name.equals(key))

+	    {

+		pd.value = value;

+		return;

+	    }

+	}

+	_descriptor.properties.add(new PropertyDescriptor(key, value));

+    }

+

+    PropertiesHolder(String id, Model model)

+    {

+	super(id, model);

+    }

+

+    protected CommunicatorDescriptor _descriptor;

+

+}

diff --git a/java/src/IceGrid/TreeNode/ReplicatedAdapters.java b/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
index 608efc32c5b..3c0bcc1a7fd 100755
--- a/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
+++ b/java/src/IceGrid/TreeNode/ReplicatedAdapters.java
@@ -8,6 +8,8 @@
 // **********************************************************************

 package IceGrid.TreeNode;

 

+import javax.swing.AbstractListModel;

+

 import IceGrid.ReplicatedAdapterDescriptor;

 import IceGrid.Model;

 import IceGrid.Utils;

@@ -23,9 +25,6 @@ class ReplicatedAdapters extends Parent
 	    ReplicatedAdapterDescriptor descriptor 

 		= (ReplicatedAdapterDescriptor)p.next();

 	    

-	    //

-	    // TODO: need to substitute id?

-	    //

 	    addChild(new ReplicatedAdapter(descriptor, _model));

 	}

     }

diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index 7b4e1cd8847..b799e49c786 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -40,6 +40,7 @@ import com.jgoodies.uif_lite.panel.SimpleInternalFrame;
 

 import IceGrid.IceBoxDescriptor;

 import IceGrid.Model;

+import IceGrid.PropertyDescriptor;

 import IceGrid.TemplateDescriptor;

 import IceGrid.TreeModelI;

 import IceGrid.ServerDescriptor;

@@ -55,7 +56,7 @@ import IceGrid.Utils;
 // - Server instance

 // - Icebox instance

 //

-class Server extends Parent

+class Server extends PropertiesHolder

 {

     static class Editor

     {

@@ -306,7 +307,7 @@ class Server extends Parent
 	// Pick the appropriate editor

 	//

 	Editor editor = null;

-	if(_instanceDescriptor != null || _model.substituteVariables())

+	if(_instanceDescriptor != null || _model.substitute())

 	{

 	    if(_editor == null)

 	    {

@@ -409,6 +410,7 @@ class Server extends Parent
 	_resolver = resolver;

 	_instanceDescriptor = instanceDescriptor;

 	_serverDescriptor = serverDescriptor;

+	_descriptor = serverDescriptor;

 

 	clearChildren();

 	

diff --git a/java/src/IceGrid/TreeNode/ServerTemplate.java b/java/src/IceGrid/TreeNode/ServerTemplate.java
index b6f38b951ef..6c050a01d6c 100755
--- a/java/src/IceGrid/TreeNode/ServerTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServerTemplate.java
@@ -41,7 +41,7 @@ import IceGrid.TemplateDescriptor;
 import IceGrid.Utils;

 

 

-class ServerTemplate extends Parent

+class ServerTemplate extends PropertiesHolder

 {

     

     //

@@ -55,23 +55,24 @@ class ServerTemplate extends Parent
 

     void rebuild(TemplateDescriptor descriptor, Application application)

     {

-	_descriptor = descriptor;

+	_templateDescriptor = descriptor;

+	_descriptor = _templateDescriptor.descriptor;

 	clearChildren();

 

 	//

 	// Fix-up parameters order

 	//

-	java.util.Collections.sort(_descriptor.parameters);

+	java.util.Collections.sort(_templateDescriptor.parameters);

 	

-	if(_descriptor.descriptor instanceof IceBoxDescriptor)

+	if(_templateDescriptor.descriptor instanceof IceBoxDescriptor)

 	{

-	    _iceBoxDescriptor = (IceBoxDescriptor)_descriptor.descriptor;

+	    _iceBoxDescriptor = (IceBoxDescriptor)_templateDescriptor.descriptor;

 	    

 	    _services = new Services(_iceBoxDescriptor.services, true, null, 

 				     application);

 	    addChild(_services);

 

-	    assert _descriptor.descriptor.dbEnvs.size() == 0;

+	    assert _templateDescriptor.descriptor.dbEnvs.size() == 0;

 	    _dbEnvs = null;

 	}

 	else

@@ -79,12 +80,12 @@ class ServerTemplate extends Parent
 	    _services = null;

 	    _iceBoxDescriptor = null;

 

-	    _dbEnvs = new DbEnvs(_descriptor.descriptor.dbEnvs, true,

+	    _dbEnvs = new DbEnvs(_templateDescriptor.descriptor.dbEnvs, true,

 			     null, _model);

 	    addChild(_dbEnvs);

 	}

 	

-	_adapters = new Adapters(_descriptor.descriptor.adapters, true, 

+	_adapters = new Adapters(_templateDescriptor.descriptor.adapters, true, 

 				 null, _model);

 	addChild(_adapters);

     }

@@ -92,15 +93,15 @@ class ServerTemplate extends Parent
 

     public String toString()

     {

-	return templateLabel(_id, _descriptor.parameters);

+	return templateLabel(_id, _templateDescriptor.parameters);

     }

 

     public TemplateDescriptor getDescriptor()

     {

-	return _descriptor;

+	return _templateDescriptor;

     }

 

-    private TemplateDescriptor _descriptor;

+    private TemplateDescriptor _templateDescriptor;

     private IceBoxDescriptor _iceBoxDescriptor;

 

     private Services _services;

diff --git a/java/src/IceGrid/TreeNode/Service.java b/java/src/IceGrid/TreeNode/Service.java
index c1391d9ed2c..53261c292df 100755
--- a/java/src/IceGrid/TreeNode/Service.java
+++ b/java/src/IceGrid/TreeNode/Service.java
@@ -14,7 +14,7 @@ import IceGrid.ServiceInstanceDescriptor;
 import IceGrid.TemplateDescriptor;

 import IceGrid.Utils;

 

-class Service extends Parent

+class Service extends PropertiesHolder

 {

     Service(String name,

 	    String displayString,

@@ -28,10 +28,13 @@ class Service extends Parent
 	_displayString = displayString;

 	_instanceDescriptor = instanceDescriptor;

 	_serviceDescriptor = serviceDescriptor;

+	_descriptor = serviceDescriptor;

+

 	_editable = editable;

 	_resolver = resolver;

 

-	boolean childrenEditable = _editable && (_instanceDescriptor == null);

+	boolean childrenEditable = _editable && 

+	    (_instanceDescriptor.template.length() == 0);

 

 	_adapters = new Adapters(serviceDescriptor.adapters, 

 				 childrenEditable, resolver, _model);

diff --git a/java/src/IceGrid/TreeNode/ServiceTemplate.java b/java/src/IceGrid/TreeNode/ServiceTemplate.java
index 91738d220d1..bfc0c177609 100755
--- a/java/src/IceGrid/TreeNode/ServiceTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServiceTemplate.java
@@ -11,7 +11,7 @@ package IceGrid.TreeNode;
 import IceGrid.TemplateDescriptor;

 import IceGrid.Model;

 

-class ServiceTemplate extends Parent

+class ServiceTemplate extends PropertiesHolder

 {

     ServiceTemplate(String name, TemplateDescriptor descriptor, Model model)

     {

@@ -21,29 +21,30 @@ class ServiceTemplate extends Parent
 

     void rebuild(TemplateDescriptor descriptor)

     {

-	_descriptor = descriptor;

+	_templateDescriptor = descriptor;

+	_descriptor = _templateDescriptor.descriptor;

 	clearChildren();

 

 	//

 	// Fix-up parameters order

 	//

-	java.util.Collections.sort(_descriptor.parameters);

+	java.util.Collections.sort(_templateDescriptor.parameters);

 	

-	_adapters = new Adapters(_descriptor.descriptor.adapters, true, 

+	_adapters = new Adapters(_templateDescriptor.descriptor.adapters, true, 

 				 null, _model);

 	addChild(_adapters);

 

-	_dbEnvs = new DbEnvs(_descriptor.descriptor.dbEnvs, true,

+	_dbEnvs = new DbEnvs(_templateDescriptor.descriptor.dbEnvs, true,

 			     null, _model);

 	addChild(_dbEnvs);

     }

 

     public String toString()

     {

-	return templateLabel(_id, _descriptor.parameters);

+	return templateLabel(_id, _templateDescriptor.parameters);

     }

 

-    private TemplateDescriptor _descriptor;

+    private TemplateDescriptor _templateDescriptor;

     private Adapters _adapters;

     private DbEnvs _dbEnvs;

 }