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
This commit is contained in:
parent
56c5bd05e1
commit
8908412e3a
src/ooxml/java/org/apache/poi
@ -65,7 +65,7 @@ public class KeyInfoKeySelector extends KeySelector implements KeySelectorResult
|
||||
continue;
|
||||
}
|
||||
X509Data x509Data = (X509Data) keyInfoStructure;
|
||||
List<Object> x509DataList = x509Data.getContent();
|
||||
List<?> x509DataList = x509Data.getContent();
|
||||
for (Object x509DataObject : x509DataList) {
|
||||
if (!(x509DataObject instanceof X509Certificate)) {
|
||||
continue;
|
||||
|
@ -32,6 +32,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.xml.crypto.MarshalException;
|
||||
import javax.xml.crypto.XMLStructure;
|
||||
import javax.xml.crypto.dom.DOMStructure;
|
||||
import javax.xml.crypto.dsig.dom.DOMSignContext;
|
||||
import javax.xml.crypto.dsig.keyinfo.KeyInfo;
|
||||
@ -77,7 +78,7 @@ public class KeyInfoSignatureFacet extends SignatureFacet {
|
||||
List<Object> x509DataObjects = new ArrayList<Object>();
|
||||
X509Certificate signingCertificate = signatureConfig.getSigningCertificateChain().get(0);
|
||||
|
||||
List<Object> keyInfoContent = new ArrayList<Object>();
|
||||
List<XMLStructure> keyInfoContent = new ArrayList<XMLStructure>();
|
||||
|
||||
if (signatureConfig.isIncludeKeyValue()) {
|
||||
KeyValue keyValue;
|
||||
|
@ -117,13 +117,13 @@ public class PPTX2PNG {
|
||||
System.out.println("Processing " + file);
|
||||
}
|
||||
SlideShow<?,?> ss = SlideShowFactory.create(file, null, true);
|
||||
try {
|
||||
List<? extends Slide<?, ?>> slides = ss.getSlides();
|
||||
|
||||
Set<Integer> slidenum = slideIndexes(slides.size(), slidenumStr);
|
||||
|
||||
if (slidenum.isEmpty()) {
|
||||
usage("slidenum must be either -1 (for all) or within range: [1.." + slides.size() + "] for " + file);
|
||||
ss.close();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -161,12 +161,13 @@ public class PPTX2PNG {
|
||||
ImageIO.write(img, format, outfile);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
ss.close();
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
System.out.println("Done");
|
||||
}
|
||||
|
||||
ss.close();
|
||||
}
|
||||
|
||||
private static Set<Integer> slideIndexes(final int slideCount, String range) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user