harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r522461 - in /harmony/enhanced/classlib/trunk/modules/awt/src: main/java/common/java/awt/Container.java test/api/java/common/java/awt/ContainerRTest.java
Date Mon, 26 Mar 2007 09:14:35 GMT
Author: smishura
Date: Mon Mar 26 02:14:27 2007
New Revision: 522461

URL: http://svn.apache.org/viewvc?view=rev&rev=522461
Log:
Rollback commit r521764:
(Patch for HARMONY-3443 "[classlib][awt][netbeans] Container.paint() throws NPE"

2 test cases from java.awt.font.LineBreakMeasurerTest fails on Linux. Will reopen JIRA issue

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java?view=diff&rev=522461&r1=522460&r2=522461
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java
Mon Mar 26 02:14:27 2007
@@ -989,7 +989,7 @@
     private void paintComponentsImpl(Graphics g) {
         Shape clip;
         
-        if ((!isShowing()) || (g == null)) {
+        if (g == null) {
             return;
         }
         
@@ -999,7 +999,7 @@
             Component comp = children.get(i);
 
             if (comp.isLightweight() && comp.isVisible()) {
-                if ((clip != null) && !clip.intersects(comp.getBounds())) {
+                if (!clip.intersects(comp.getBounds())) {
                     continue;
                 }
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java?view=diff&rev=522461&r1=522460&r2=522461
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java
Mon Mar 26 02:14:27 2007
@@ -17,9 +17,6 @@
 package java.awt;
 
 
-import javax.swing.DebugGraphics;
-import javax.swing.JButton;
-
 import junit.framework.TestCase;
 
 
@@ -66,28 +63,6 @@
         // Regression test for HARMONY-2527
         final Component c = new Frame();
         c.paint(c.getGraphics());
-        // End of regression for HARMONY-2527
-        
-        // Regression for HARMONY-3443
-        final Graphics g;
-        final Frame f = new Frame();
-
-        f.add(new JButton());
-        f.setVisible(true);
-        g = f.getGraphics();
-
-        try {
-            g.setClip(null);
-            assertNull(g.getClip());
-            f.paint(g);
-        } finally {
-            f.dispose();
-        }
-        // End of regression for HARMONY-3443
-        
-        // Regression for HARMONY-3430
-        new Container().paint(new DebugGraphics());
-        // End of regression for HARMONY-3430
     }
 
     public void testAddComponent() {



Mime
View raw message