From 6cdfe4ad23973b61aa2e51ed8c2ef122d5b42f16 Mon Sep 17 00:00:00 2001 From: smallsql Date: Sat, 26 Sep 2009 21:01:58 +0000 Subject: [PATCH] more files of the print API added --- openjdk/allsources.lst | 9 +++++++++ openjdk/java/awt/GraphicsConfiguration.java | 15 +++++++++++++-- openjdk/sun/awt/image/ToolkitImage.java | 4 ++++ openjdk/sun/font/CompositeFont.java | 7 +++++++ openjdk/sun/font/Font2D.java | 6 ++++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst index 34f8753b..c7c1ddeb 100644 --- a/openjdk/allsources.lst +++ b/openjdk/allsources.lst @@ -9462,11 +9462,13 @@ sun/security/jgss/wrapper/SunNativeProvider.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/AttributeMap.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/AttributeValues.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/BidiUtils.java +../../openjdk6-b16/jdk/src/share/classes/sun/font/CharToGlyphMapper.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/CoreMetrics.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/Decoration.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/EAttribute.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/ExtendedTextLabel.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/ExtendedTextSourceLabel.java +../../openjdk6-b16/jdk/src/share/classes/sun/font/Font2DHandle.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/FontDesignMetrics.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/FontLineMetrics.java ../../openjdk6-b16/jdk/src/share/classes/sun/font/FontResolver.java @@ -9850,6 +9852,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/pisces/Renderer.java ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/pisces/Stroker.java ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/pisces/Transform4.java +../../openjdk6-b16/jdk/src/share/classes/sun/java2d/Spans.java ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/StateTrackable.java ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/StateTrackableDelegate.java ../../openjdk6-b16/jdk/src/share/classes/sun/java2d/StateTracker.java @@ -10279,12 +10282,18 @@ sun/security/jgss/wrapper/SunNativeProvider.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/ImagePrinter.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/OpenBook.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/PageableDoc.java +../../openjdk6-b16/jdk/src/share/classes/sun/print/PathGraphics.java +../../openjdk6-b16/jdk/src/share/classes/sun/print/PeekGraphics.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/PeekMetrics.java +../../openjdk6-b16/jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java +../../openjdk6-b16/jdk/src/share/classes/sun/print/PrintJob2D.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/PrintJobAttributeException.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/PrintJobFlavorException.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/ProxyGraphics.java +../../openjdk6-b16/jdk/src/share/classes/sun/print/ProxyGraphics2D.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/ProxyPrintGraphics.java +../../openjdk6-b16/jdk/src/share/classes/sun/print/RasterPrinterJob.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/ServiceDialog.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/ServiceNotifier.java ../../openjdk6-b16/jdk/src/share/classes/sun/print/SunAlternateMedia.java diff --git a/openjdk/java/awt/GraphicsConfiguration.java b/openjdk/java/awt/GraphicsConfiguration.java index 13e54f94..72e040fb 100644 --- a/openjdk/java/awt/GraphicsConfiguration.java +++ b/openjdk/java/awt/GraphicsConfiguration.java @@ -293,8 +293,19 @@ public abstract class GraphicsConfiguration { * @see Component#createVolatileImage(int, int) * @since 1.5 */ - public abstract VolatileImage createCompatibleVolatileImage(int width, int height, - ImageCapabilities caps, int transparency) throws AWTException; + public VolatileImage createCompatibleVolatileImage(int width, int height, + ImageCapabilities caps, int transparency) throws AWTException + { + VolatileImage vi = + new Container().createVolatileImage(width, height, caps); + if (caps != null && caps.isAccelerated() && + !vi.getCapabilities().isAccelerated()) + { + throw new AWTException("Supplied image capabilities could not " + + "be met by this graphics configuration."); + } + return vi; + } /** * Returns the {@link ColorModel} associated with this diff --git a/openjdk/sun/awt/image/ToolkitImage.java b/openjdk/sun/awt/image/ToolkitImage.java index 1655e207..44d805f5 100644 --- a/openjdk/sun/awt/image/ToolkitImage.java +++ b/openjdk/sun/awt/image/ToolkitImage.java @@ -24,7 +24,11 @@ package sun.awt.image; +import java.awt.image.BufferedImage; + public abstract class ToolkitImage extends java.awt.Image { public abstract ImageRepresentation getImageRep(); + + public abstract BufferedImage getBufferedImage(); } diff --git a/openjdk/sun/font/CompositeFont.java b/openjdk/sun/font/CompositeFont.java index 872b9076..2cf82bc1 100644 --- a/openjdk/sun/font/CompositeFont.java +++ b/openjdk/sun/font/CompositeFont.java @@ -43,4 +43,11 @@ public class CompositeFont extends Font2D{ throw new NotImplementedException(); } + public int getNumSlots() { + throw new NotImplementedException(); + } + + public PhysicalFont getSlotFont(int slot) { + throw new NotImplementedException(); + } } diff --git a/openjdk/sun/font/Font2D.java b/openjdk/sun/font/Font2D.java index e499c803..b95ee082 100644 --- a/openjdk/sun/font/Font2D.java +++ b/openjdk/sun/font/Font2D.java @@ -35,6 +35,8 @@ import java.util.Locale; */ public abstract class Font2D{ + public Font2DHandle handle; + /* SunGraphics2D has font, tx, aa and fm. From this info * can get a Strike object from the cache, creating it if necessary. * This code is designed for multi-threaded access. @@ -139,6 +141,10 @@ public abstract class Font2D{ return 0; } + public int charToGlyph(int wchar) { + return wchar; + } + public int getMissingGlyphCode(){ // TODO Auto-generated method stub return 0;