harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r495662 - in /harmony/enhanced/classlib/trunk/modules/swing: make/ src/main/java/common/javax/swing/ src/test/api/java/common/javax/swing/
Date Fri, 12 Jan 2007 17:53:58 GMT
Author: hindessm
Date: Fri Jan 12 09:53:56 2007
New Revision: 495662

URL: http://svn.apache.org/viewvc?view=rev&rev=495662
Log:
Applied patches from "[#HARMONY-2214] [classlib][swing] CellRendererPane
method paintComponent illegally throw NPE for null parameters".

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/CellRendererPane.java
    harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/CellRendererPaneTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl Fri Jan 12 09:53:56
2007
@@ -44,7 +44,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm Fri Jan 12 09:53:56
2007
@@ -44,7 +44,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl Fri Jan 12
09:53:56 2007
@@ -47,7 +47,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java
@@ -135,4 +134,4 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-javax/swing/InputMapTest.java
\ No newline at end of file
+javax/swing/InputMapTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm Fri Jan 12
09:53:56 2007
@@ -44,7 +44,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl Fri Jan 12
09:53:56 2007
@@ -48,7 +48,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm Fri Jan 12
09:53:56 2007
@@ -55,7 +55,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl Fri Jan
12 09:53:56 2007
@@ -44,7 +44,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm Fri Jan
12 09:53:56 2007
@@ -44,7 +44,6 @@
 javax/swing/text/GlyphView_AttributesTest.java
 org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
 javax/swing/BoxLayoutTest.java
-javax/swing/CellRendererPaneTest.java
 javax/swing/DefaultDesktopManagerTest.java
 javax/swing/ImageIcon_MultithreadedTest.java
 javax/swing/JComponent_AddRemoveNotifyTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/CellRendererPane.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/CellRendererPane.java?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/CellRendererPane.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/CellRendererPane.java
Fri Jan 12 09:53:56 2007
@@ -79,6 +79,7 @@
 
     public void paintComponent(Graphics g, Component c, Container p, int x, int y, int w,
             int h, boolean shouldValidate) {
+        if(g == null || c == null) return;
         add(c);
         c.setBounds(x, y, w, h);
         if (shouldValidate) {

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/CellRendererPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/CellRendererPaneTest.java?view=diff&rev=495662&r1=495661&r2=495662
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/CellRendererPaneTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/CellRendererPaneTest.java
Fri Jan 12 09:53:56 2007
@@ -148,4 +148,14 @@
         pane.paintComponent(g, component, new JPanel(), 20, 30, 40, 50, true);
         assertTrue(validationMarker.isOccurred());
     }
+
+    public void testPaintComponent1() {
+        CellRendererPane c = new CellRendererPane();
+        try {
+            c.paintComponent(null, null, null, 0, 0, 0, 0, false);
+            assertTrue(true);
+        } catch (NullPointerException e) {
+            fail(e + " - was thrown");
+        }
+    }
 }



Mime
View raw message