Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 21105 invoked from network); 19 Sep 2007 11:26:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Sep 2007 11:26:52 -0000 Received: (qmail 26517 invoked by uid 500); 19 Sep 2007 11:26:43 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 26500 invoked by uid 500); 19 Sep 2007 11:26:43 -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 26491 invoked by uid 99); 19 Sep 2007 11:26:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Sep 2007 04:26:43 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Wed, 19 Sep 2007 11:28:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8FFB11A9832; Wed, 19 Sep 2007 04:26:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r577248 - in /harmony/enhanced/classlib/trunk/modules/awt/src: main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java test/api/java/common/java/awt/Graphics2DTest.java Date: Wed, 19 Sep 2007 11:26:27 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070919112628.8FFB11A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Wed Sep 19 04:26:27 2007 New Revision: 577248 URL: http://svn.apache.org/viewvc?rev=577248&view=rev Log: Patch for HARMONY-4799 "[classlib][awt] GetRenderingHint returns Null by default" Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java?rev=577248&r1=577247&r2=577248&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java (original) +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java Wed Sep 19 04:26:27 2007 @@ -40,24 +40,24 @@ import java.awt.Toolkit; import java.awt.font.FontRenderContext; import java.awt.font.GlyphVector; +import java.awt.geom.AffineTransform; +import java.awt.geom.Arc2D; +import java.awt.geom.Ellipse2D; +import java.awt.geom.Line2D; +import java.awt.geom.PathIterator; +import java.awt.geom.RoundRectangle2D; import java.awt.image.AffineTransformOp; -import java.awt.image.ImageObserver; import java.awt.image.BufferedImage; import java.awt.image.BufferedImageOp; +import java.awt.image.ImageObserver; import java.awt.image.Raster; import java.awt.image.RenderedImage; import java.awt.image.WritableRaster; import java.awt.image.renderable.RenderableImage; -import java.awt.geom.AffineTransform; -import java.awt.geom.Arc2D; -import java.awt.geom.Ellipse2D; -import java.awt.geom.Line2D; -import java.awt.geom.PathIterator; -import java.awt.geom.RoundRectangle2D; import java.text.AttributedCharacterIterator; +import java.util.HashMap; import java.util.Map; -import org.apache.harmony.awt.gl.Surface; import org.apache.harmony.awt.gl.font.FontManager; import org.apache.harmony.awt.gl.font.fontlib.FLTextRenderer; import org.apache.harmony.awt.gl.image.OffscreenImage; @@ -125,9 +125,22 @@ * */ public abstract class CommonGraphics2D extends Graphics2D { + + private static final Map DEFAULT_RENDERING_HINTS; + + static { + DEFAULT_RENDERING_HINTS = new HashMap(); + DEFAULT_RENDERING_HINTS.put(RenderingHints.KEY_TEXT_ANTIALIASING, + RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT); + DEFAULT_RENDERING_HINTS.put(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_OFF); + DEFAULT_RENDERING_HINTS.put(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_DEFAULT); + } + protected Surface dstSurf = null; protected Blitter blitter = NullBlitter.getInstance(); - protected RenderingHints hints = new RenderingHints(null); + protected RenderingHints hints = new RenderingHints(DEFAULT_RENDERING_HINTS); // Clipping things protected MultiRectArea clip = null; Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java?rev=577248&r1=577247&r2=577248&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/Graphics2DTest.java Wed Sep 19 04:26:27 2007 @@ -57,4 +57,16 @@ assertNotNull(g2d.getPaint()); } + public void testGetRenderingHint() { + // Regression test for HARMONY-4799 + final Graphics2D g2d = (Graphics2D) frame.getGraphics(); + + assertEquals( + g2d.getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING), + RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT); + assertEquals(g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING), + RenderingHints.VALUE_ANTIALIAS_OFF); + assertEquals(g2d.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL), + RenderingHints.VALUE_STROKE_DEFAULT); + } }