fixes for abstract type mapping

14 files changed, 26 insertions, 26 deletions

diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java
index 83bcdccc8c3..a3ef527f8f9 100755
--- a/java/src/IceGridGUI/Application/Adapter.java
+++ b/java/src/IceGridGUI/Application/Adapter.java
@@ -22,10 +22,10 @@ class Adapter extends TreeNode implements DescriptorHolder
 	return (AdapterDescriptor)d.clone();

     }

 

-    static public java.util.LinkedList

-    copyDescriptors(java.util.LinkedList descriptors)

+    static public java.util.List

+    copyDescriptors(java.util.List descriptors)

     {

-	java.util.LinkedList copy = new java.util.LinkedList();

+	java.util.List copy = new java.util.LinkedList();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java
index 8b5bec8604c..59a29fbf81d 100755
--- a/java/src/IceGridGUI/Application/Communicator.java
+++ b/java/src/IceGridGUI/Application/Communicator.java
@@ -985,7 +985,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
     {

 	CommunicatorDescriptor descriptor = getCommunicatorDescriptor();

 	removeProperty(key);

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

+	((java.util.LinkedList)descriptor.propertySet.properties).addFirst(new PropertyDescriptor(key, newValue));

     }

 

     void removeProperty(String key)

diff --git a/java/src/IceGridGUI/Application/DbEnv.java b/java/src/IceGridGUI/Application/DbEnv.java
index 01ff345e196..321d2417a1a 100755
--- a/java/src/IceGridGUI/Application/DbEnv.java
+++ b/java/src/IceGridGUI/Application/DbEnv.java
@@ -22,9 +22,9 @@ class DbEnv extends TreeNode implements DescriptorHolder
 	return (DbEnvDescriptor)d.clone();

     }

 

-    static public java.util.LinkedList copyDescriptors(java.util.LinkedList list)

