Don't use raw types! Also check casts where possible

18 files changed, 38 insertions, 23 deletions

diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java
index 7ea4e4d1..540179b8 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java
@@ -55,6 +55,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSStream;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -158,7 +159,6 @@ public class PDFPage extends PDFTextStripper {
 	 * 
 	 * @author Datentechnik Innovation GmbH
 	 */
-	@SuppressWarnings("unchecked")
 	private void registerCustomPathOperators() {
 
 		// *** path construction
@@ -281,7 +281,7 @@ public class PDFPage extends PDFTextStripper {
 		}
 	}
 
-	protected void processOperator(PDFOperator operator, List arguments)
+	protected void processOperator(PDFOperator operator, List<COSBase> arguments)
 			throws IOException {
 		logger.trace("operator = " + operator);
 		super.processOperator(operator, arguments);
@@ -366,14 +366,14 @@ public class PDFPage extends PDFTextStripper {
             this.mypage = page;
         }
 
-		public void process(PDFOperator operator, List arguments)
+		public void process(PDFOperator operator, List<COSBase> arguments)
 				throws IOException {
 			COSName name = (COSName) arguments.get(0);
 
 			// PDResources res = context.getResources();
 
-			Map xobjects = context.getXObjects();
-			PDXObject xobject = (PDXObject) xobjects.get(name.getName());
+			Map<String, PDXObject> xobjects = context.getXObjects();
+			PDXObject xobject = xobjects.get(name.getName());
 
 			PDStream stream = xobject.getPDStream();
 			COSStream cos_stream = stream.getStream();
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java
index 4a9b6886..c68f6229 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFUtilities.java
@@ -69,7 +69,7 @@ public abstract class PDFUtilities
 {
     public static float calculatePageLength(PDDocument document, int page, float effectivePageHeight, /*int pagerotation,*/ boolean legacy32) throws PDFIOException {
 	    //int last_page_id = document.getNumberOfPages();
-	    List allPages = document.getDocumentCatalog().getAllPages();
+	    List<?> allPages = document.getDocumentCatalog().getAllPages();
 	    PDPage pdpage = (PDPage) allPages.get(page);
 	    //pdpage.setRotation(pagerotation);
 	    return calculatePageLength(pdpage, effectivePageHeight, legacy32);
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java
index 48248f3b..8bb76fb5 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/ClosePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.io.IOException;
@@ -73,7 +74,7 @@ public class ClosePath extends PathConstructionOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java
index 982f72d8..0eb10a52 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveTo.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.util.PDFOperator;
 
@@ -74,7 +75,7 @@ public class CurveTo extends PathConstructionOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java
index 8a467c7e..1020842e 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateFinalPoint.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.util.PDFOperator;
 
@@ -74,7 +75,7 @@ public class CurveToReplicateFinalPoint extends PathConstructionOperatorProcesso
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java
index e05be319..42a52033 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/CurveToReplicateInitialPoint.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.util.PDFOperator;
 
@@ -74,7 +75,7 @@ public class CurveToReplicateInitialPoint extends PathConstructionOperatorProces
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java
index 872cbede..a47d3fe6 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/LineTo.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.util.PDFOperator;
 
@@ -72,7 +73,7 @@ public class LineTo extends PathConstructionOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java
index 2b7275e4..49d92761 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/construction/MoveTo.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathConstructionOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.util.PDFOperator;
 
@@ -74,7 +75,7 @@ public class MoveTo extends PathConstructionOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java
index 78f2369c..552a033c 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseAndStrokePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.io.IOException;
@@ -70,7 +71,7 @@ public class CloseAndStrokePath extends PathPaintingOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		if (log.isTraceEnabled()) {
 			log.trace("Closing and stroking path.");
 		}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java
index 3c8b55a9..718fe362 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillEvenOddAndStrokePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.io.IOException;
@@ -71,7 +72,7 @@ public class CloseFillEvenOddAndStrokePath extends PathPaintingOperatorProcessor
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		if (log.isTraceEnabled()) {
 			log.trace("Closing, filling (even odd rule) and stroking path.");
 		}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java
index 529ad6c6..523f6681 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/CloseFillNonZeroAndStrokePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.io.IOException;
@@ -71,7 +72,7 @@ public class CloseFillNonZeroAndStrokePath extends PathPaintingOperatorProcessor
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		if (log.isTraceEnabled()) {
 			log.trace("Closing, filling (non zero rule) and stroking path.");
 		}
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java
index 0812c3e4..5134ed2f 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/EndPath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.io.IOException;
@@ -71,7 +72,7 @@ public class EndPath extends PathPaintingOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java
index f03bc31f..13623648 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillEvenOddAndStrokePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.awt.geom.GeneralPath;
@@ -73,7 +74,7 @@ public class FillEvenOddAndStrokePath extends PathPaintingOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java
index 911169a9..485411a8 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillNonZeroAndStrokePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.awt.geom.GeneralPath;
@@ -73,7 +74,7 @@ public class FillNonZeroAndStrokePath extends PathPaintingOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java
index 7a20b52e..bb3d3411 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathEvenOddRule.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.awt.*;
@@ -71,7 +72,7 @@ public class FillPathEvenOddRule extends PathPaintingOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java
index 4a2f4ff9..6196c466 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/FillPathNonZeroWindingNumberRule.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.awt.*;
@@ -72,7 +73,7 @@ public class FillPathNonZeroWindingNumberRule extends PathPaintingOperatorProces
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java
index 240a5967..b114b60b 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/pdf/operator/path/painting/StrokePath.java
@@ -50,6 +50,7 @@ import at.knowcenter.wag.egov.egiz.pdf.PDFPage;
 import at.knowcenter.wag.egov.egiz.pdf.operator.path.PathPaintingOperatorProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.util.PDFOperator;
 
 import java.awt.*;
@@ -71,7 +72,7 @@ public class StrokePath extends PathPaintingOperatorProcessor {
 	}
 
 	@Override
-	public void process(PDFOperator operator, List operands) throws IOException {
+	public void process(PDFOperator operator, List<COSBase> operands) throws IOException {
 		try {
 			PDFPage pdfPage = (PDFPage) context;
 
diff --git a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java
index 72bdfc4d..c138ac22 100644
--- a/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java
+++ b/pdf-as-lib/src/main/java/at/knowcenter/wag/egov/egiz/table/Table.java
@@ -197,7 +197,7 @@ public class Table implements Serializable
     ArrayList<ArrayList<Entry>> rows = new ArrayList<ArrayList<Entry>>();
     for (int row_idx = 1; row_idx <= rows_.size(); row_idx++)
     {
-      ArrayList<Entry> row = (ArrayList<Entry>) rows_.get("" + row_idx);
+      ArrayList<Entry> row = rows_.get(String.valueOf(row_idx));
       rows.add(row);
     }
     return rows;
@@ -237,7 +237,7 @@ public class Table implements Serializable
       String row_prefix = "\n ++ ROW " + row_idx + " ++ ";
       for (int entry_idx = 0; entry_idx < row.size(); entry_idx++)
       {
-        the_string += row_prefix + ((Entry) row.get(entry_idx)).toString();
+        the_string += row_prefix + row.get(entry_idx).toString();
       }
     }
     the_string += "\n#### TABLE " + name_ + " END #####";