Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 20833 invoked from network); 13 Feb 2007 15:58:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2007 15:58:11 -0000 Received: (qmail 28855 invoked by uid 500); 13 Feb 2007 15:58:07 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 28836 invoked by uid 500); 13 Feb 2007 15:58:07 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 28791 invoked by uid 99); 13 Feb 2007 15:58:07 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Feb 2007 07:58:07 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Feb 2007 07:57:59 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 102CF1A981A; Tue, 13 Feb 2007 07:57:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r507071 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/JTree.java test/api/java/common/javax/swing/JTreeTest.java Date: Tue, 13 Feb 2007 15:57:38 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070213155739.102CF1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Tue Feb 13 07:57:37 2007 New Revision: 507071 URL: http://svn.apache.org/viewvc?view=rev&rev=507071 Log: Patch for HARMONY-2618 "[classlib][swing] javax.swing.JTree.getExpandedDescendants() returns Enumeration while RI returns null" Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTree.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTree.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTree.java?view=diff&rev=507071&r1=507070&r2=507071 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTree.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTree.java Tue Feb 13 07:57:37 2007 @@ -997,9 +997,11 @@ public Enumeration getExpandedDescendants(TreePath parent) { final Enumeration toggled = getDescendantToggledPaths(parent); - if (toggled == null) { - return null; - } + + if (toggled == null || !isExpanded(parent)) { + return null; + } + return new Enumeration() { private TreePath nextElement = getNextExpandedPath(); @@ -1018,7 +1020,8 @@ private TreePath getNextExpandedPath() { while (toggled.hasMoreElements()) { - TreePath nextPath = toggled.nextElement(); + TreePath nextPath = toggled.nextElement(); + if (isExpanded(nextPath)) { return nextPath; } Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java?view=diff&rev=507071&r1=507070&r2=507071 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java Tue Feb 13 07:57:37 2007 @@ -1184,16 +1184,8 @@ TreePath path11 = path1.pathByAddingChild(child11); assertNull(tree.getExpandedDescendants(null)); checkInEnumeration(tree.getExpandedDescendants(rootPath), new Object[] { rootPath }); - if (isHarmony()) { - assertFalse(tree.getExpandedDescendants(path1).hasMoreElements()); - } else { - assertNull(tree.getExpandedDescendants(path1)); - } - if (isHarmony()) { - assertFalse(tree.getExpandedDescendants(path11).hasMoreElements()); - } else { - assertNull(tree.getExpandedDescendants(path11)); - } + assertNull(tree.getExpandedDescendants(path1)); + assertNull(tree.getExpandedDescendants(path11)); tree.expandPath(path11); checkInEnumeration(tree.getExpandedDescendants(rootPath), new Object[] { path1, rootPath, path11 }); @@ -1201,11 +1193,7 @@ checkInEnumeration(tree.getExpandedDescendants(rootPath), new Object[] { path1, rootPath }); tree.collapsePath(rootPath); - if (isHarmony()) { - assertFalse(tree.getExpandedDescendants(rootPath).hasMoreElements()); - } else { - assertNull(tree.getExpandedDescendants(rootPath)); - } + assertNull(tree.getExpandedDescendants(rootPath)); } public void testGetSetExpandsSelectedPaths() {