Changes to allow compiling the GUI with property set descriptor changes.

14 files changed, 90 insertions, 33 deletions

diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java
index c3065cdb32a..a731d5196a4 100755
--- a/java/src/IceGridGUI/Application/Communicator.java
+++ b/java/src/IceGridGUI/Application/Communicator.java
@@ -674,7 +674,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
 	{

 	    ServiceDescriptor sd = 

 		new ServiceDescriptor(new java.util.LinkedList(),

-				      new java.util.LinkedList(),

+				      new PropertySetDescriptor(new String[0], new java.util.LinkedList()),

 				      new java.util.LinkedList(),

 				      "",

 				      "NewService",

@@ -683,7 +683,8 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
 	    ServiceInstanceDescriptor descriptor = 

 		new ServiceInstanceDescriptor("",

 					      new java.util.TreeMap(),

-					      sd);

+					      sd,

+					      new PropertySetDescriptor(new String[0], new java.util.LinkedList()));

 	    newService(descriptor);

 	}

 

@@ -692,7 +693,8 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
 	    ServiceInstanceDescriptor descriptor = 

 		new ServiceInstanceDescriptor("",

 					      new java.util.HashMap(),

-					      null);

+					      null,

+					      new PropertySetDescriptor(new String[0], new java.util.LinkedList()));

 	    newService(descriptor);

 	}

 	

@@ -959,7 +961,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
     String getProperty(String key)

     {

 	CommunicatorDescriptor descriptor = getCommunicatorDescriptor();

-	java.util.Iterator p = descriptor.properties.iterator();

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

 	while(p.hasNext())

 	{

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

@@ -975,13 +977,13 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
     {

 	CommunicatorDescriptor descriptor = getCommunicatorDescriptor();

 	removeProperty(key);

-	descriptor.properties.add(new PropertyDescriptor(key, newValue));

+	descriptor.propertySet.properties.add(new PropertyDescriptor(key, newValue));

     }

 

     void removeProperty(String key)

     {

 	CommunicatorDescriptor descriptor = getCommunicatorDescriptor();

-	java.util.Iterator p = descriptor.properties.iterator();

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

 	while(p.hasNext())

 	{

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

diff --git a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java
index 74506ad0f16..32429c9e3bb 100755
--- a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java
+++ b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java
@@ -85,7 +85,10 @@ class CommunicatorSubEditor
 

     void writeDescriptor(CommunicatorDescriptor descriptor)

     {

-	descriptor.properties = Editor.mapToProperties(_propertiesMap);

+	//

+	// TODO: BENOIT: Add support for property set.

+	//

+	descriptor.propertySet = new PropertySetDescriptor(new String[0], Editor.mapToProperties(_propertiesMap));

 	descriptor.description = _description.getText();

     }

 

@@ -94,7 +97,10 @@ class CommunicatorSubEditor
 	Utils.Resolver detailResolver = _mainEditor.getDetailResolver();

 	isEditable = isEditable && (detailResolver == null);

 

-	_propertiesMap = Editor.propertiesToMap(descriptor.properties, detailResolver);

+	//

+	// TODO: BENOIT: Add support for property set.

+	//

+	_propertiesMap = Editor.propertiesToMap(descriptor.propertySet.properties, detailResolver);

 	setPropertiesField();

 	_propertiesButton.setEnabled(isEditable);

 	

diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java
index 4046099b7c7..9bc7c08a091 100755
--- a/java/src/IceGridGUI/Application/Node.java
+++ b/java/src/IceGridGUI/Application/Node.java
@@ -121,7 +121,8 @@ class Node extends ListTreeNode
     {

 	ServerInstanceDescriptor descriptor = 

 	    new ServerInstanceDescriptor("",

-					 new java.util.HashMap());

+					 new java.util.HashMap(),

+					 new PropertySetDescriptor(new String[0], new java.util.LinkedList()));

 

 	newServer(descriptor);

     }

diff --git a/java/src/IceGridGUI/Application/Nodes.java b/java/src/IceGridGUI/Application/Nodes.java
index 51e2fa2c410..95748f2beb8 100755
--- a/java/src/IceGridGUI/Application/Nodes.java
+++ b/java/src/IceGridGUI/Application/Nodes.java
@@ -73,8 +73,8 @@ class Nodes extends ListTreeNode
 		    new java.util.LinkedList(),

 		    new java.util.LinkedList(),

 		    "",

-		    ""

-		    ));

+		    "",

+		    new java.util.HashMap()));

     }

     

     Nodes(TreeNode parent, java.util.Map descriptors)

