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 2008/01/07 14:28:56 UTC
svn commit: r609600 - in /xmlgraphics/fop/branches/Temp_ImagePackageRedesign:
src/java/META-INF/services/ src/java/org/apache/fop/image/loader/
src/java/org/apache/fop/image/loader/batik/
src/java/org/apache/fop/image2/impl/batik/ test/java/org/apache/...
Author: jeremias
Date: Mon Jan 7 05:28:53 2008
New Revision: 609600
URL: http://svn.apache.org/viewvc?rev=609600&view=rev
Log:
Removed "image2" package again and moved the Batik-dependent implementations under the old "image" package. In this form, the deprecated code doesn't conflict with the new implementations anymore.
Added:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/
- copied from r607034, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/
- copied from r607034, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/
Removed:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/batik/
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/
Modified:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactoryWMF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageWMF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter?rev=609600&r1=609599&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter Mon Jan 7 05:28:53 2008
@@ -1,2 +1,2 @@
-org.apache.fop.image2.impl.batik.ImageConverterSVG2G2D
-org.apache.fop.image2.impl.batik.ImageConverterWMF2G2D
+org.apache.fop.image.loader.batik.ImageConverterSVG2G2D
+org.apache.fop.image.loader.batik.ImageConverterWMF2G2D
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory?rev=609600&r1=609599&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory Mon Jan 7 05:28:53 2008
@@ -1,2 +1,2 @@
-org.apache.fop.image2.impl.batik.ImageLoaderFactorySVG
-org.apache.fop.image2.impl.batik.ImageLoaderFactoryWMF
\ No newline at end of file
+org.apache.fop.image.loader.batik.ImageLoaderFactorySVG
+org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader?rev=609600&r1=609599&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader Mon Jan 7 05:28:53 2008
@@ -1,2 +1,2 @@
-org.apache.fop.image2.impl.batik.PreloaderWMF
-org.apache.fop.image2.impl.batik.PreloaderSVG
+org.apache.fop.image.loader.batik.PreloaderWMF
+org.apache.fop.image.loader.batik.PreloaderSVG
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/BatikUtil.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/BatikUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/BatikUtil.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
/**
* Helper utilities for Apache Batik.
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import java.awt.Dimension;
import java.awt.Graphics2D;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import java.awt.Dimension;
import java.awt.Graphics2D;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactorySVG.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoaderFactory;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactoryWMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactoryWMF.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactoryWMF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderFactoryWMF.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoaderFactory;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderSVG.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import java.io.IOException;
import java.util.Map;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import java.io.IOException;
import java.util.Map;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageWMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageWMF.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageWMF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/ImageWMF.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import org.apache.batik.transcoder.wmf.tosvg.WMFRecordStore;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import java.awt.geom.AffineTransform;
import java.io.IOException;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.batik;
+package org.apache.fop.image.loader.batik;
import java.io.DataInputStream;
import java.io.IOException;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.fop.image.loader.batik;
import java.io.File;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java?rev=609600&r1=607034&r2=609600&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java Mon Jan 7 05:28:53 2008
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.fop.image.loader.batik;
import java.io.IOException;
@@ -30,7 +30,7 @@
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.impl.batik.ImageWMF;
+import org.apache.fop.image.loader.batik.ImageWMF;
/**
* Tests for bundled image preloader implementations.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org