harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r504516 - in /harmony/enhanced/classlib/trunk/modules/swing: make/exclude.common src/main/java/common/javax/swing/JSeparator.java src/test/api/java/common/javax/swing/JPopupMenuTest.java src/test/api/java/common/javax/swing/JSeparatorTest.java
Date Wed, 07 Feb 2007 12:04:23 GMT
Author: ayza
Date: Wed Feb  7 04:04:22 2007
New Revision: 504516

URL: http://svn.apache.org/viewvc?view=rev&rev=504516
Log:
Applying patch from HARMONY-2631 ([classlib][swing] javax.swing.JPopupMenu.Separator.isFocusable()
returns true while RI returns false)

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JSeparator.java
    harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JPopupMenuTest.java
    harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JSeparatorTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common?view=diff&rev=504516&r1=504515&r2=504516
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common Wed Feb  7 04:04:22
2007
@@ -22,7 +22,6 @@
 javax/swing/JMenuTest.java
 javax/swing/JOptionPaneRTest.java
 javax/swing/JOptionPaneTest.java
-javax/swing/JPopupMenuTest.java
 javax/swing/JRootPaneRTest.java
 javax/swing/JRootPaneTest.java
 javax/swing/JSplitPaneTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JSeparator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JSeparator.java?view=diff&rev=504516&r1=504515&r2=504516
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JSeparator.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JSeparator.java
Wed Feb  7 04:04:22 2007
@@ -38,13 +38,13 @@
     private int orientation;
 
     public JSeparator() {
-        orientation = SwingConstants.HORIZONTAL;
-        updateUI();
+        this(SwingConstants.HORIZONTAL);
     }
 
     public JSeparator(final int orientation) {
         checkOrientation(orientation);
         this.orientation = orientation;
+        setFocusable(false);
         updateUI();
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JPopupMenuTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JPopupMenuTest.java?view=diff&rev=504516&r1=504515&r2=504516
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JPopupMenuTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JPopupMenuTest.java
Wed Feb  7 04:04:22 2007
@@ -305,6 +305,9 @@
     public void testJPopupMenuSeparator() {
         JSeparator separator = new JPopupMenu.Separator();
         assertEquals("PopupMenuSeparatorUI", separator.getUIClassID());
+
+        // Regression test for HARMONY-2631
+        assertFalse(separator.isFocusable());
     }
 
     /*

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JSeparatorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JSeparatorTest.java?view=diff&rev=504516&r1=504515&r2=504516
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JSeparatorTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JSeparatorTest.java
Wed Feb  7 04:04:22 2007
@@ -116,4 +116,9 @@
         } catch (IllegalArgumentException e) {
         }
     }
+
+    public void testIsFocusable() {
+        // Regression test for HARMONY-2631
+        assertFalse(new JSeparator().isFocusable());
+    }
 }



Mime
View raw message