@@ -221,11 +221,15 @@ class Nodes extends ListTreeNode
 

 	    if(node == null)

 	    {

+		//

+		// TODO: BENOIT: Add support for property sets

+		//

 		NodeDescriptor nodeDescriptor = new NodeDescriptor(update.variables,

 								   update.serverInstances,

 								   update.servers,

 								   update.loadFactor.value,

-								   update.description.value);

+								   update.description.value,

+								   new java.util.HashMap());

 		_descriptors.put(update.name, nodeDescriptor);

 		node = new Node(false, this, update.name, nodeDescriptor);

 		newChildren.add(node);

diff --git a/java/src/IceGridGUI/Application/Server.java b/java/src/IceGridGUI/Application/Server.java
index f327d8b41ef..dd02f8251de 100755
--- a/java/src/IceGridGUI/Application/Server.java
+++ b/java/src/IceGridGUI/Application/Server.java
@@ -41,7 +41,9 @@ class Server extends Communicator implements TemplateInstance
 	// Update to properties is not atomic because of Adapter endpoints

 	// (and possibly other properties set through a PropertiesHolder)

 	//

-	copy.properties = (java.util.LinkedList)copy.properties.clone();

+	copy.propertySet = (PropertySetDescriptor)copy.propertySet.clone();

+	copy.propertySet.references = (String[])copy.propertySet.references.clone();

+	copy.propertySet.properties = (java.util.LinkedList)copy.propertySet.properties.clone();

 	copy.distrib = (DistributionDescriptor)copy.distrib.clone();

 

 	if(copy instanceof IceBoxDescriptor)

@@ -63,7 +65,7 @@ class Server extends Communicator implements TemplateInstance
 	//

 	// When editing a server or server template, if we update properties, 

 	// we replace the entire field

-	into.properties = from.properties;

+	into.propertySet = from.propertySet;

 

 	into.description = from.description;

 	into.id = from.id;

@@ -82,7 +84,7 @@ class Server extends Communicator implements TemplateInstance
     {

 	return new ServerDescriptor(

 	    new java.util.LinkedList(),

-	    new java.util.LinkedList(),

+	    new PropertySetDescriptor(new String[0], new java.util.LinkedList()),

 	    new java.util.LinkedList(),

 	    "",

 	    "NewServer",

@@ -120,7 +122,7 @@ class Server extends Communicator implements TemplateInstance
 

 	return new IceBoxDescriptor(

 	    adapterList,

-	    properties,

+	    new PropertySetDescriptor(new String[0], properties),

 	    new java.util.LinkedList(),

 	    "",

 	    "NewIceBox",

@@ -452,7 +454,10 @@ class Server extends Communicator implements TemplateInstance
 		}

 		writeOptions(writer, _serverDescriptor.options);

 		writeEnvs(writer, _serverDescriptor.envs);

-		writeProperties(writer, _serverDescriptor.properties);

+		//

+		// TODO: BENOIT: Add refernces

+		//

+		writeProperties(writer, _serverDescriptor.propertySet.properties);

 		writeDistribution(writer, _serverDescriptor.distrib);

 

 		_adapters.write(writer);

@@ -470,7 +475,10 @@ class Server extends Communicator implements TemplateInstance
 		

 		writeOptions(writer, _serverDescriptor.options);

 		writeEnvs(writer, _serverDescriptor.envs);

-		writeProperties(writer, _serverDescriptor.properties);

+		//

+		// TODO: BENOIT: Add references

+		//

+		writeProperties(writer, _serverDescriptor.propertySet.properties);

 		writeDistribution(writer, _serverDescriptor.distrib);

 

 		_adapters.write(writer);

diff --git a/java/src/IceGridGUI/Application/ServerTemplate.java b/java/src/IceGridGUI/Application/ServerTemplate.java
index 580bf8f77f1..addabdd722d 100755
--- a/java/src/IceGridGUI/Application/ServerTemplate.java
+++ b/java/src/IceGridGUI/Application/ServerTemplate.java
@@ -252,7 +252,10 @@ class ServerTemplate extends Communicator
 		}

 		Server.writeOptions(writer, descriptor.options);

 		Server.writeEnvs(writer, descriptor.envs);

-		writeProperties(writer, descriptor.properties);

+		//

+		// TODO: BENOIT: add references

+		//

+		writeProperties(writer, descriptor.propertySet.properties);

 		writeDistribution(writer, descriptor.distrib);

 

 		_adapters.write(writer);

@@ -272,7 +275,10 @@ class ServerTemplate extends Communicator
 		}

 		Server.writeOptions(writer, descriptor.options);

 		Server.writeEnvs(writer, descriptor.envs);

