You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2010/06/14 17:21:19 UTC
svn commit: r954512 - in /xmlgraphics/fop/trunk: lib/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/
src/java/org/apache/fop/pdf/ src/java/org/apache/fop/svg/
src/java/org/apache/fop/util/ test/java/org/apache/fop/traits/
test/java/org...
Author: jeremias
Date: Mon Jun 14 15:21:18 2010
New Revision: 954512
URL: http://svn.apache.org/viewvc?rev=954512&view=rev
Log:
Color-related classes were moved to the org.apache.xmlgraphics.java2d.color package.
Updated XML Graphics Commons Snapshot.
Modified:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java Mon Jun 14 15:21:18 2010
@@ -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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java Mon Jun 14 15:21:18 2010
@@ -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;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java Mon Jun 14 15:21:18 2010
@@ -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.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java Mon Jun 14 15:21:18 2010
@@ -66,8 +66,8 @@ import org.apache.xmlgraphics.image.load
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 Abstr
//currentStream.write(currentColour.getColorSpaceOut(fill));
} else {
throw new UnsupportedOperationException(
- "Color Space not supported by PDFGraphics2D");
+ "Color Space not supported by PDFGraphics2D: " + c.getColorSpace());
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Mon Jun 14 15:21:18 2010
@@ -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);
}
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java Mon Jun 14 15:21:18 2010
@@ -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;
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java?rev=954512&r1=954511&r2=954512&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java Mon Jun 14 15:21:18 2010
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org