+    static public java.util.List copyDescriptors(java.util.List list)

     {

-	java.util.LinkedList copy = new java.util.LinkedList();

+	java.util.List copy = new java.util.LinkedList();

 	java.util.Iterator p = list.iterator();

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java
index d24e5c580be..c325df8db3e 100755
--- a/java/src/IceGridGUI/Application/Node.java
+++ b/java/src/IceGridGUI/Application/Node.java
@@ -685,7 +685,7 @@ class Node extends TreeNode implements PropertySetParent
 	    //

 	    // Diff variables (TODO: avoid duplication with same code in Root)

 	    //

-	    update.variables = (java.util.TreeMap)_descriptor.variables.clone();

+	    update.variables = new java.util.TreeMap(_descriptor.variables);

 	    java.util.List removeVariables = new java.util.LinkedList();

 

 	    p = _origVariables.entrySet().iterator();

diff --git a/java/src/IceGridGUI/Application/Nodes.java b/java/src/IceGridGUI/Application/Nodes.java
index a687acb8870..a448504b4f6 100755
--- a/java/src/IceGridGUI/Application/Nodes.java
+++ b/java/src/IceGridGUI/Application/Nodes.java
@@ -19,10 +19,10 @@ import IceGridGUI.*;
 

 class Nodes extends ListTreeNode

 {

-    static public java.util.HashMap

+    static public java.util.Map

     copyDescriptors(java.util.Map descriptors)

     {

-	java.util.HashMap copy = new java.util.HashMap();

+	java.util.Map copy = new java.util.HashMap();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/Application/PropertySet.java
index d964ca1ae94..8e6f2474716 100755
--- a/java/src/IceGridGUI/Application/PropertySet.java
+++ b/java/src/IceGridGUI/Application/PropertySet.java
@@ -21,7 +21,7 @@ class PropertySet extends TreeNode
     copyDescriptor(PropertySetDescriptor d)

     {

 	PropertySetDescriptor psd = (PropertySetDescriptor)d.clone();

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

+	psd.properties = new java.util.LinkedList(psd.properties);

 	return psd;

     }

 

diff --git a/java/src/IceGridGUI/Application/PropertySets.java b/java/src/IceGridGUI/Application/PropertySets.java
index bd3d6241e5d..ade88653f2d 100755
--- a/java/src/IceGridGUI/Application/PropertySets.java
+++ b/java/src/IceGridGUI/Application/PropertySets.java
@@ -17,10 +17,10 @@ import IceGridGUI.*;
 

 class PropertySets extends ListTreeNode implements PropertySetParent

 {

-    static public java.util.HashMap

+    static public java.util.Map

     copyDescriptors(java.util.Map descriptors)

     {

-	java.util.HashMap copy = new java.util.HashMap();

+	java.util.Map copy = new java.util.HashMap();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/ReplicaGroups.java b/java/src/IceGridGUI/Application/ReplicaGroups.java
index e5689b1bd67..e0aab5a715e 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroups.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroups.java
@@ -17,10 +17,10 @@ import IceGridGUI.*;
 

 class ReplicaGroups extends ListTreeNode

 {

-    static public java.util.LinkedList

+    static public java.util.List

     copyDescriptors(java.util.List descriptors)

     {

-	java.util.LinkedList copy = new java.util.LinkedList();

+	java.util.List copy = new java.util.LinkedList();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java
index ce6d6f7138a..8c851b77f11 100755
--- a/java/src/IceGridGUI/Application/Root.java
+++ b/java/src/IceGridGUI/Application/Root.java
@@ -572,7 +572,7 @@ public class Root extends ListTreeNode
 	    //

 	    // Diff variables

 	    //

-	    update.variables = (java.util.TreeMap)_descriptor.variables.clone();

+	    update.variables = new java.util.TreeMap(_descriptor.variables);

 	    java.util.List removeVariables = new java.util.LinkedList();

 

 	    java.util.Iterator p = _origVariables.entrySet().iterator();

@@ -1174,7 +1174,7 @@ public class Root extends ListTreeNode
     // Keeps original version (as shallow copies) to be able to build 

     // ApplicationUpdateDescriptor. Only used when _live == true

     //

-    private java.util.TreeMap _origVariables;

+    private java.util.Map _origVariables;

     private String _origDescription;

     private DistributionDescriptor _origDistrib;

 

diff --git a/java/src/IceGridGUI/Application/ServerTemplates.java b/java/src/IceGridGUI/Application/ServerTemplates.java
index d854afbc08d..940ec4628ce 100755
--- a/java/src/IceGridGUI/Application/ServerTemplates.java
+++ b/java/src/IceGridGUI/Application/ServerTemplates.java
@@ -16,10 +16,10 @@ import IceGridGUI.*;
 

 class ServerTemplates extends Templates

 {

-    static public java.util.HashMap

+    static public java.util.Map

     copyDescriptors(java.util.Map descriptors)

     {

-	java.util.HashMap copy = new java.util.HashMap();

+	java.util.Map copy = new java.util.HashMap();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/ServiceInstance.java b/java/src/IceGridGUI/Application/ServiceInstance.java
index 937b3dcae5c..9122e091f1b 100755
--- a/java/src/IceGridGUI/Application/ServiceInstance.java
+++ b/java/src/IceGridGUI/Application/ServiceInstance.java
@@ -33,10 +33,10 @@ class ServiceInstance extends TreeNode implements Service, Cloneable
 	return copy;

     }

     

-    static public java.util.LinkedList

-    copyDescriptors(java.util.LinkedList descriptors)

+    static public java.util.List

+    copyDescriptors(java.util.List descriptors)

     {

-	java.util.LinkedList copy = new java.util.LinkedList();

+	java.util.List copy = new java.util.LinkedList();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/Application/ServiceTemplates.java
index c3e56a2be92..dfdb02cceea 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplates.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplates.java
@@ -20,10 +20,10 @@ import IceGridGUI.*;
 

 class ServiceTemplates extends Templates

 {

-    static public java.util.HashMap

+    static public java.util.Map

     copyDescriptors(java.util.Map descriptors)

     {

-	java.util.HashMap copy = new java.util.HashMap();

+	java.util.Map copy = new java.util.HashMap();

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

 	while(p.hasNext())

 	{

diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java
index 07753bb14a2..2a11e9a4183 100755
--- a/java/src/IceGridGUI/Application/TreeNode.java
+++ b/java/src/IceGridGUI/Application/TreeNode.java
@@ -99,7 +99,7 @@ public abstract class TreeNode extends TreeNodeBase
     }

 

     static void writeVariables(XMLWriter writer, 

-			       java.util.SortedMap variables)

+			       java.util.Map variables)

 	throws java.io.IOException

     {

 	java.util.Iterator p = variables.entrySet().iterator();

diff --git a/java/src/IceGridGUI/RegistryObserverI.java b/java/src/IceGridGUI/RegistryObserverI.java
index dfc0c0420f7..1555fb89a8f 100755
--- a/java/src/IceGridGUI/RegistryObserverI.java
+++ b/java/src/IceGridGUI/RegistryObserverI.java
@@ -58,7 +58,7 @@ class RegistryObserverI extends _RegistryObserverDisp
     }

 

 

-    public synchronized void init(int serial, java.util.LinkedList applications, AdapterInfo[] adapters, 

+    public synchronized void init(int serial, java.util.List applications, AdapterInfo[] adapters, 

 				  ObjectInfo[] objects, Ice.Current current)

     {

 	_initialized = true;

@@ -179,7 +179,7 @@ class RegistryObserverI extends _RegistryObserverDisp
     // Values given to init

     //

     private int _serial;

-    private java.util.LinkedList _applications;

+    private java.util.List _applications;

     private AdapterInfo[] _adapters;

     private ObjectInfo[] _objects;

 };