-		writeProperties(writer, descriptor.properties);

+		//

+		// TODO: BENOIT: Add references

+		//

+		writeProperties(writer, descriptor.propertySet.properties);

 		writeDistribution(writer, descriptor.distrib);

 

 		_adapters.write(writer);

diff --git a/java/src/IceGridGUI/Application/ServerTemplates.java b/java/src/IceGridGUI/Application/ServerTemplates.java
index 735fe38218c..9141a0ae058 100755
--- a/java/src/IceGridGUI/Application/ServerTemplates.java
+++ b/java/src/IceGridGUI/Application/ServerTemplates.java
@@ -67,14 +67,16 @@ class ServerTemplates extends Templates
 	newServerTemplate(new TemplateDescriptor(

 			      Server.newServerDescriptor(), 

 			      new java.util.LinkedList(),

-			      new java.util.TreeMap()));

+			      new java.util.TreeMap(),

+			      new java.util.HashMap()));

     }

     public void newTemplateServerIceBox()

     {

 	newServerTemplate(new TemplateDescriptor(

 			      Server.newIceBoxDescriptor(), 

 			      new java.util.LinkedList(),

-			      new java.util.TreeMap()));

+			      new java.util.TreeMap(),

+			      new java.util.HashMap()));

     }

     public void paste()

     {

diff --git a/java/src/IceGridGUI/Application/Service.java b/java/src/IceGridGUI/Application/Service.java
index b15c1c9ac0e..7a4baa28d21 100755
--- a/java/src/IceGridGUI/Application/Service.java
+++ b/java/src/IceGridGUI/Application/Service.java
@@ -42,7 +42,11 @@ class Service extends Communicator implements Cloneable, TemplateInstance
 	// Update to properties is not atomic because of Adapter endpoints

 	// (and possibly other properties set through a PropertiesHolder)

 	//

-	copy.properties = (java.util.LinkedList)copy.properties.clone();

+	//

+	// TODO: BENOIT: Add support for property set.

+	//

+	copy.propertySet = new PropertySetDescriptor(new String[0], 

+						     (java.util.LinkedList)copy.propertySet.properties.clone());

 	return copy;

     }

     

