svn commit: r1378739 - in /xmlgraphics/batik/trunk: build.xml sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java

[deweese]

Author: deweese
Date: Wed Aug 29 21:18:27 2012
New Revision: 1378739

URL: http://svn.apache.org/viewvc?rev=1378739&view=rev
Log:
Revert change to build.xml

Modified:
    xmlgraphics/batik/trunk/build.xml
    
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
    
xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java

Modified: xmlgraphics/batik/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?rev=1378739&r1=1378738&r2=1378739&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Wed Aug 29 21:18:27 2012
@@ -138,6 +138,9 @@ To display the available targets type:
     </path>
   
     <path id="libs-build-classpath">
+      <fileset dir="lib/build">
+        <include name="stylebook*.jar"/>
+      </fileset>
       <fileset dir="lib">
         <include name="xalan*.jar"/>
         <include name="xerces*.jar"/>
@@ -965,6 +968,9 @@ JAVA=/usr/bin/java
           outputproperty="svn-revision-number"
           errorproperty="svn-revision-transform-error"
           resultproperty="svn-revision-transform-result">
+      <classpath>
+        <path refid="libs-build-classpath"/>
+      </classpath>
       <arg line="-in svn-info.xml -xsl ${lib}/build/svn-info-revision.xsl"/>
     </java>
     <condition property="svn-revision-determined">

Modified: 
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java?rev=1378739&r1=1378738&r2=1378739&view=diff
==============================================================================
--- 
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
 (original)
+++ 
xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
 Wed Aug 29 21:18:27 2012
@@ -30,7 +30,7 @@ import org.apache.batik.util.Service;
  */
 public class ImageWriterRegistry {
 
-    private static volatile ImageWriterRegistry instance;
+    private static ImageWriterRegistry instance;
 
     private final Map imageWriterMap = new HashMap();
 
@@ -39,14 +39,12 @@ public class ImageWriterRegistry {
     }
 
     public static ImageWriterRegistry getInstance() {
-        if (instance == null) {
-            synchronized( ImageWriterRegistry.class ){
-                if ( instance == null ){
-                    instance = new ImageWriterRegistry();
-                }
-            }
+      synchronized( ImageWriterRegistry.class ){
+        if ( instance == null ){
+          instance = new ImageWriterRegistry();
         }
         return instance;
+      }
     }
 
     private void setup() {

Modified: 
xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java?rev=1378739&r1=1378738&r2=1378739&view=diff
==============================================================================
--- 
xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
 (original)
+++ 
xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
 Wed Aug 29 21:18:27 2012
@@ -879,7 +879,6 @@ public class StrokingTextPainter extends
             TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
             if (tpi != null) {
                 visible = tpi.visible;
-                System.err.println("Visible: " + visible);
                 if (tpi.composite != null) {
                     g2d.setComposite(tpi.composite);
                 }