Some general code-fixes found while trying out Java 9

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

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
index ab9de5b1a4c7c492e1388bb7fa9a839f2273280f..90294105e00e22722994a4725d262e3eed2ede07 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
@@ -65,7 +65,7 @@ public class KeyInfoKeySelector extends KeySelector implements KeySelectorResult
                 continue;\r
             }\r
             X509Data x509Data = (X509Data) keyInfoStructure;\r
-            List<Object> x509DataList = x509Data.getContent();\r
+            List<?> x509DataList = x509Data.getContent();\r
             for (Object x509DataObject : x509DataList) {\r
                 if (!(x509DataObject instanceof X509Certificate)) {\r
                     continue;\r

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
index 27ea105330d3c8a966dcd854a54a1eb92b7c2c12..93f0f5b8b61025f23f2a840faef1ac594f6e4e23 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Map;\r
 \r
 import javax.xml.crypto.MarshalException;\r
+import javax.xml.crypto.XMLStructure;\r
 import javax.xml.crypto.dom.DOMStructure;\r
 import javax.xml.crypto.dsig.dom.DOMSignContext;\r
 import javax.xml.crypto.dsig.keyinfo.KeyInfo;\r
@@ -77,7 +78,7 @@ public class KeyInfoSignatureFacet extends SignatureFacet {
         List<Object> x509DataObjects = new ArrayList<Object>();\r
         X509Certificate signingCertificate = signatureConfig.getSigningCertificateChain().get(0);\r
 \r
-        List<Object> keyInfoContent = new ArrayList<Object>();\r
+        List<XMLStructure> keyInfoContent = new ArrayList<XMLStructure>();\r
 \r
         if (signatureConfig.isIncludeKeyValue()) {\r
             KeyValue keyValue;\r

diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
index 7f2f03968866255f286a8560258f09b3aabbf4a6..7fb12eac8d331b876384b5729522d4a0a0b01fce 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
@@ -117,56 +117,57 @@ public class PPTX2PNG {
             System.out.println("Processing " + file);\r
         }\r
         SlideShow<?,?> ss = SlideShowFactory.create(file, null, true);\r
-        List<? extends Slide<?,?>> slides = ss.getSlides();\r
+        try {\r
+            List<? extends Slide<?, ?>> slides = ss.getSlides();\r
 \r
-        Set<Integer> slidenum = slideIndexes(slides.size(), slidenumStr);\r
-        \r
-        if (slidenum.isEmpty()) {\r
-            usage("slidenum must be either -1 (for all) or within range: [1.."+slides.size()+"] for "+file);\r
-            ss.close();\r
-            return;\r
-        }\r
-        \r
-        Dimension pgsize = ss.getPageSize();\r
-        int width = (int) (pgsize.width * scale);\r
-        int height = (int) (pgsize.height * scale);\r
-\r
-        for(Integer slideNo : slidenum) {\r
-            Slide<?,?> slide = slides.get(slideNo);\r
-            String title = slide.getTitle();\r
-            if (!quiet) {\r
-                System.out.println("Rendering slide " + slideNo + (title == null ? "" : ": " + title));\r
+            Set<Integer> slidenum = slideIndexes(slides.size(), slidenumStr);\r
+\r
+            if (slidenum.isEmpty()) {\r
+                usage("slidenum must be either -1 (for all) or within range: [1.." + slides.size() + "] for " + file);\r
+                return;\r
             }\r
 \r
-            BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);\r
-            Graphics2D graphics = img.createGraphics();\r
-            DrawFactory.getInstance(graphics).fixFonts(graphics);\r
-        \r
-            // default rendering options\r
-            graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);\r
-            graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);\r
-            graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);\r
-            graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);\r
-\r
-            graphics.scale(scale, scale);\r
-\r
-            // draw stuff\r
-            slide.draw(graphics);\r
-\r
-            // save the result\r
-            if (!"null".equals(format)) {\r
-                String outname = file.getName().replaceFirst(".pptx?", "");\r
-                outname = String.format(Locale.ROOT, "%1$s-%2$04d.%3$s", outname, slideNo, format);\r
-                File outfile = new File(outdir, outname);\r
-                ImageIO.write(img, format, outfile);\r
+            Dimension pgsize = ss.getPageSize();\r
+            int width = (int) (pgsize.width * scale);\r
+            int height = (int) (pgsize.height * scale);\r
+\r
+            for (Integer slideNo : slidenum) {\r
+                Slide<?, ?> slide = slides.get(slideNo);\r
+                String title = slide.getTitle();\r
+                if (!quiet) {\r
+                    System.out.println("Rendering slide " + slideNo + (title == null ? "" : ": " + title));\r
+                }\r
+\r
+                BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);\r
+                Graphics2D graphics = img.createGraphics();\r
+                DrawFactory.getInstance(graphics).fixFonts(graphics);\r
+\r
+                // default rendering options\r
+                graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);\r
+                graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);\r
+                graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);\r
+                graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);\r
+\r
+                graphics.scale(scale, scale);\r
+\r
+                // draw stuff\r
+                slide.draw(graphics);\r
+\r
+                // save the result\r
+                if (!"null".equals(format)) {\r
+                    String outname = file.getName().replaceFirst(".pptx?", "");\r
+                    outname = String.format(Locale.ROOT, "%1$s-%2$04d.%3$s", outname, slideNo, format);\r
+                    File outfile = new File(outdir, outname);\r
+                    ImageIO.write(img, format, outfile);\r
+                }\r
             }\r
-        }                \r
-        \r
+        } finally {\r
+            ss.close();\r
+        }\r
+\r
         if (!quiet) {\r
             System.out.println("Done");\r
         }\r
-        \r
-        ss.close();\r
     }\r
     \r
     private static Set<Integer> slideIndexes(final int slideCount, String range) {\r