You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2007/01/22 12:36:05 UTC

svn commit: r498585 [3/4] - in /xmlgraphics/batik/branches/commons-integration: ./ lib/ sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ sources/ sources/org/apache/batik/anim/timing/ sources/org/apache/batik/apps/rasterizer/ sources/org/apach...

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TileRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TileRed.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TileRed.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TileRed.java Mon Jan 22 03:35:44 2007
@@ -36,6 +36,8 @@
 
 import org.apache.batik.ext.awt.image.GraphicsUtil;
 import org.apache.batik.util.HaltingThread;
+import org.apache.xmlgraphics.image.rendered.AbstractRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 
 /**
  * This filter simply tiles its tile starting from the upper

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TranslateRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TranslateRed.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TranslateRed.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TranslateRed.java Mon Jan 22 03:35:44 2007
@@ -23,6 +23,9 @@
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 
+import org.apache.xmlgraphics.image.rendered.AbstractRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
+
 /**
  * This is a special case of an Affine that only contains integer
  * translations, this allows it to do it's work by simply changing

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java Mon Jan 22 03:35:44 2007
@@ -29,6 +29,9 @@
 import java.awt.image.DirectColorModel;
 import java.awt.image.SinglePixelPackedSampleModel;
 import java.awt.image.WritableRaster;
+
+import org.apache.xmlgraphics.image.rendered.AbstractRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 /**
  * This class creates a RenderedImage in conformance to the one
  * defined for the feTurbulence filter of the SVG specification.  What

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/DefaultBrokenLinkProvider.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/DefaultBrokenLinkProvider.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/DefaultBrokenLinkProvider.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/DefaultBrokenLinkProvider.java Mon Jan 22 03:35:44 2007
@@ -26,7 +26,7 @@
 import org.apache.batik.ext.awt.image.GraphicsUtil;
 import org.apache.batik.ext.awt.image.renderable.Filter;
 import org.apache.batik.ext.awt.image.renderable.RedRable;
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 public class DefaultBrokenLinkProvider 
     extends BrokenLinkProvider {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java Mon Jan 22 03:35:44 2007
@@ -33,7 +33,7 @@
 import org.apache.batik.ext.awt.image.renderable.Filter;
 import org.apache.batik.ext.awt.image.renderable.ProfileRable;
 import org.apache.batik.util.ParsedURL;
-import org.apache.batik.util.Service;
+import org.apache.xmlgraphics.util.Service;
 
 /**
  * This class handles the registered Image tag handlers.  These are

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the Swing extensions.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES, Messages.class.getClassLoader());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Resources.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Resources.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Resources.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/ext/swing/Resources.java Mon Jan 22 03:35:44 2007
@@ -22,7 +22,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 import org.apache.batik.util.gui.resource.ResourceManager;
 
 /**
@@ -57,7 +57,7 @@
         new ResourceManager(localizableSupport.getResourceBundle());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
@@ -65,7 +65,7 @@
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -73,7 +73,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/extension/svg/HistogramRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/extension/svg/HistogramRed.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/extension/svg/HistogramRed.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/extension/svg/HistogramRed.java Mon Jan 22 03:35:44 2007
@@ -21,8 +21,8 @@
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 
-import org.apache.batik.ext.awt.image.rendered.AbstractRed;
-import org.apache.batik.ext.awt.image.rendered.CachableRed;
+import org.apache.xmlgraphics.image.rendered.AbstractRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 
 /**
  *

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRable8Bit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRable8Bit.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRable8Bit.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRable8Bit.java Mon Jan 22 03:35:44 2007
@@ -32,7 +32,7 @@
 import org.apache.batik.ext.awt.image.renderable.AbstractRable;
 import org.apache.batik.ext.awt.image.renderable.Filter;
 import org.apache.batik.ext.awt.image.renderable.PaintRable;
-import org.apache.batik.ext.awt.image.rendered.CachableRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 import org.apache.batik.ext.awt.image.rendered.TranslateRed;
 import org.apache.batik.gvt.GraphicsNode;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRed8Bit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRed8Bit.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRed8Bit.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/GraphicsNodeRed8Bit.java Mon Jan 22 03:35:44 2007
@@ -30,9 +30,9 @@
 import java.awt.image.WritableRaster;
 
 import org.apache.batik.ext.awt.image.GraphicsUtil;
-import org.apache.batik.ext.awt.image.rendered.AbstractRed;
+import org.apache.xmlgraphics.image.rendered.AbstractRed;
 import org.apache.batik.ext.awt.image.rendered.AbstractTiledRed;
-import org.apache.batik.ext.awt.image.rendered.CachableRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 import org.apache.batik.gvt.GraphicsNode;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/MaskRable8Bit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/MaskRable8Bit.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/MaskRable8Bit.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/filter/MaskRable8Bit.java Mon Jan 22 03:35:44 2007
@@ -29,9 +29,9 @@
 import org.apache.batik.ext.awt.image.renderable.FilterAsAlphaRable;
 import org.apache.batik.ext.awt.image.renderable.PadRable;
 import org.apache.batik.ext.awt.image.renderable.PadRable8Bit;
-import org.apache.batik.ext.awt.image.rendered.CachableRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 import org.apache.batik.ext.awt.image.rendered.MultiplyAlphaRed;
-import org.apache.batik.ext.awt.image.rendered.RenderedImageCachableRed;
+import org.apache.xmlgraphics.image.rendered.RenderedImageCachableRed;
 import org.apache.batik.gvt.GraphicsNode;
 
 /**
@@ -152,7 +152,7 @@
 
         CachableRed cr;
         cr = GraphicsUtil.wrap(ri);
-        cr = GraphicsUtil.convertToLsRGB(cr);
+        cr = GraphicsUtil.convertTosRGB(cr);
 
         // org.apache.batik.test.gvt.ImageDisplay.showImage("Src: ", cr);
         // org.apache.batik.test.gvt.ImageDisplay.showImage("Mask: ", maskCr);

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java Mon Jan 22 03:35:44 2007
@@ -33,7 +33,7 @@
 import org.apache.batik.ext.awt.geom.RectListManager;
 import org.apache.batik.ext.awt.image.GraphicsUtil;
 import org.apache.batik.ext.awt.image.PadMode;
-import org.apache.batik.ext.awt.image.rendered.CachableRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 import org.apache.batik.ext.awt.image.rendered.PadRed;
 import org.apache.batik.util.HaltingThread;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/StaticRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/StaticRenderer.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/StaticRenderer.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/gvt/renderer/StaticRenderer.java Mon Jan 22 03:35:44 2007
@@ -40,7 +40,7 @@
 import org.apache.batik.ext.awt.image.GraphicsUtil;
 import org.apache.batik.ext.awt.image.PadMode;
 import org.apache.batik.ext.awt.image.renderable.Filter;
-import org.apache.batik.ext.awt.image.rendered.CachableRed;
+import org.apache.xmlgraphics.image.rendered.CachableRed;
 import org.apache.batik.ext.awt.image.rendered.PadRed;
 import org.apache.batik.ext.awt.image.rendered.TileCacheRed;
 import org.apache.batik.ext.awt.image.rendered.TranslateRed;

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/AbstractParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/AbstractParser.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/AbstractParser.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/AbstractParser.java Mon Jan 22 03:35:44 2007
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 import org.apache.batik.util.io.NormalizingReader;
 import org.apache.batik.util.io.StreamNormalizingReader;
 import org.apache.batik.util.io.StringNormalizingReader;
@@ -74,14 +74,14 @@
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public Locale getLocale() {
         return localizableSupport.getLocale();
@@ -89,7 +89,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/Parser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/Parser.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/Parser.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/parser/Parser.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 
 import java.io.Reader;
 
-import org.apache.batik.i18n.Localizable;
+import org.apache.xmlgraphics.util.i18n.Localizable;
 
 /**
  * This interface represents a parser.

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/Interpreter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/Interpreter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/Interpreter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/Interpreter.java Mon Jan 22 03:35:44 2007
@@ -29,7 +29,7 @@
  * @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
  * @version $Id$
  */
