diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-09-15 19:37:33 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-09-15 19:37:33 +0000 |
| commit | 9b65d302d076197c9c1bdfc8428dc354c82e42a0 (patch) | |
| tree | 31c53ebd8dc658603f449a98348d47e770925091 /java/src/IceGridGUI/Application | |
| parent | Fix (diff) | |
| download | ice-9b65d302d076197c9c1bdfc8428dc354c82e42a0.tar.bz2 ice-9b65d302d076197c9c1bdfc8428dc354c82e42a0.tar.xz ice-9b65d302d076197c9c1bdfc8428dc354c82e42a0.zip | |
Merged fixes from 3.1 branch
Diffstat (limited to 'java/src/IceGridGUI/Application')
| -rwxr-xr-x | java/src/IceGridGUI/Application/Root.java | 16 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/Application/TreeNode.java | 9 |
2 files changed, 21 insertions, 4 deletions
diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java index 0e4f904c709..47fe70decf0 100755 --- a/java/src/IceGridGUI/Application/Root.java +++ b/java/src/IceGridGUI/Application/Root.java @@ -472,6 +472,14 @@ public class Root extends ListTreeNode //
_coordinator.accessDenied(e);
}
+ catch(Ice.LocalException e)
+ {
+ JOptionPane.showMessageDialog(
+ _coordinator.getMainFrame(),
+ e.toString(),
+ "Communication Exception",
+ JOptionPane.ERROR_MESSAGE);
+ }
finally
{
_coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
@@ -488,6 +496,14 @@ public class Root extends ListTreeNode {
_coordinator.accessDenied(e);
}
+ catch(Ice.LocalException e)
+ {
+ JOptionPane.showMessageDialog(
+ _coordinator.getMainFrame(),
+ e.toString(),
+ "Communication Exception",
+ JOptionPane.ERROR_MESSAGE);
+ }
}
public void saveToFile()
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
//
|