changeset 7714:079bbd366f09

Merge
author asaha
date Mon, 08 Sep 2014 13:53:15 -0700
parents 3e30eac7db94 657506e8095e
children 8b4c3989a112
files .hgtags
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Sep 02 13:05:37 2014 -0700
+++ b/.hgtags	Mon Sep 08 13:53:15 2014 -0700
@@ -485,6 +485,7 @@
 919e84964279a058da2c8d4088c570c19543979f jdk7u71-b10
 1108ab8e3dce0318529b4bcda46ce895659bb09b jdk7u71-b11
 ae4e88c495851c43862e2fc3d1ff7b64c68f368c jdk7u71-b12
+a6cbc82d62f915cdcd6037c8b40a4590585553c7 jdk7u71-b13
 c76a5b2876b98194ccbeffeab76a0326bf163ba2 jdk7u72-b01
 b02c1a8b10cd7338eb808ebfaa5a74b4997fdc8f jdk7u72-b02
 bc98cecdab4cd4a97316a5407c91bdedc92d4bb5 jdk7u72-b03
@@ -497,4 +498,5 @@
 d3257f2beb42163afe64adea65b53a18d039eb0d jdk7u72-b10
 4946dc66a0c77133a0a6e3198bd9bd1ec5ef0344 jdk7u72-b11
 e556571078d5c8d24b527ed809d12f37f6e3745b jdk7u72-b12
+13ed37084621a8af551ec46650c07ea96f1a22ba jdk7u72-b13
 87f9570ca734714f981d4a47477dcc6c80a7d324 jdk7u75-b00
--- a/src/share/classes/javax/swing/JDesktopPane.java	Tue Sep 02 13:05:37 2014 -0700
+++ b/src/share/classes/javax/swing/JDesktopPane.java	Mon Sep 08 13:53:15 2014 -0700
@@ -43,6 +43,7 @@
 import java.beans.PropertyVetoException;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.LinkedHashSet;
 /**
  * A container used to create a multiple-document interface or a virtual desktop.
  * You create <code>JInternalFrame</code> objects and add them to the
@@ -266,7 +267,7 @@
 
     private static Collection<JInternalFrame> getAllFrames(Container parent) {
         int i, count;
-        Collection<JInternalFrame> results = new ArrayList<JInternalFrame>();
+        Collection<JInternalFrame> results = new LinkedHashSet<>();
         count = parent.getComponentCount();
         for (i = 0; i < count; i++) {
             Component next = parent.getComponent(i);