-public interface Interpreter extends org.apache.batik.i18n.Localizable {
+public interface Interpreter extends org.apache.xmlgraphics.util.i18n.Localizable {
 
     /**
      * This method should evaluate a piece of script associated to a given 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/InterpreterPool.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/InterpreterPool.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/InterpreterPool.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/InterpreterPool.java Mon Jan 22 03:35:44 2007
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.util.Service;
+import org.apache.xmlgraphics.util.Service;
 
 import org.w3c.dom.Document;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jacl/JaclInterpreter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jacl/JaclInterpreter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jacl/JaclInterpreter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jacl/JaclInterpreter.java Mon Jan 22 03:35:44 2007
@@ -96,7 +96,7 @@
         // no implementation of a default output function in Jacl
     }
 
-    // org.apache.batik.i18n.Localizable implementation
+    // org.apache.xmlgraphics.util.i18n.Localizable implementation
 
     public Locale getLocale() {
         return Locale.getDefault();

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jpython/JPythonInterpreter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jpython/JPythonInterpreter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jpython/JPythonInterpreter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/jpython/JPythonInterpreter.java Mon Jan 22 03:35:44 2007
@@ -82,7 +82,7 @@
         interpreter.setOut(out);
     }
 
-    // org.apache.batik.i18n.Localizable implementation
+    // org.apache.xmlgraphics.util.i18n.Localizable implementation
 
     public Locale getLocale() {
         return null;

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 import org.apache.batik.util.gui.resource.ResourceManager;
 
 /**
@@ -56,7 +56,7 @@
         new ResourceManager(localizableSupport.getResourceBundle());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
@@ -64,7 +64,7 @@
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -72,7 +72,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/RhinoInterpreter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/RhinoInterpreter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/RhinoInterpreter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/script/rhino/RhinoInterpreter.java Mon Jan 22 03:35:44 2007
@@ -493,7 +493,7 @@
         // no implementation of a default output function in Rhino
     }
 
-    // org.apache.batik.i18n.Localizable implementation
+    // org.apache.xmlgraphics.util.i18n.Localizable implementation
 
     /**
      * Returns the current locale or null if the locale currently used is

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java Mon Jan 22 03:35:44 2007
@@ -79,7 +79,7 @@
             } catch (ThreadDeath td) {
                 throw td;
             } catch (Throwable t) {
-                // happen only if Batik extensions are not their
+                // happen only if Batik extensions are not there
             } finally {
                 initDone = true;
             }

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java Mon Jan 22 03:35:44 2007
@@ -23,8 +23,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 import org.apache.batik.util.Base64EncoderStream;
 import org.w3c.dom.Element;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerJPEGEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerJPEGEncoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerJPEGEncoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerJPEGEncoder.java Mon Jan 22 03:35:44 2007
@@ -22,9 +22,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 
 /**
  * GenericImageHandler which caches JPEG images.

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java Mon Jan 22 03:35:44 2007
@@ -22,8 +22,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 
 /**
  * GenericImageHandler which caches PNG images.

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMGroupManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMGroupManager.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMGroupManager.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMGroupManager.java Mon Jan 22 03:35:44 2007
@@ -22,8 +22,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
-import org.apache.batik.ext.awt.g2d.TransformStackElement;
+import org.apache.xmlgraphics.java2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.TransformStackElement;
 import org.w3c.dom.Element;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMTreeManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMTreeManager.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMTreeManager.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DOMTreeManager.java Mon Jan 22 03:35:44 2007
@@ -24,7 +24,7 @@
 import java.util.Map;
 import java.util.ArrayList;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java Mon Jan 22 03:35:44 2007
@@ -105,7 +105,7 @@
                 createGraphics = clazz.getMethod("createGraphics", paramc);
                 paramo = new Object[1];
             } catch (Throwable t) {
-                // happen only if Batik extensions are not their
+                // happen only if Batik extensions are not there
             } finally {
                 initDone = true;
             }

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java Mon Jan 22 03:35:44 2007
@@ -28,8 +28,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 import org.apache.batik.util.Base64EncoderStream;
 import org.w3c.dom.Element;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java Mon Jan 22 03:35:44 2007
@@ -25,9 +25,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 
 /**
  * This implementation of the abstract AbstractImageHandlerEncoder

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java Mon Jan 22 03:35:44 2007
@@ -25,8 +25,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 
 /**
  * This implementation of the abstract AbstractImageHandlerEncoder

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGAlphaComposite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGAlphaComposite.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGAlphaComposite.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGAlphaComposite.java Mon Jan 22 03:35:44 2007
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Element;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGBasicStroke.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGBasicStroke.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGBasicStroke.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGBasicStroke.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 
 import java.awt.BasicStroke;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 /**
  * Utility class that converts a Java BasicStroke object into

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClip.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClip.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClip.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClip.java Mon Jan 22 03:35:44 2007
@@ -22,7 +22,7 @@
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Element;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClipDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClipDescriptor.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClipDescriptor.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGClipDescriptor.java Mon Jan 22 03:35:44 2007
@@ -30,7 +30,7 @@
  *
  * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  * @version $Id$
- * @see           org.apache.batik.ext.awt.g2d.GraphicContext
+ * @see           org.apache.xmlgraphics.java2d.GraphicContext
  * @see           org.apache.batik.svggen.SVGDescriptor
  */
 public class SVGClipDescriptor implements SVGDescriptor, SVGSyntax{

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGColor.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGColor.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGColor.java Mon Jan 22 03:35:44 2007
@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 /**
  * Utility class that converts a Color object into a set of

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGComposite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGComposite.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGComposite.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGComposite.java Mon Jan 22 03:35:44 2007
@@ -23,7 +23,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 /**
  * Utility class that converts a Composite object into

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGConverter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGConverter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGConverter.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 /**
  * Defines the interface for classes that are able to convert
@@ -28,7 +28,7 @@
  *
  * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  * @version $Id$
- * @see           org.apache.batik.ext.awt.g2d.GraphicContext
+ * @see           org.apache.xmlgraphics.java2d.GraphicContext
  */
 public interface SVGConverter extends SVGSyntax{
     /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomComposite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomComposite.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomComposite.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomComposite.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 
 import java.awt.Composite;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Element;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomPaint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomPaint.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomPaint.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGCustomPaint.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 
 import java.awt.Paint;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Element;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGDescriptor.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGDescriptor.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGDescriptor.java Mon Jan 22 03:35:44 2007
@@ -27,7 +27,7 @@
  *
  * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  * @version $Id$
- * @see           org.apache.batik.ext.awt.g2d.GraphicContext
+ * @see           org.apache.xmlgraphics.java2d.GraphicContext
  */
 public interface SVGDescriptor{
     /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGFont.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGFont.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGFont.java Mon Jan 22 03:35:44 2007
@@ -29,7 +29,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContext.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContext.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContext.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.batik.ext.awt.g2d.TransformStackElement;
+import org.apache.xmlgraphics.java2d.TransformStackElement;
 import org.apache.batik.util.SVGConstants;
 
 /**

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java Mon Jan 22 03:35:44 2007
@@ -23,8 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
-import org.apache.batik.ext.awt.g2d.TransformStackElement;
+import org.apache.xmlgraphics.java2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.TransformStackElement;
 
 /**
  * This class performs the task of converting the state of the

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphics2D.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphics2D.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGGraphics2D.java Mon Jan 22 03:35:44 2007
@@ -51,8 +51,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.batik.ext.awt.g2d.AbstractGraphics2D;
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.AbstractGraphics2D;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
@@ -81,7 +81,7 @@
  *
  * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  * @version $Id$
- * @see                org.apache.batik.ext.awt.g2d.GraphicContext
+ * @see                org.apache.xmlgraphics.java2d.GraphicContext
  * @see                org.apache.batik.svggen.DOMTreeManager
  * @see                org.apache.batik.svggen.DOMGroupManager
  * @see                org.apache.batik.svggen.ImageHandler

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGLinearGradient.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGLinearGradient.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGLinearGradient.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGLinearGradient.java Mon Jan 22 03:35:44 2007
@@ -22,7 +22,7 @@
 import java.awt.Paint;
 import java.awt.geom.Point2D;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGPaint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGPaint.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGPaint.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGPaint.java Mon Jan 22 03:35:44 2007
@@ -25,7 +25,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 /**
  * Utility class that converts a Paint object into an

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGRenderingHints.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGRenderingHints.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGRenderingHints.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGRenderingHints.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 
 import java.awt.RenderingHints;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 
 /**
  * Utility class that converts a RenderingHints object into

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTexturePaint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTexturePaint.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTexturePaint.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTexturePaint.java Mon Jan 22 03:35:44 2007
@@ -24,7 +24,7 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransform.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransform.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransform.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransform.java Mon Jan 22 03:35:44 2007
@@ -20,9 +20,9 @@
 
 import java.util.Stack;
 
-import org.apache.batik.ext.awt.g2d.GraphicContext;
-import org.apache.batik.ext.awt.g2d.TransformStackElement;
-import org.apache.batik.ext.awt.g2d.TransformType;
+import org.apache.xmlgraphics.java2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.TransformStackElement;
+import org.apache.xmlgraphics.java2d.TransformType;
 
 /**
  * Utility class that converts a GraphicContext transform stack

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransformDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransformDescriptor.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransformDescriptor.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/SVGTransformDescriptor.java Mon Jan 22 03:35:44 2007
@@ -28,7 +28,7 @@
  *
  * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  * @version $Id$
- * @see           org.apache.batik.ext.awt.g2d.GraphicContext
+ * @see           org.apache.xmlgraphics.java2d.GraphicContext
  */
 public class SVGTransformDescriptor implements SVGDescriptor, SVGSyntax{
     private String transform;

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/font/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/font/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/font/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/svggen/font/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the bridge module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES, Messages.class.getClassLoader());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/Messages.java Mon Jan 22 03:35:44 2007
@@ -22,7 +22,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -50,14 +50,14 @@
         new LocalizableSupport(RESOURCES, Messages.class.getClassLoader());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -65,7 +65,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/svg/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/svg/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/svg/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/swing/svg/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the css.engine module.
@@ -50,14 +50,14 @@
         new LocalizableSupport(RESOURCES, Messages.class.getClassLoader());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -65,7 +65,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/JPEGTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/JPEGTranscoder.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/JPEGTranscoder.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/JPEGTranscoder.java Mon Jan 22 03:35:44 2007
@@ -23,9 +23,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterParams;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.TranscodingHints;

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/resources/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/resources/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/resources/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/image/resources/Messages.java Mon Jan 22 03:35:44 2007
@@ -22,7 +22,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the image transcoder module.
@@ -51,14 +51,14 @@
 
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -66,7 +66,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,6 @@
 package org.apache.batik.transcoder.wmf.tosvg;
 
 import java.io.BufferedInputStream;
-import java.io.UnsupportedEncodingException;
 import java.awt.Font;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -29,8 +28,6 @@
 import java.text.AttributedCharacterIterator;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
-
-import org.apache.batik.transcoder.wmf.WMFConstants;
 
 /** This class provides generic methods that must be used by a particular WMFPainter.
  */

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java Mon Jan 22 03:35:44 2007
@@ -25,7 +25,6 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Vector;
 import java.util.List;
 import java.util.ArrayList;
 

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 import org.apache.batik.util.gui.resource.ResourceManager;
 
 /**
@@ -56,7 +56,7 @@
         new ResourceManager(localizableSupport.getResourceBundle());
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
@@ -64,7 +64,7 @@
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -72,7 +72,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURL.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURL.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURL.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURL.java Mon Jan 22 03:35:44 2007
@@ -28,6 +28,7 @@
 import java.util.Map;
 
 import org.apache.batik.Version;
+import org.apache.xmlgraphics.util.Service;
 
 /**
  * This class is used as a replacement for java.net.URL.  This is done

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURLDataProtocolHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURLDataProtocolHandler.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURLDataProtocolHandler.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/ParsedURLDataProtocolHandler.java Mon Jan 22 03:35:44 2007
@@ -23,6 +23,8 @@
 import java.io.InputStream;
 import java.util.Iterator;
 
+import org.apache.xmlgraphics.util.io.Base64DecodeStream;
+
 /**
  * Protocol Handler for the 'data' protocol.
  * RFC: 2397

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/io/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/io/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/io/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/io/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the IO utilities classes.
@@ -51,14 +51,14 @@
 
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -66,7 +66,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/resources/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/resources/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/util/resources/Messages.java Mon Jan 22 03:35:44 2007
@@ -22,7 +22,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the utilities classes.
@@ -51,14 +51,14 @@
 
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -66,7 +66,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/xml/XMLScanner.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/xml/XMLScanner.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/xml/XMLScanner.java (original)
+++ xmlgraphics/batik/branches/commons-integration/sources/org/apache/batik/xml/XMLScanner.java Mon Jan 22 03:35:44 2007
@@ -24,8 +24,8 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.Localizable;
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.Localizable;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 import org.apache.batik.util.io.NormalizingReader;
 import org.apache.batik.util.io.StreamNormalizingReader;
 import org.apache.batik.util.io.StringNormalizingReader;
@@ -250,14 +250,14 @@
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public  void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public Locale getLocale() {
         return localizableSupport.getLocale();
@@ -265,7 +265,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/geom/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/geom/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/geom/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/geom/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java Mon Jan 22 03:35:44 2007
@@ -23,7 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.batik.util.Base64DecodeStream;
+import org.apache.xmlgraphics.util.io.Base64DecodeStream;
 import org.apache.batik.util.Base64EncoderStream;
 
 

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java Mon Jan 22 03:35:44 2007
@@ -18,6 +18,11 @@
 package org.apache.batik.ext.awt.image.codec.png;
 
 import org.apache.batik.test.*;
+import org.apache.xmlgraphics.image.codec.png.PNGDecodeParam;
+import org.apache.xmlgraphics.image.codec.png.PNGEncodeParam;
+import org.apache.xmlgraphics.image.codec.png.PNGImageDecoder;
+import org.apache.xmlgraphics.image.codec.png.PNGImageEncoder;
+
 import java.awt.*;
 import java.awt.geom.*;
 import java.awt.image.*;

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/gvt/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/gvt/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/gvt/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/gvt/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/svggen/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/svggen/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/svggen/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/svggen/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/swing/TestMessages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/swing/TestMessages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/swing/TestMessages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/swing/TestMessages.java Mon Jan 22 03:35:44 2007
@@ -20,7 +20,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -48,14 +48,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -63,7 +63,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java Mon Jan 22 03:35:44 2007
@@ -44,8 +44,8 @@
 import org.apache.batik.ext.awt.image.GraphicsUtil;
 
 import org.apache.batik.ext.awt.image.spi.ImageTagRegistry;
-import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.apache.xmlgraphics.image.writer.ImageWriter;
+import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
 import org.apache.batik.ext.awt.image.renderable.Filter;
 
 import org.apache.batik.util.ParsedURL;

Modified: xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/Messages.java?view=diff&rev=498585&r1=498584&r2=498585
==============================================================================
--- xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/Messages.java (original)
+++ xmlgraphics/batik/branches/commons-integration/test-sources/org/apache/batik/test/svg/Messages.java Mon Jan 22 03:35:44 2007
@@ -21,7 +21,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 
-import org.apache.batik.i18n.LocalizableSupport;
+import org.apache.xmlgraphics.util.i18n.LocalizableSupport;
 
 /**
  * This class manages the message for the test.svg module.
@@ -49,14 +49,14 @@
         new LocalizableSupport(RESOURCES);
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#setLocale(Locale)}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#setLocale(Locale)}.
      */
     public static void setLocale(Locale l) {
         localizableSupport.setLocale(l);
     }
 
     /**
-     * Implements {@link org.apache.batik.i18n.Localizable#getLocale()}.
+     * Implements {@link org.apache.xmlgraphics.util.i18n.Localizable#getLocale()}.
      */
     public static Locale getLocale() {
         return localizableSupport.getLocale();
@@ -64,7 +64,7 @@
 
     /**
      * Implements {@link
-     * org.apache.batik.i18n.Localizable#formatMessage(String,Object[])}.
+     * org.apache.xmlgraphics.util.i18n.Localizable#formatMessage(String,Object[])}.
      */
     public static String formatMessage(String key, Object[] args)
         throws MissingResourceException {