changeset 5200:61906002d2a2

7124328: [macosx] javax.swing.JDesktopPane.getAllFramesInLayer returns unexpected value Reviewed-by: anthony
author alexp
date Fri, 27 Apr 2012 18:27:49 +0400
parents 57bc0bd2677e
children 9fb41ec54d94
files src/share/classes/javax/swing/JDesktopPane.java
diffstat 1 files changed, 25 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/JDesktopPane.java	Mon Apr 23 16:34:32 2012 +0200
+++ b/src/share/classes/javax/swing/JDesktopPane.java	Fri Apr 27 18:27:49 2012 +0400
@@ -27,7 +27,8 @@
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Vector;
+import java.util.Collection;
+import java.util.Iterator;
 import javax.swing.plaf.*;
 import javax.accessibility.*;
 
@@ -42,7 +43,6 @@
 import java.beans.PropertyVetoException;
 import java.util.Set;
 import java.util.TreeSet;
-
 /**
  * A container used to create a multiple-document interface or a virtual desktop.
  * You create <code>JInternalFrame</code> objects and add them to the
@@ -261,25 +261,26 @@
      * @return an array of <code>JInternalFrame</code> objects
      */
     public JInternalFrame[] getAllFrames() {
+        return getAllFrames(this).toArray(new JInternalFrame[0]);
+    }
+
+    private static Collection<JInternalFrame> getAllFrames(Container parent) {
         int i, count;
-        JInternalFrame[] results;
-        Vector<JInternalFrame> vResults = new Vector<JInternalFrame>(10);
-
-        count = getComponentCount();
-        for(i = 0; i < count; i++) {
-            Component next = getComponent(i);
-            if(next instanceof JInternalFrame)
-                vResults.addElement((JInternalFrame) next);
-            else if(next instanceof JInternalFrame.JDesktopIcon)  {
-                JInternalFrame tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
-                if(tmp != null)
-                    vResults.addElement(tmp);
+        Collection<JInternalFrame> results = new ArrayList<JInternalFrame>();
+        count = parent.getComponentCount();
+        for (i = 0; i < count; i++) {
+            Component next = parent.getComponent(i);
+            if (next instanceof JInternalFrame) {
+                results.add((JInternalFrame) next);
+            } else if (next instanceof JInternalFrame.JDesktopIcon) {
+                JInternalFrame tmp = ((JInternalFrame.JDesktopIcon) next).getInternalFrame();
+                if (tmp != null) {
+                    results.add(tmp);
+                }
+            } else if (next instanceof Container) {
+                results.addAll(getAllFrames((Container) next));
             }
         }
-
-        results = new JInternalFrame[vResults.size()];
-        vResults.copyInto(results);
-
         return results;
     }
 
@@ -322,27 +323,14 @@
      * @see JLayeredPane
      */
     public JInternalFrame[] getAllFramesInLayer(int layer) {
-        int i, count;
-        JInternalFrame[] results;
-        Vector<JInternalFrame> vResults = new Vector<JInternalFrame>(10);
-
-        count = getComponentCount();
-        for(i = 0; i < count; i++) {
-            Component next = getComponent(i);
-            if(next instanceof JInternalFrame) {
-                if(((JInternalFrame)next).getLayer() == layer)
-                    vResults.addElement((JInternalFrame) next);
-            } else if(next instanceof JInternalFrame.JDesktopIcon)  {
-                JInternalFrame tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
-                if(tmp != null && tmp.getLayer() == layer)
-                    vResults.addElement(tmp);
+        Collection<JInternalFrame> allFrames = getAllFrames(this);
+        Iterator<JInternalFrame> iterator = allFrames.iterator();
+        while (iterator.hasNext()) {
+            if (iterator.next().getLayer() != layer) {
+                iterator.remove();
             }
         }
-
-        results = new JInternalFrame[vResults.size()];
-        vResults.copyInto(results);
-
-        return results;
+        return allFrames.toArray(new JInternalFrame[0]);
     }
 
     private List<JInternalFrame> getFrames() {