You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2011/05/26 19:34:59 UTC

svn commit: r1127997 - in /cocoon/cocoon3/trunk/cocoon-optional/src: main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java

Author: reinhard
Date: Thu May 26 17:34:59 2011
New Revision: 1127997

URL: http://svn.apache.org/viewvc?rev=1127997&view=rev
Log:
get rid of compiler warnings
avoid *-imports

Modified:
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java
    cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java?rev=1127997&r1=1127996&r2=1127997&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java Thu May 26 17:34:59 2011
@@ -29,7 +29,7 @@ import org.apache.cocoon.sax.AbstractSAX
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
-import org.apache.fop.apps.MimeConstants;
+import org.apache.xmlgraphics.util.MimeConstants;
 import org.xml.sax.ContentHandler;
 
 public class FopSerializer extends AbstractSAXSerializer implements CachingPipelineComponent {
@@ -59,22 +59,22 @@ public class FopSerializer extends Abstr
         this.outputFormat = outputFormat;
     }
 
+    public CacheKey constructCacheKey() {
+        return new SimpleCacheKey();
+    }
+
     @Override
     public void setOutputStream(OutputStream outputStream) {
         try {
             Fop fop = FOP_FACTORY.newFop(this.outputFormat, outputStream);
-            ContentHandler contentHandler = fop.getDefaultHandler();
+            ContentHandler fopContentHandler = fop.getDefaultHandler();
 
-            this.setContentHandler(contentHandler);
+            this.setContentHandler(fopContentHandler);
         } catch (FOPException e) {
             throw new ProcessingException("Impossible to initialize FOPSerializer", e);
         }
     }
 
-    public CacheKey constructCacheKey() {
-        return new SimpleCacheKey();
-    }
-
     @Override
     public String toString() {
         return StringRepresentation.buildString(this, "outputFormat=" + this.outputFormat);

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java?rev=1127997&r1=1127996&r2=1127997&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java Thu May 26 17:34:59 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.cocoon.optional.pipeline.components.sax.fop;
 
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -50,6 +50,5 @@ public final class FopSerializerTestCase
         FileInputStream fis = new FileInputStream(tmp);
         String pdfContent = IOUtils.toString(fis);
         assertTrue(pdfContent.startsWith("%PDF-1.4"));
-
     }
 }