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/12/08 20:48:01 UTC
svn commit: r888549 - in
/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator: SetMatrix.java
SetMoveAndShow.java SetTextFont.java SetTextLeading.java
SetWordSpacing.java ShowText.java ShowTextGlyph.java
Author: lehmi
Date: Tue Dec 8 19:48:00 2009
New Revision: 888549
URL: http://svn.apache.org/viewvc?rev=888549&view=rev
Log:
PDFBOX-572: using generics after upgrading to java5 and removing some old copyright fragments
Modified:
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMatrix.java
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMoveAndShow.java
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextFont.java
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextLeading.java
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetWordSpacing.java
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowText.java
pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowTextGlyph.java
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMatrix.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMatrix.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMatrix.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMatrix.java Tue Dec 8 19:48:00 2009
@@ -17,16 +17,13 @@
package org.apache.pdfbox.util.operator;
import java.util.List;
+
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.util.Matrix;
import org.apache.pdfbox.util.PDFOperator;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class : 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.4 $
*/
@@ -39,7 +36,7 @@
* @param operator The operator that is being executed.
* @param arguments List
*/
- public void process(PDFOperator operator, List arguments)
+ public void process(PDFOperator operator, List<COSBase> arguments)
{
//Set text matrix and text line matrix
COSNumber a = (COSNumber)arguments.get( 0 );
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMoveAndShow.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMoveAndShow.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMoveAndShow.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetMoveAndShow.java Tue Dec 8 19:48:00 2009
@@ -17,16 +17,13 @@
package org.apache.pdfbox.util.operator;
import java.util.List;
+
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.util.PDFOperator;
import java.io.IOException;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class : 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.6 $
*/
@@ -39,7 +36,7 @@
* @param arguments List.
* @throws IOException If there is an error processing the operator.
*/
- public void process(PDFOperator operator, List arguments) throws IOException
+ public void process(PDFOperator operator, List<COSBase> arguments) throws IOException
{
//Set word and character spacing, move to next line, and show text
//
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextFont.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextFont.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextFont.java Tue Dec 8 19:48:00 2009
@@ -18,6 +18,7 @@
import java.util.List;
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdmodel.font.PDFont;
@@ -26,12 +27,6 @@
import java.io.IOException;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class :
- * 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.5 $
*/
@@ -44,7 +39,7 @@
* @param arguments List
* @throws IOException If an error occurs while processing the font.
*/
- public void process(PDFOperator operator, List arguments) throws IOException
+ public void process(PDFOperator operator, List<COSBase> arguments) throws IOException
{
//there are some documents that are incorrectly structured and
//arguments are in the wrong spot, so we will silently ignore them
@@ -56,13 +51,6 @@
float fontSize = ((COSNumber)arguments.get( 1 ) ).floatValue();
context.getGraphicsState().getTextState().setFontSize( fontSize );
- //old way
- //graphicsState.getTextState().getFont() = (COSObject)stream.getDictionaryObject( fontName );
- //if( graphicsState.getTextState().getFont() == null )
- //{
- // graphicsState.getTextState().getFont() = (COSObject)graphicsState.getTextState().getFont()
- // Dictionary.getItem( fontName );
- //}
context.getGraphicsState().getTextState().setFont( (PDFont)context.getFonts().get( fontName.getName() ) );
if( context.getGraphicsState().getTextState().getFont() == null )
{
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextLeading.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextLeading.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextLeading.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetTextLeading.java Tue Dec 8 19:48:00 2009
@@ -18,16 +18,11 @@
import java.util.List;
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.util.PDFOperator;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class :
-* 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.4 $
*/
@@ -39,7 +34,7 @@
* @param operator The operator that is being executed.
* @param arguments List
*/
- public void process(PDFOperator operator, List arguments)
+ public void process(PDFOperator operator, List<COSBase> arguments)
{
COSNumber leading = (COSNumber)arguments.get( 0 );
context.getGraphicsState().getTextState().setLeading( leading.floatValue() );
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetWordSpacing.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetWordSpacing.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetWordSpacing.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetWordSpacing.java Tue Dec 8 19:48:00 2009
@@ -17,15 +17,12 @@
package org.apache.pdfbox.util.operator;
import java.util.List;
+
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.util.PDFOperator;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class : 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.4 $
*/
@@ -37,7 +34,7 @@
* @param operator The operator that is being executed.
* @param arguments List
*/
- public void process(PDFOperator operator, List arguments)
+ public void process(PDFOperator operator, List<COSBase> arguments)
{
//set word spacing
COSNumber wordSpacing = (COSNumber)arguments.get( 0 );
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowText.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowText.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowText.java Tue Dec 8 19:48:00 2009
@@ -18,18 +18,13 @@
import java.util.List;
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.util.PDFOperator;
import java.io.IOException;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class :
- * 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.4 $
*/
@@ -44,7 +39,7 @@
*
* @throws IOException If there is an error processing this operator.
*/
- public void process(PDFOperator operator, List arguments) throws IOException
+ public void process(PDFOperator operator, List<COSBase> arguments) throws IOException
{
COSString string = (COSString)arguments.get( 0 );
context.processEncodedText( string.getBytes() );
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowTextGlyph.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowTextGlyph.java?rev=888549&r1=888548&r2=888549&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowTextGlyph.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/ShowTextGlyph.java Tue Dec 8 19:48:00 2009
@@ -27,11 +27,6 @@
import org.apache.pdfbox.cos.COSString;
/**
- * <p>Titre : PDFEngine Modification.</p>
- * <p>Description : Structal modification of the PDFEngine class : 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>
* @author Huault : huault@free.fr
* @version $Revision: 1.6 $
*/
@@ -44,7 +39,7 @@
* @param arguments List
* @throws IOException If there is an error processing this operator.
*/
- public void process(PDFOperator operator, List arguments) throws IOException
+ public void process(PDFOperator operator, List<COSBase> arguments) throws IOException
{
COSArray array = (COSArray)arguments.get( 0 );
float adjustment=0;