@@ -173,7 +177,11 @@ class Service extends Communicator implements Cloneable, TemplateInstance
 	_instanceDescriptor.parameterValues = sd.parameterValues;

 	if(_instanceDescriptor.descriptor != null)

 	{

-	    _instanceDescriptor.descriptor.properties = sd.descriptor.properties;

+	    //

+	    // TODO: BENOIT: Add support for property set.

+	    //

+	    _instanceDescriptor.descriptor.propertySet = 

+		new PropertySetDescriptor(new String[0], sd.descriptor.propertySet.properties);

 	    _instanceDescriptor.descriptor.description = sd.descriptor.description;

 	    

 	    _instanceDescriptor.descriptor.name = sd.descriptor.name;

@@ -440,7 +448,10 @@ class Service extends Communicator implements Cloneable, TemplateInstance
 		{

 		    writer.writeElement("description", _serviceDescriptor.description);

 		}

-		writeProperties(writer, _serviceDescriptor.properties);

+		//

+		// TODO: BENOIT: Add support for property set.

+		//

+		writeProperties(writer, _serviceDescriptor.propertySet.properties);

 		_adapters.write(writer);

 		_dbEnvs.write(writer);

 		writer.writeEndTag("service");

diff --git a/java/src/IceGridGUI/Application/ServiceTemplate.java b/java/src/IceGridGUI/Application/ServiceTemplate.java
index 2b17f26bec1..f1c18c788de 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplate.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplate.java
@@ -146,7 +146,10 @@ class ServiceTemplate extends Communicator
 	    {

 		writer.writeElement("description", descriptor.description);

 	    }

-	    writeProperties(writer, descriptor.properties);

+	    //

+	    // TODO: BENOIT: Add references

+	    //

+	    writeProperties(writer, descriptor.propertySet.properties);

 	    _adapters.write(writer);

 	    _dbEnvs.write(writer);

 	    writer.writeEndTag("service");

@@ -248,7 +251,10 @@ class ServiceTemplate extends Communicator
 	ServiceDescriptor sd = (ServiceDescriptor)_templateDescriptor.descriptor;

 	ServiceDescriptor csd = (ServiceDescriptor)clone.descriptor;

 

-	sd.properties = csd.properties;

+	//

+	// TODO: BENOIT: Add references

+	//

+	sd.propertySet.properties = csd.propertySet.properties;

 	sd.description = csd.description;

 	sd.name = csd.name;

 	sd.entry = csd.entry;

diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/Application/ServiceTemplates.java
index 2c8386f89d6..4dc9f5d3ac4 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplates.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplates.java
@@ -68,14 +68,14 @@ class ServiceTemplates extends Templates
     {

 	ServiceDescriptor sd = new ServiceDescriptor(

 	    new java.util.LinkedList(),

-	    new java.util.LinkedList(),

+	    new PropertySetDescriptor(new String[0], new java.util.LinkedList()),

 	    new java.util.LinkedList(),

 	    "",

 	    "",

 	    "");

 	    

 	newServiceTemplate(new TemplateDescriptor(

-			       sd, new java.util.LinkedList(), new java.util.TreeMap()));

+			       sd, new java.util.LinkedList(), new java.util.TreeMap(), new java.util.HashMap()));

 

     }

     public void paste()

diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java
index afe749c2153..5b57c8fbad7 100755
--- a/java/src/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/Coordinator.java
@@ -1555,7 +1555,8 @@ public class Coordinator
 								 new java.util.HashMap(),

 								 new IceGrid.DistributionDescriptor(

 								     "", new java.util.LinkedList()),

-								"");

+								"",

+								new java.util.HashMap());

 	IceGridGUI.Application.Root root = new IceGridGUI.Application.Root(this, desc);

 	ApplicationPane app = new ApplicationPane(root);

 	_mainPane.addApplication(app);

diff --git a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java
index 529df24c3ae..b91521d8c2d 100755
--- a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java
@@ -48,8 +48,11 @@ class CommunicatorEditor extends Editor
     protected void show(CommunicatorDescriptor descriptor, Utils.Resolver resolver)

     {

 	_description.setText(resolver.substitute(descriptor.description));

+	//

+	// TODO: BENOIT: Add support for property set.

+	//

 	_propertiesModel.setDataVector(

-	    mapToVector(propertiesToMap(descriptor.properties, resolver)),

+	    mapToVector(propertiesToMap(descriptor.propertySet.properties, resolver)),

 	    _columnNames);

 

 	DefaultTableCellRenderer cr = (DefaultTableCellRenderer)

diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java
index dbd8d2a3114..3483521f9d1 100755
--- a/java/src/IceGridGUI/LiveDeployment/Node.java
+++ b/java/src/IceGridGUI/LiveDeployment/Node.java
@@ -175,12 +175,16 @@ class Node extends ListTreeNode
     {

 	super(parent, update.name);

 

+	//

+	// TODO: BENOIT: Add support for property sets.

+	//

 	NodeDescriptor nodeDesc = new NodeDescriptor(

 	    update.variables,

 	    update.serverInstances,

 	    update.servers,

 	    update.loadFactor.value,

-	    update.description.value);

+	    update.description.value,

+	    new java.util.HashMap());

 	    

 	appDesc.nodes.put(_id, nodeDesc);

 	add(appDesc, nodeDesc);

diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index 96a509a9351..e2b58a05788 100755
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -585,7 +585,10 @@ class Server extends ListArrayTreeNode
 

     String getProperty(String name)

     {

-	java.util.Iterator p = _serverDescriptor.properties.iterator();

+	//

+	// TODO: BENOIT: Add support for property set.

+	//

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

 	while(p.hasNext())

 	{

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