Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 8178:13ed37084621 jdk7u72-b13
Merge
author | asaha |
---|---|
date | Mon, 08 Sep 2014 12:32:29 -0700 |
parents | 1b55466dcfbb (current diff) 78a7e3c7165d (diff) |
children | 657506e8095e |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Sep 02 11:00:00 2014 -0700 +++ b/.hgtags Mon Sep 08 12:32:29 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
--- a/src/share/classes/javax/swing/JDesktopPane.java Tue Sep 02 11:00:00 2014 -0700 +++ b/src/share/classes/javax/swing/JDesktopPane.java Mon Sep 08 12:32:29 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);