From 2150f3f35acbe14ca11c60a948d7a8d8df1b7769 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Mon, 14 Jun 2010 15:21:18 +0000 Subject: Color-related classes were moved to the org.apache.xmlgraphics.java2d.color package. Updated XML Graphics Commons Snapshot. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@954512 13f79535-47bb-0310-9956-ffa450edef68 --- lib/xmlgraphics-commons-1.4svn.jar | Bin 568485 -> 572607 bytes src/java/org/apache/fop/afp/AFPPaintingState.java | 6 +++--- .../org/apache/fop/afp/modca/GraphicsObject.java | 2 +- src/java/org/apache/fop/pdf/PDFColor.java | 4 ++-- src/java/org/apache/fop/svg/PDFGraphics2D.java | 4 ++-- src/java/org/apache/fop/util/ColorUtil.java | 10 +++++----- .../org/apache/fop/traits/BorderPropsTestCase.java | 4 ++-- .../org/apache/fop/util/ColorUtilTestCase.java | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/xmlgraphics-commons-1.4svn.jar b/lib/xmlgraphics-commons-1.4svn.jar index 4f82992d3..c99758f16 100644 Binary files a/lib/xmlgraphics-commons-1.4svn.jar and b/lib/xmlgraphics-commons-1.4svn.jar differ diff --git a/src/java/org/apache/fop/afp/AFPPaintingState.java b/src/java/org/apache/fop/afp/AFPPaintingState.java index 4e314e5d9..e92a6cdb2 100644 --- a/src/java/org/apache/fop/afp/AFPPaintingState.java +++ b/src/java/org/apache/fop/afp/AFPPaintingState.java @@ -24,9 +24,9 @@ import java.awt.Point; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.xmlgraphics.java2d.ColorConverter; -import org.apache.xmlgraphics.java2d.DefaultColorConverter; -import org.apache.xmlgraphics.java2d.GrayScaleColorConverter; +import org.apache.xmlgraphics.java2d.color.ColorConverter; +import org.apache.xmlgraphics.java2d.color.DefaultColorConverter; +import org.apache.xmlgraphics.java2d.color.GrayScaleColorConverter; import org.apache.fop.afp.fonts.AFPPageFonts; import org.apache.fop.util.AbstractPaintingState; diff --git a/src/java/org/apache/fop/afp/modca/GraphicsObject.java b/src/java/org/apache/fop/afp/modca/GraphicsObject.java index cdc0a44bc..b677a0f7c 100644 --- a/src/java/org/apache/fop/afp/modca/GraphicsObject.java +++ b/src/java/org/apache/fop/afp/modca/GraphicsObject.java @@ -25,7 +25,7 @@ import java.io.OutputStream; import java.util.Iterator; import java.util.List; -import org.apache.xmlgraphics.java2d.ColorConverter; +import org.apache.xmlgraphics.java2d.color.ColorConverter; import org.apache.fop.afp.AFPDataObjectInfo; import org.apache.fop.afp.AFPObjectAreaInfo; diff --git a/src/java/org/apache/fop/pdf/PDFColor.java b/src/java/org/apache/fop/pdf/PDFColor.java index c4a8e5be6..42a9c7223 100644 --- a/src/java/org/apache/fop/pdf/PDFColor.java +++ b/src/java/org/apache/fop/pdf/PDFColor.java @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.xmlgraphics.java2d.CMYKColorSpace; -import org.apache.xmlgraphics.java2d.ColorExt; +import org.apache.xmlgraphics.java2d.color.CMYKColorSpace; +import org.apache.xmlgraphics.java2d.color.ColorExt; /** * PDF Color object. diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java index e25fbbdbe..f0084da09 100644 --- a/src/java/org/apache/fop/svg/PDFGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java @@ -66,8 +66,8 @@ import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax; import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG; import org.apache.xmlgraphics.image.loader.impl.ImageRendered; import org.apache.xmlgraphics.java2d.AbstractGraphics2D; -import org.apache.xmlgraphics.java2d.ColorExt; import org.apache.xmlgraphics.java2d.GraphicContext; +import org.apache.xmlgraphics.java2d.color.ColorExt; import org.apache.fop.fonts.Font; import org.apache.fop.fonts.FontInfo; @@ -762,7 +762,7 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand //currentStream.write(currentColour.getColorSpaceOut(fill)); } else { throw new UnsupportedOperationException( - "Color Space not supported by PDFGraphics2D"); + "Color Space not supported by PDFGraphics2D: " + c.getColorSpace()); } } diff --git a/src/java/org/apache/fop/util/ColorUtil.java b/src/java/org/apache/fop/util/ColorUtil.java index 4ec858ca6..656d9ef98 100644 --- a/src/java/org/apache/fop/util/ColorUtil.java +++ b/src/java/org/apache/fop/util/ColorUtil.java @@ -27,8 +27,8 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.xmlgraphics.java2d.CMYKColorSpace; -import org.apache.xmlgraphics.java2d.ColorExt; +import org.apache.xmlgraphics.java2d.color.CMYKColorSpace; +import org.apache.xmlgraphics.java2d.color.ColorExt; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.expr.PropertyException; @@ -682,7 +682,7 @@ public final class ColorUtil { * @return the modified color */ public static Color lightenColor(Color col, float factor) { - return org.apache.xmlgraphics.java2d.ColorUtil.lightenColor(col, factor); + return org.apache.xmlgraphics.java2d.color.ColorUtil.lightenColor(col, factor); } /** @@ -701,7 +701,7 @@ public final class ColorUtil { * @return true if it is a gray value */ public static boolean isGray(Color col) { - return org.apache.xmlgraphics.java2d.ColorUtil.isGray(col); + return org.apache.xmlgraphics.java2d.color.ColorUtil.isGray(col); } /** @@ -711,6 +711,6 @@ public final class ColorUtil { */ public static Color toCMYKGrayColor(float black) { - return org.apache.xmlgraphics.java2d.ColorUtil.toCMYKGrayColor(black); + return org.apache.xmlgraphics.java2d.color.ColorUtil.toCMYKGrayColor(black); } } diff --git a/test/java/org/apache/fop/traits/BorderPropsTestCase.java b/test/java/org/apache/fop/traits/BorderPropsTestCase.java index 3a80b13fb..3332d11f2 100644 --- a/test/java/org/apache/fop/traits/BorderPropsTestCase.java +++ b/test/java/org/apache/fop/traits/BorderPropsTestCase.java @@ -23,8 +23,8 @@ import java.awt.Color; import junit.framework.TestCase; -import org.apache.xmlgraphics.java2d.CMYKColorSpace; -import org.apache.xmlgraphics.java2d.ColorExt; +import org.apache.xmlgraphics.java2d.color.CMYKColorSpace; +import org.apache.xmlgraphics.java2d.color.ColorExt; import org.apache.fop.fo.Constants; import org.apache.fop.util.ColorUtil; diff --git a/test/java/org/apache/fop/util/ColorUtilTestCase.java b/test/java/org/apache/fop/util/ColorUtilTestCase.java index 5d76412b8..83163c888 100644 --- a/test/java/org/apache/fop/util/ColorUtilTestCase.java +++ b/test/java/org/apache/fop/util/ColorUtilTestCase.java @@ -24,8 +24,8 @@ import java.awt.color.ColorSpace; import junit.framework.TestCase; -import org.apache.xmlgraphics.java2d.CMYKColorSpace; -import org.apache.xmlgraphics.java2d.ColorExt; +import org.apache.xmlgraphics.java2d.color.CMYKColorSpace; +import org.apache.xmlgraphics.java2d.color.ColorExt; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.FopFactory; -- cgit v1.2.3