Changeset 32524 in osm for applications/editors/josm/plugins/pdfimport

Timestamp:

2016-07-02T02:48:15+02:00 (8 years ago)

Author:

donvip

Message:

add non-regression unit tests

Location:

applications/editors/josm/plugins/pdfimport

Files:

• .classpath (modified) (2 diffs)
• src/pdfimport/pdfbox/PdfBoxParser.java (modified) (2 diffs)
• test (added)
• test/data (added)
• test/data/regress (added)
• test/data/regress/12176 (added)
• test/data/regress/12176/LYD_Etage_0.pdf (added)
• test/data/regress/9053 (added)
• test/data/regress/9053/testpdf.pdf (added)
• test/unit (added)
• test/unit/pdfimport (added)
• test/unit/pdfimport/pdfbox (added)
• test/unit/pdfimport/pdfbox/PDFParserTest.java (added)

applications/editors/josm/plugins/pdfimport/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="resources"/>
+        <classpathentry kind="src" path="test/unit"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
@@ -8 +9 @@
         <classpathentry kind="lib" path="lib/jempbox-1.8.12.jar"/>
         <classpathentry kind="lib" path="lib/pdfbox-1.8.12.jar"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java

@@ -5 +5 @@
 import java.awt.geom.Rectangle2D;
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 
@@ -22 +23 @@
         }
 
-        public void parse(File file, int maxPaths, ProgressMonitor monitor) throws Exception
-        {
-                monitor.beginTask(tr("Parsing PDF", 1));
+    public void parse(File file, int maxPaths, ProgressMonitor monitor) throws IOException {
+        monitor.beginTask(tr("Parsing PDF", 1));
 
-                PDDocument document = PDDocument.load( file);
+        try (PDDocument document = PDDocument.load(file)) {
 
-                if( document.isEncrypted() ){
-                        throw new Exception(tr("Encrypted documents not supported."));
-                }
+            if (document.isEncrypted()) {
+                throw new IllegalArgumentException(tr("Encrypted documents not supported."));
+            }
 
-                List<?> allPages = document.getDocumentCatalog().getAllPages();
+            List<?> allPages = document.getDocumentCatalog().getAllPages();
 
-                if (allPages.size() != 1) {
-                        throw new Exception(tr("The PDF file must have exactly one page."));
-                }
+            if (allPages.size() != 1) {
+                throw new IllegalArgumentException(tr("The PDF file must have exactly one page."));
+            }
+            
+            PDPage page = (PDPage) allPages.get(0);
+            PDRectangle pageSize = page.findMediaBox();
+            Integer rotationVal = page.getRotation();
+            int rotation = 0;
+            if (rotationVal != null) {
+                rotation = rotationVal.intValue();
+            }
+    
+            new PageDrawer().drawPage(new GraphicsProcessor(target, rotation, maxPaths, monitor), page);
+            this.target.bounds = new Rectangle2D.Double(
+                    pageSize.getLowerLeftX(),
+                    pageSize.getLowerLeftY(), 
+                    pageSize.getWidth(), 
+                    pageSize.getHeight());
+        }
 
-                PDPage page = (PDPage)allPages.get(0);
-                PDRectangle pageSize = page.findMediaBox();
-                Integer rotationVal = page.getRotation();
-                int rotation = 0;
-                if (rotationVal != null){
-                        rotation = rotationVal.intValue();
-                }
-
-                GraphicsProcessor p = new GraphicsProcessor(target, rotation, maxPaths, monitor);
-                PageDrawer drawer = new PageDrawer();
-                drawer.drawPage(p, page);
-                this.target.bounds = new Rectangle2D.Double(pageSize.getLowerLeftX(), pageSize.getLowerLeftY(), pageSize.getWidth(), pageSize.getHeight());
-
-                monitor.finishTask();
-        }
+        monitor.finishTask();
+    }
 }