You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2009/07/26 14:30:00 UTC
svn commit: r797922 -
/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/
Author: lehmi
Date: Sun Jul 26 12:30:00 2009
New Revision: 797922
URL: http://svn.apache.org/viewvc?rev=797922&view=rev
Log:
PDFBOX-464: reestablish checkstyle compliance
Modified:
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/Concatenate.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineCapStyle.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineJoinStyle.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/Concatenate.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/Concatenate.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/Concatenate.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/Concatenate.java Sun Jul 26 12:30:00 2009
@@ -21,7 +21,6 @@
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.util.Matrix;
import org.apache.pdfbox.util.PDFOperator;
-import org.apache.pdfbox.pdfviewer.PageDrawer;
/**
*
@@ -30,7 +29,7 @@
* the long sequence of conditions in processOperator is remplaced by
* this strategy pattern</p>
* <p>Copyright : Copyright (c) 2004</p>
- * <p>Société : DBGS</p>
+ * <p>Soci�t� : DBGS</p>
* @author Huault : huault@free.fr
* @version $Revision: 1.5 $
*/
@@ -42,6 +41,7 @@
* process : cm : Concatenate matrix to current transformation matrix.
* @param operator The operator that is being executed.
* @param arguments List
+ * @throws IOException If there is an error processing the operator.
*/
public void process(PDFOperator operator, List arguments) throws IOException
{
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineCapStyle.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineCapStyle.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineCapStyle.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineCapStyle.java Sun Jul 26 12:30:00 2009
@@ -18,7 +18,6 @@
import java.util.List;
-import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.util.PDFOperator;
@@ -34,7 +33,7 @@
{
/**
- * Set the line cap style
+ * Set the line cap style.
* @param operator The operator that is being executed.
* @param arguments List
*
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineJoinStyle.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineJoinStyle.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineJoinStyle.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetLineJoinStyle.java Sun Jul 26 12:30:00 2009
@@ -18,7 +18,6 @@
import java.util.List;
-import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.util.PDFOperator;
@@ -34,7 +33,7 @@
{
/**
- * Set the line cap style
+ * Set the line cap style.
* @param operator The operator that is being executed.
* @param arguments List
*
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java Sun Jul 26 12:30:00 2009
@@ -18,8 +18,14 @@
import java.util.List;
-import org.apache.pdfbox.pdmodel.graphics.color.*;
-import org.apache.pdfbox.util.*;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceCMYK;
+import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
+import org.apache.pdfbox.pdmodel.graphics.color.PDCalRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDSeparation;
+import org.apache.pdfbox.util.PDFOperator;
import java.io.IOException;
/**
@@ -41,31 +47,46 @@
PDColorSpace colorSpace = context.getGraphicsState().getNonStrokingColorSpace().getColorSpace();
if (colorSpace != null)
{
- //logger().info("Setting NonStroking colorspace to " + colorSpace);
-
OperatorProcessor newOperator = null;
if (colorSpace instanceof PDDeviceGray)
+ {
newOperator = new SetNonStrokingGrayColor();
+ }
else if (colorSpace instanceof PDDeviceRGB)
+ {
newOperator = new SetNonStrokingRGBColor();
+ }
else if (colorSpace instanceof PDDeviceCMYK)
+ {
newOperator = new SetNonStrokingCMYKColor();
+ }
else if (colorSpace instanceof PDICCBased)
+ {
newOperator = new SetNonStrokingICCBasedColor();
- else if (colorSpace instanceof PDCalRGB)
+ }
+ else if (colorSpace instanceof PDCalRGB)
+ {
newOperator = new SetNonStrokingCalRGBColor();
- else if (colorSpace instanceof PDSeparation)
- newOperator = new SetNonStrokingSeparation();
+ }
+ else if (colorSpace instanceof PDSeparation)
+ {
+ newOperator = new SetNonStrokingSeparation();
+ }
if (newOperator != null)
{
newOperator.setContext(getContext());
newOperator.process(operator, arguments);
}
- else
- logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
- }
- else
- logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
+ else
+ {
+ logger().warning("Not supported colorspace "+colorSpace.getName()
+ + " within operator "+operator.getOperation());
+ }
+ }
+ else
+ {
+ logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
+ }
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java Sun Jul 26 12:30:00 2009
@@ -18,10 +18,15 @@
import java.util.List;
-import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.pdmodel.graphics.color.*;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpaceInstance;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceCMYK;
+import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
+import org.apache.pdfbox.pdmodel.graphics.color.PDCalRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDSeparation;
import org.apache.pdfbox.util.PDFOperator;
-import org.apache.pdfbox.pdfviewer.PageDrawer;
import java.io.IOException;
@@ -41,43 +46,55 @@
public void process(PDFOperator operator, List arguments) throws IOException
{
PDColorSpaceInstance colorInstance = context.getGraphicsState().getNonStrokingColorSpace();
- PDColorSpace colorSpace = colorInstance.getColorSpace() ;//.getAlternateColorSpace();
- List argList = arguments;
+ PDColorSpace colorSpace = colorInstance.getColorSpace();
+ List argList = arguments;
- //logger().info("handling color space " + colorSpace.toString());
- if (colorSpace instanceof PDSeparation){
- PDSeparation sep = (PDSeparation) colorSpace;
- colorSpace = sep.getAlternateColorSpace();
- argList = sep.getColorValues().toList();
- //logger().info("now handling alternate color space " + colorSpace.toString());
- }
+ if (colorSpace instanceof PDSeparation)
+ {
+ PDSeparation sep = (PDSeparation) colorSpace;
+ colorSpace = sep.getAlternateColorSpace();
+ argList = sep.getColorValues().toList();
+ }
- if (colorSpace != null)
- {
- OperatorProcessor newOperator = null;
- if (colorSpace instanceof PDDeviceGray)
- newOperator = new SetNonStrokingGrayColor();
- else if (colorSpace instanceof PDDeviceRGB)
- newOperator = new SetNonStrokingRGBColor();
- else if (colorSpace instanceof PDDeviceCMYK)
- newOperator = new SetNonStrokingCMYKColor();
- else if (colorSpace instanceof PDICCBased)
- newOperator = new SetNonStrokingICCBasedColor();
- else if (colorSpace instanceof PDCalRGB)
- newOperator = new SetNonStrokingCalRGBColor();
- else if (colorSpace instanceof PDSeparation)
- newOperator = new SetNonStrokingSeparation();
-
- if (newOperator != null)
+ if (colorSpace != null)
{
- newOperator.setContext(getContext());
- newOperator.process(operator, argList);
+ OperatorProcessor newOperator = null;
+ if (colorSpace instanceof PDDeviceGray)
+ {
+ newOperator = new SetNonStrokingGrayColor();
+ }
+ else if (colorSpace instanceof PDDeviceRGB)
+ {
+ newOperator = new SetNonStrokingRGBColor();
+ }
+ else if (colorSpace instanceof PDDeviceCMYK)
+ {
+ newOperator = new SetNonStrokingCMYKColor();
+ }
+ else if (colorSpace instanceof PDICCBased)
+ {
+ newOperator = new SetNonStrokingICCBasedColor();
+ }
+ else if (colorSpace instanceof PDCalRGB)
+ {
+ newOperator = new SetNonStrokingCalRGBColor();
+ }
+ else if (colorSpace instanceof PDSeparation)
+ {
+ newOperator = new SetNonStrokingSeparation();
+ }
+
+ if (newOperator != null)
+ {
+ newOperator.setContext(getContext());
+ newOperator.process(operator, argList);
+ }
+ else
+ {
+ logger().warning("Not supported colorspace "+colorSpace.getName()
+ + " within operator "+operator.getOperation());
+ }
}
- else
- logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
- }
-
- //} else throw new IOException ("Invalid attempt to process colorspace " + colorSpace.toString() + " in SetNonStrokingSeparation");
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java Sun Jul 26 12:30:00 2009
@@ -18,7 +18,13 @@
import java.util.List;
-import org.apache.pdfbox.pdmodel.graphics.color.*;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceCMYK;
+import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
+import org.apache.pdfbox.pdmodel.graphics.color.PDCalRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDSeparation;
import org.apache.pdfbox.util.PDFOperator;
import java.io.IOException;
@@ -38,34 +44,48 @@
*/
public void process(PDFOperator operator, List arguments) throws IOException
{
- PDColorSpace colorSpace = context.getGraphicsState().getStrokingColorSpace().getColorSpace();
- if (colorSpace != null)
- {
- OperatorProcessor newOperator = null;
- if (colorSpace instanceof PDDeviceGray)
- newOperator = new SetStrokingGrayColor();
- else if (colorSpace instanceof PDDeviceRGB)
- newOperator = new SetStrokingRGBColor();
- else if (colorSpace instanceof PDDeviceCMYK)
- newOperator = new SetStrokingCMYKColor();
- else if (colorSpace instanceof PDICCBased)
- newOperator = new SetStrokingICCBasedColor();
- else if (colorSpace instanceof PDCalRGB)
- newOperator = new SetStrokingCalRGBColor();
- else if (colorSpace instanceof PDSeparation)
- newOperator = new SetNonStrokingSeparation();
-
- if (newOperator != null)
- {
- newOperator.setContext(getContext());
- newOperator.process(operator, arguments);
- }
- else
- logger().info("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
- }
- else
- logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
-
+ PDColorSpace colorSpace = context.getGraphicsState().getStrokingColorSpace().getColorSpace();
+ if (colorSpace != null)
+ {
+ OperatorProcessor newOperator = null;
+ if (colorSpace instanceof PDDeviceGray)
+ {
+ newOperator = new SetStrokingGrayColor();
+ }
+ else if (colorSpace instanceof PDDeviceRGB)
+ {
+ newOperator = new SetStrokingRGBColor();
+ }
+ else if (colorSpace instanceof PDDeviceCMYK)
+ {
+ newOperator = new SetStrokingCMYKColor();
+ }
+ else if (colorSpace instanceof PDICCBased)
+ {
+ newOperator = new SetStrokingICCBasedColor();
+ }
+ else if (colorSpace instanceof PDCalRGB)
+ {
+ newOperator = new SetStrokingCalRGBColor();
+ }
+ else if (colorSpace instanceof PDSeparation)
+ {
+ newOperator = new SetNonStrokingSeparation();
+ }
+ if (newOperator != null)
+ {
+ newOperator.setContext(getContext());
+ newOperator.process(operator, arguments);
+ }
+ else
+ {
+ logger().info("Not supported colorspace "+colorSpace.getName()
+ + " within operator "+operator.getOperation());
+ }
+ }
+ else
+ {
+ logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
+ }
}
-
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java?rev=797922&r1=797921&r2=797922&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java Sun Jul 26 12:30:00 2009
@@ -18,10 +18,15 @@
import java.util.List;
-import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.pdmodel.graphics.color.*;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpaceInstance;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceCMYK;
+import org.apache.pdfbox.pdmodel.graphics.color.PDICCBased;
+import org.apache.pdfbox.pdmodel.graphics.color.PDCalRGB;
+import org.apache.pdfbox.pdmodel.graphics.color.PDSeparation;
import org.apache.pdfbox.util.PDFOperator;
-import org.apache.pdfbox.pdfviewer.PageDrawer;
import java.io.IOException;
@@ -41,40 +46,58 @@
public void process(PDFOperator operator, List arguments) throws IOException
{
PDColorSpaceInstance colorInstance = context.getGraphicsState().getStrokingColorSpace();
- PDColorSpace colorSpace = colorInstance.getColorSpace() ;//.getAlternateColorSpace();
- logger().info("handling color space " + colorSpace.toString());
- //logger().info("Arguments: " + arguments.toString());
- if (colorSpace instanceof PDSeparation){
- PDSeparation sep = (PDSeparation) colorSpace;
- colorSpace = sep.getAlternateColorSpace();
- logger().info("now handling alternate color space " + colorSpace.toString());
-
- if (colorSpace != null)
- {
- OperatorProcessor newOperator = null;
- if (colorSpace instanceof PDDeviceGray)
- newOperator = new SetStrokingGrayColor();
- else if (colorSpace instanceof PDDeviceRGB)
- newOperator = new SetStrokingRGBColor();
- else if (colorSpace instanceof PDDeviceCMYK)
- newOperator = new SetStrokingCMYKColor();
- else if (colorSpace instanceof PDICCBased)
- newOperator = new SetStrokingICCBasedColor();
- else if (colorSpace instanceof PDCalRGB)
- newOperator = new SetStrokingCalRGBColor();
- else if (colorSpace instanceof PDSeparation)
- newOperator = new SetStrokingSeparation();
-
- if (newOperator != null)
- {
- newOperator.setContext(getContext());
- newOperator.process(operator, sep.getColorValues().toList());
- }
- else
- logger().warning("Not supported colorspace "+colorSpace.getName() + " within operator "+operator.getOperation());
- }
-
- } else throw new IOException ("Invalid attempt to process colorspace " + colorSpace.toString() + " in SetStrokingSeparation");
+ PDColorSpace colorSpace = colorInstance.getColorSpace();
+ logger().info("handling color space " + colorSpace.toString());
+ if (colorSpace instanceof PDSeparation)
+ {
+ PDSeparation sep = (PDSeparation) colorSpace;
+ colorSpace = sep.getAlternateColorSpace();
+ logger().info("now handling alternate color space " + colorSpace.toString());
+ if (colorSpace != null)
+ {
+ OperatorProcessor newOperator = null;
+ if (colorSpace instanceof PDDeviceGray)
+ {
+ newOperator = new SetStrokingGrayColor();
+ }
+ else if (colorSpace instanceof PDDeviceRGB)
+ {
+ newOperator = new SetStrokingRGBColor();
+ }
+ else if (colorSpace instanceof PDDeviceCMYK)
+ {
+ newOperator = new SetStrokingCMYKColor();
+ }
+ else if (colorSpace instanceof PDICCBased)
+ {
+ newOperator = new SetStrokingICCBasedColor();
+ }
+ else if (colorSpace instanceof PDCalRGB)
+ {
+ newOperator = new SetStrokingCalRGBColor();
+ }
+ else if (colorSpace instanceof PDSeparation)
+ {
+ newOperator = new SetStrokingSeparation();
+ }
+
+ if (newOperator != null)
+ {
+ newOperator.setContext(getContext());
+ newOperator.process(operator, sep.getColorValues().toList());
+ }
+ else
+ {
+ logger().warning("Not supported colorspace "+colorSpace.getName()
+ + " within operator "+operator.getOperation());
+ }
+ }
+ }
+ else
+ {
+ throw new IOException("Invalid attempt to process colorspace "
+ + colorSpace.toString() + " in SetStrokingSeparation");
+ }
}
}