1 files changed, 5 insertions, 4 deletions
diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java
index 4971dac326d..75f33819ea7 100755
--- a/java/src/IceGridGUI/Application/TreeNode.java
+++ b/java/src/IceGridGUI/Application/TreeNode.java
@@ -230,7 +230,7 @@ public abstract class TreeNode extends TreeNodeBase
 				java.util.Map defaultValues)
 	throws java.io.IOException
     {
-	java.util.Iterator p = parameters.iterator();
+	java.util.Iterator p = new java.util.LinkedHashSet(parameters).iterator();
 	while(p.hasNext())
 	{
 	    String parameter = (String)p.next();
@@ -251,7 +251,10 @@ public abstract class TreeNode extends TreeNodeBase
     {
 	java.util.LinkedList result = new java.util.LinkedList();
 
-	java.util.Iterator p = parameters.iterator();
+	//
+	// We use a LinkedHashSet to maintain order while eliminating duplicates
+	//
+	java.util.Iterator p = new java.util.LinkedHashSet(parameters).iterator();
 	while(p.hasNext())
 	{
 	    String param = (String)p.next();
@@ -264,8 +267,6 @@ public abstract class TreeNode extends TreeNodeBase
 	return result;
     }
 
-  
-
     //
     // Actions
     //