Removed many "// CSOK: ConstantName" instances for constants, by converting them to uppercase as they should really be.

Fixed some other non-Checkstyle issues on the way, imports mainly.
Removed some "log" instances that were not used.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@985571 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/afp/AFPStreamer.java b/src/java/org/apache/fop/afp/AFPStreamer.java
index a24e90cbf..33d1dbf90 100644
--- a/src/java/org/apache/fop/afp/AFPStreamer.java
+++ b/src/java/org/apache/fop/afp/AFPStreamer.java
@@ -31,6 +31,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.fop.afp.modca.ResourceGroup;
 import org.apache.fop.afp.modca.StreamedResourceGroup;
 
@@ -39,7 +40,7 @@ import org.apache.fop.afp.modca.StreamedResourceGroup;
  */
 public class AFPStreamer implements Streamable {
     /** Static logging instance */
-    private static final Log log = LogFactory.getLog(AFPStreamer.class); // CSOK: ConstantName
+    private static final Log LOG = LogFactory.getLog(AFPStreamer.class);
 
     private static final String AFPDATASTREAM_TEMP_FILE_PREFIX = "AFPDataStream_";
 
@@ -119,7 +120,7 @@ public class AFPStreamer implements Streamable {
         if (level.isExternal()) {
             String filePath = level.getExternalFilePath();
             if (filePath == null) {
-                log.warn("No file path provided for external resource, using default.");
+                LOG.warn("No file path provided for external resource, using default.");
                 filePath = defaultResourceGroupFilePath;
             }
             resourceGroup = (ResourceGroup)pathResourceGroupMap.get(filePath);
@@ -128,7 +129,7 @@ public class AFPStreamer implements Streamable {
                 try {
                     os = new BufferedOutputStream(new FileOutputStream(filePath));
                 } catch (FileNotFoundException fnfe) {
-                    log.error("Failed to create/open external resource group file '"
+                    LOG.error("Failed to create/open external resource group file '"
                             + filePath + "'");
                 } finally {
                     if (os != null) {