Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java Sat Sep 16 08:27:23 2017 @@ -95,7 +95,7 @@ public final class PackagePropertiesPart * value might be used by an application's user interface to facilitate * navigation of a large set of documents. end example] */ - protected Nullable<String> category = new Nullable<String>(); + protected Nullable<String> category = new Nullable<>(); /** * The status of the content. @@ -103,7 +103,7 @@ public final class PackagePropertiesPart * [Example: Values might include "Draft", "Reviewed", and "Final". end * example] */ - protected Nullable<String> contentStatus = new Nullable<String>(); + protected Nullable<String> contentStatus = new Nullable<>(); /** * The type of content represented, generally defined by a specific use and @@ -113,17 +113,17 @@ public final class PackagePropertiesPart * "Exam". end example] [Note: This property is distinct from MIME content * types as defined in RFC 2616. end note] */ - protected Nullable<String> contentType = new Nullable<String>(); + protected Nullable<String> contentType = new Nullable<>(); /** * Date of creation of the resource. */ - protected Nullable<Date> created = new Nullable<Date>(); + protected Nullable<Date> created = new Nullable<>(); /** * An entity primarily responsible for making the content of the resource. */ - protected Nullable<String> creator = new Nullable<String>(); + protected Nullable<String> creator = new Nullable<>(); /** * An explanation of the content of the resource. @@ -132,19 +132,19 @@ public final class PackagePropertiesPart * to a graphical representation of content, and a free-text account of the * content. end example] */ - protected Nullable<String> description = new Nullable<String>(); + protected Nullable<String> description = new Nullable<>(); /** * An unambiguous reference to the resource within a given context. */ - protected Nullable<String> identifier = new Nullable<String>(); + protected Nullable<String> identifier = new Nullable<>(); /** * A delimited set of keywords to support searching and indexing. This is * typically a list of terms that are not available elsewhere in the * properties. */ - protected Nullable<String> keywords = new Nullable<String>(); + protected Nullable<String> keywords = new Nullable<>(); /** * The language of the intellectual content of the resource. @@ -152,7 +152,7 @@ public final class PackagePropertiesPart * [Note: IETF RFC 3066 provides guidance on encoding to represent * languages. end note] */ - protected Nullable<String> language = new Nullable<String>(); + protected Nullable<String> language = new Nullable<>(); /** * The user who performed the last modification. The identification is @@ -161,17 +161,17 @@ public final class PackagePropertiesPart * [Example: A name, email address, or employee ID. end example] It is * recommended that this value be as concise as possible. */ - protected Nullable<String> lastModifiedBy = new Nullable<String>(); + protected Nullable<String> lastModifiedBy = new Nullable<>(); /** * The date and time of the last printing. */ - protected Nullable<Date> lastPrinted = new Nullable<Date>(); + protected Nullable<Date> lastPrinted = new Nullable<>(); /** * Date on which the resource was changed. */ - protected Nullable<Date> modified = new Nullable<Date>(); + protected Nullable<Date> modified = new Nullable<>(); /** * The revision number. @@ -179,22 +179,22 @@ public final class PackagePropertiesPart * [Example: This value might indicate the number of saves or revisions, * provided the application updates it after each revision. end example] */ - protected Nullable<String> revision = new Nullable<String>(); + protected Nullable<String> revision = new Nullable<>(); /** * The topic of the content of the resource. */ - protected Nullable<String> subject = new Nullable<String>(); + protected Nullable<String> subject = new Nullable<>(); /** * The name given to the resource. */ - protected Nullable<String> title = new Nullable<String>(); + protected Nullable<String> title = new Nullable<>(); /** * The version number. This value is set by the user or by the application. */ - protected Nullable<String> version = new Nullable<String>(); + protected Nullable<String> version = new Nullable<>(); /* * Getters and setters @@ -335,7 +335,7 @@ public final class PackagePropertiesPart if (modified.hasValue()) { return getDateValue(modified); } - return getDateValue(new Nullable<Date>(new Date())); + return getDateValue(new Nullable<>(new Date())); } /** @@ -567,9 +567,9 @@ public final class PackagePropertiesPart */ private Nullable<String> setStringValue(String s) { if (s == null || s.equals("")) { - return new Nullable<String>(); + return new Nullable<>(); } - return new Nullable<String>(s); + return new Nullable<>(s); } /** @@ -580,7 +580,7 @@ public final class PackagePropertiesPart */ private Nullable<Date> setDateValue(String dateStr) throws InvalidFormatException { if (dateStr == null || dateStr.equals("")) { - return new Nullable<Date>(); + return new Nullable<>(); } Matcher m = TIME_ZONE_PAT.matcher(dateStr); @@ -592,7 +592,7 @@ public final class PackagePropertiesPart df.setTimeZone(LocaleUtil.TIMEZONE_UTC); Date d = df.parse(dateTzStr, new ParsePosition(0)); if (d != null) { - return new Nullable<Date>(d); + return new Nullable<>(d); } } } @@ -602,7 +602,7 @@ public final class PackagePropertiesPart df.setTimeZone(LocaleUtil.TIMEZONE_UTC); Date d = df.parse(dateTzStr, new ParsePosition(0)); if (d != null) { - return new Nullable<Date>(d); + return new Nullable<>(d); } } //if you're here, no pattern matched, throw exception
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java Sat Sep 16 08:27:23 2017 @@ -45,7 +45,7 @@ public class ZipInputStreamZipEntrySourc * work with the entries at-will. */ public ZipInputStreamZipEntrySource(ThresholdInputStream inp) throws IOException { - zipEntries = new ArrayList<FakeZipEntry>(); + zipEntries = new ArrayList<>(); boolean going = true; while(going) { Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java Sat Sep 16 08:27:23 2017 @@ -47,7 +47,7 @@ public class AgileEncryptionVerifier ext byte certVerifier[]; } - private List<AgileCertificateEntry> certList = new ArrayList<AgileCertificateEntry>(); + private List<AgileCertificateEntry> certList = new ArrayList<>(); private int keyBits = -1; private int blockSize = -1; @@ -176,7 +176,7 @@ public class AgileEncryptionVerifier ext public AgileEncryptionVerifier clone() throws CloneNotSupportedException { AgileEncryptionVerifier other = (AgileEncryptionVerifier)super.clone(); // TODO: deep copy of certList - other.certList = new ArrayList<AgileCertificateEntry>(certList); + other.certList = new ArrayList<>(certList); return other; } Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java Sat Sep 16 08:27:23 2017 @@ -364,7 +364,7 @@ public class AgileEncryptor extends Encr protected void marshallEncryptionDocument(EncryptionDocument ed, LittleEndianByteArrayOutputStream os) { XmlOptions xo = new XmlOptions(); xo.setCharacterEncoding("UTF-8"); - Map<String,String> nsMap = new HashMap<String,String>(); + Map<String,String> nsMap = new HashMap<>(); nsMap.put(passwordUri.toString(),"p"); nsMap.put(certificateUri.toString(), "c"); xo.setUseDefaultNamespace(); Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java Sat Sep 16 08:27:23 2017 @@ -49,7 +49,7 @@ public class KeyInfoKeySelector extends private static final POILogger LOG = POILogFactory.getLogger(KeyInfoKeySelector.class); - private List<X509Certificate> certChain = new ArrayList<X509Certificate>(); + private List<X509Certificate> certChain = new ArrayList<>(); @SuppressWarnings("unchecked") @Override Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java Sat Sep 16 08:27:23 2017 @@ -68,12 +68,12 @@ public class SignatureConfig { void setSignatureConfig(SignatureConfig signatureConfig); } - private ThreadLocal<OPCPackage> opcPackage = new ThreadLocal<OPCPackage>(); - private ThreadLocal<XMLSignatureFactory> signatureFactory = new ThreadLocal<XMLSignatureFactory>(); - private ThreadLocal<KeyInfoFactory> keyInfoFactory = new ThreadLocal<KeyInfoFactory>(); - private ThreadLocal<Provider> provider = new ThreadLocal<Provider>(); + private ThreadLocal<OPCPackage> opcPackage = new ThreadLocal<>(); + private ThreadLocal<XMLSignatureFactory> signatureFactory = new ThreadLocal<>(); + private ThreadLocal<KeyInfoFactory> keyInfoFactory = new ThreadLocal<>(); + private ThreadLocal<Provider> provider = new ThreadLocal<>(); - private List<SignatureFacet> signatureFacets = new ArrayList<SignatureFacet>(); + private List<SignatureFacet> signatureFacets = new ArrayList<>(); private HashAlgorithm digestAlgo = HashAlgorithm.sha1; private Date executionTime = new Date(); private PrivateKey key; @@ -156,7 +156,7 @@ public class SignatureConfig { * Map of namespace uris to prefix * If a mapping is specified, the corresponding elements will be prefixed */ - Map<String,String> namespacePrefixes = new HashMap<String,String>(); + Map<String,String> namespacePrefixes = new HashMap<>(); /** * Inits and checks the config object. Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java Sat Sep 16 08:27:23 2017 @@ -473,7 +473,7 @@ public class SignatureInfo implements Si /* * Add ds:References that come from signing client local files. */ - List<Reference> references = new ArrayList<Reference>(); + List<Reference> references = new ArrayList<>(); for (DigestInfo digestInfo : safe(digestInfos)) { byte[] documentDigestValue = digestInfo.digestValue; @@ -486,7 +486,7 @@ public class SignatureInfo implements Si /* * Invoke the signature facets. */ - List<XMLObject> objects = new ArrayList<XMLObject>(); + List<XMLObject> objects = new ArrayList<>(); for (SignatureFacet signatureFacet : signatureConfig.getSignatureFacets()) { LOG.log(POILogger.DEBUG, "invoking signature facet: " + signatureFacet.getClass().getSimpleName()); signatureFacet.preSign(document, references, objects); @@ -618,7 +618,7 @@ public class SignatureInfo implements Si */ protected void writeDocument(Document document) throws MarshalException { XmlOptions xo = new XmlOptions(); - Map<String,String> namespaceMap = new HashMap<String,String>(); + Map<String,String> namespaceMap = new HashMap<>(); for(Map.Entry<String,String> entry : signatureConfig.getNamespacePrefixes().entrySet()){ namespaceMap.put(entry.getValue(), entry.getKey()); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java Sat Sep 16 08:27:23 2017 @@ -34,7 +34,7 @@ import org.w3c.dom.events.MutationEvent; * e.g. to register id attributes or set prefixes for registered namespaces */ public class SignatureMarshalListener implements EventListener, SignatureConfigurable { - ThreadLocal<EventTarget> target = new ThreadLocal<EventTarget>(); + ThreadLocal<EventTarget> target = new ThreadLocal<>(); SignatureConfig signatureConfig; public void setEventTarget(EventTarget target) { this.target.set(target); Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java Sat Sep 16 08:27:23 2017 @@ -48,7 +48,7 @@ public class EnvelopedSignatureFacet ext , List<Reference> references , List<XMLObject> objects) throws XMLSignatureException { - List<Transform> transforms = new ArrayList<Transform>(); + List<Transform> transforms = new ArrayList<>(); Transform envelopedTransform = newTransform(CanonicalizationMethod.ENVELOPED); transforms.add(envelopedTransform); Transform exclusiveTransform = newTransform(CanonicalizationMethod.EXCLUSIVE); Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java Sat Sep 16 08:27:23 2017 @@ -75,10 +75,10 @@ public class KeyInfoSignatureFacet exten * Construct the ds:KeyInfo element using JSR 105. */ KeyInfoFactory keyInfoFactory = signatureConfig.getKeyInfoFactory(); - List<Object> x509DataObjects = new ArrayList<Object>(); + List<Object> x509DataObjects = new ArrayList<>(); X509Certificate signingCertificate = signatureConfig.getSigningCertificateChain().get(0); - List<XMLStructure> keyInfoContent = new ArrayList<XMLStructure>(); + List<XMLStructure> keyInfoContent = new ArrayList<>(); if (signatureConfig.isIncludeKeyValue()) { KeyValue keyValue; Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java Sat Sep 16 08:27:23 2017 @@ -98,11 +98,11 @@ public class OOXMLSignatureFacet extends , List<XMLObject> objects) throws XMLSignatureException { - List<Reference> manifestReferences = new ArrayList<Reference>(); + List<Reference> manifestReferences = new ArrayList<>(); addManifestReferences(manifestReferences); Manifest manifest = getSignatureFactory().newManifest(manifestReferences); - List<XMLStructure> objectContent = new ArrayList<XMLStructure>(); + List<XMLStructure> objectContent = new ArrayList<>(); objectContent.add(manifest); addSignatureTime(document, objectContent); @@ -121,7 +121,7 @@ public class OOXMLSignatureFacet extends OPCPackage ooxml = signatureConfig.getOpcPackage(); List<PackagePart> relsEntryNames = ooxml.getPartsByContentType(ContentTypes.RELATIONSHIPS_PART); - Set<String> digestedPartNames = new HashSet<String>(); + Set<String> digestedPartNames = new HashSet<>(); for (PackagePart pp : relsEntryNames) { final String baseUri = pp.getPartName().getName().replaceFirst("(.*)/_rels/.*", "$1"); @@ -181,7 +181,7 @@ public class OOXMLSignatureFacet extends } if (parameterSpec.hasSourceIds()) { - List<Transform> transforms = new ArrayList<Transform>(); + List<Transform> transforms = new ArrayList<>(); transforms.add(newTransform(RelationshipTransformService.TRANSFORM_URI, parameterSpec)); transforms.add(newTransform(CanonicalizationMethod.INCLUSIVE)); String uri = normalizePartName(pp.getPartName().getURI(), baseUri) @@ -232,12 +232,12 @@ public class OOXMLSignatureFacet extends ctTime.setValue(nowStr); Element n = (Element)document.importNode(ctTime.getDomNode(),true); - List<XMLStructure> signatureTimeContent = new ArrayList<XMLStructure>(); + List<XMLStructure> signatureTimeContent = new ArrayList<>(); signatureTimeContent.add(new DOMStructure(n)); SignatureProperty signatureTimeSignatureProperty = getSignatureFactory() .newSignatureProperty(signatureTimeContent, "#" + signatureConfig.getPackageSignatureId(), "idSignatureTime"); - List<SignatureProperty> signaturePropertyContent = new ArrayList<SignatureProperty>(); + List<SignatureProperty> signaturePropertyContent = new ArrayList<>(); signaturePropertyContent.add(signatureTimeSignatureProperty); SignatureProperties signatureProperties = getSignatureFactory() .newSignatureProperties(signaturePropertyContent, null); @@ -248,7 +248,7 @@ public class OOXMLSignatureFacet extends List<Reference> references, List<XMLObject> objects) throws XMLSignatureException { - List<XMLStructure> objectContent = new ArrayList<XMLStructure>(); + List<XMLStructure> objectContent = new ArrayList<>(); SignatureInfoV1Document sigV1 = SignatureInfoV1Document.Factory.newInstance(); CTSignatureInfoV1 ctSigV1 = sigV1.addNewSignatureInfoV1(); @@ -256,13 +256,13 @@ public class OOXMLSignatureFacet extends Element n = (Element)document.importNode(ctSigV1.getDomNode(), true); n.setAttributeNS(XML_NS, XMLConstants.XMLNS_ATTRIBUTE, MS_DIGSIG_NS); - List<XMLStructure> signatureInfoContent = new ArrayList<XMLStructure>(); + List<XMLStructure> signatureInfoContent = new ArrayList<>(); signatureInfoContent.add(new DOMStructure(n)); SignatureProperty signatureInfoSignatureProperty = getSignatureFactory() .newSignatureProperty(signatureInfoContent, "#" + signatureConfig.getPackageSignatureId(), "idOfficeV1Details"); - List<SignatureProperty> signaturePropertyContent = new ArrayList<SignatureProperty>(); + List<SignatureProperty> signaturePropertyContent = new ArrayList<>(); signaturePropertyContent.add(signatureInfoSignatureProperty); SignatureProperties signatureProperties = getSignatureFactory() .newSignatureProperties(signaturePropertyContent, null); @@ -294,26 +294,26 @@ public class OOXMLSignatureFacet extends /** * Office 2010 list of signed types (extensions). */ - private static final Set<String> signed = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList( - "activeXControlBinary","aFChunk","attachedTemplate","attachedToolbars","audio","calcChain","chart","chartColorStyle", - "chartLayout","chartsheet","chartStyle","chartUserShapes","commentAuthors","comments","connections","connectorXml", - "control","ctrlProp","customData","customData","customProperty","customXml","diagram","diagramColors", - "diagramColorsHeader","diagramData","diagramDrawing","diagramLayout","diagramLayoutHeader","diagramQuickStyle", - "diagramQuickStyleHeader","dialogsheet","dictionary","documentParts","downRev","drawing","endnotes","externalLink", - "externalLinkPath","font","fontTable","footer","footnotes","functionPrototypes","glossaryDocument","graphicFrameDoc", - "groupShapeXml","handoutMaster","hdphoto","header","hyperlink","image","ink","inkXml","keyMapCustomizations", - "legacyDiagramText","legacyDocTextInfo","mailMergeHeaderSource","mailMergeRecipientData","mailMergeSource","media", - "notesMaster","notesSlide","numbering","officeDocument","officeDocument","oleObject","package","pictureXml", - "pivotCacheDefinition","pivotCacheRecords","pivotTable","powerPivotData","presProps","printerSettings","queryTable", - "recipientData","settings","shapeXml","sharedStrings","sheetMetadata","slicer","slicer","slicerCache","slicerCache", - "slide","slideLayout","slideMaster","slideUpdateInfo","slideUpdateUrl","smartTags","styles","stylesWithEffects", - "table","tableSingleCells","tableStyles","tags","theme","themeOverride","timeline","timelineCache","transform", - "ui/altText","ui/buttonSize","ui/controlID","ui/description","ui/enabled","ui/extensibility","ui/extensibility", - "ui/helperText","ui/imageID","ui/imageMso","ui/keyTip","ui/label","ui/lcid","ui/loud","ui/pressed","ui/progID", - "ui/ribbonID","ui/showImage","ui/showLabel","ui/supertip","ui/target","ui/text","ui/title","ui/tooltip", - "ui/userCustomization","ui/visible","userXmlData","vbaProject","video","viewProps","vmlDrawing", - "volatileDependencies","webSettings","wordVbaData","worksheet","wsSortMap","xlBinaryIndex", - "xlExternalLinkPath/xlAlternateStartup","xlExternalLinkPath/xlLibrary","xlExternalLinkPath/xlPathMissing", - "xlExternalLinkPath/xlStartup","xlIntlMacrosheet","xlMacrosheet","xmlMaps" + private static final Set<String> signed = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + "activeXControlBinary", "aFChunk", "attachedTemplate", "attachedToolbars", "audio", "calcChain", "chart", "chartColorStyle", + "chartLayout", "chartsheet", "chartStyle", "chartUserShapes", "commentAuthors", "comments", "connections", "connectorXml", + "control", "ctrlProp", "customData", "customData", "customProperty", "customXml", "diagram", "diagramColors", + "diagramColorsHeader", "diagramData", "diagramDrawing", "diagramLayout", "diagramLayoutHeader", "diagramQuickStyle", + "diagramQuickStyleHeader", "dialogsheet", "dictionary", "documentParts", "downRev", "drawing", "endnotes", "externalLink", + "externalLinkPath", "font", "fontTable", "footer", "footnotes", "functionPrototypes", "glossaryDocument", "graphicFrameDoc", + "groupShapeXml", "handoutMaster", "hdphoto", "header", "hyperlink", "image", "ink", "inkXml", "keyMapCustomizations", + "legacyDiagramText", "legacyDocTextInfo", "mailMergeHeaderSource", "mailMergeRecipientData", "mailMergeSource", "media", + "notesMaster", "notesSlide", "numbering", "officeDocument", "officeDocument", "oleObject", "package", "pictureXml", + "pivotCacheDefinition", "pivotCacheRecords", "pivotTable", "powerPivotData", "presProps", "printerSettings", "queryTable", + "recipientData", "settings", "shapeXml", "sharedStrings", "sheetMetadata", "slicer", "slicer", "slicerCache", "slicerCache", + "slide", "slideLayout", "slideMaster", "slideUpdateInfo", "slideUpdateUrl", "smartTags", "styles", "stylesWithEffects", + "table", "tableSingleCells", "tableStyles", "tags", "theme", "themeOverride", "timeline", "timelineCache", "transform", + "ui/altText", "ui/buttonSize", "ui/controlID", "ui/description", "ui/enabled", "ui/extensibility", "ui/extensibility", + "ui/helperText", "ui/imageID", "ui/imageMso", "ui/keyTip", "ui/label", "ui/lcid", "ui/loud", "ui/pressed", "ui/progID", + "ui/ribbonID", "ui/showImage", "ui/showLabel", "ui/supertip", "ui/target", "ui/text", "ui/title", "ui/tooltip", + "ui/userCustomization", "ui/visible", "userXmlData", "vbaProject", "video", "viewProps", "vmlDrawing", + "volatileDependencies", "webSettings", "wordVbaData", "worksheet", "wsSortMap", "xlBinaryIndex", + "xlExternalLinkPath/xlAlternateStartup", "xlExternalLinkPath/xlLibrary", "xlExternalLinkPath/xlPathMissing", + "xlExternalLinkPath/xlStartup", "xlIntlMacrosheet", "xlMacrosheet", "xmlMaps" ))); } \ No newline at end of file Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java Sat Sep 16 08:27:23 2017 @@ -92,7 +92,7 @@ public class XAdESSignatureFacet extends private static final String XADES_TYPE = "http://uri.etsi.org/01903#SignedProperties";; - private Map<String, String> dataObjectFormatMimeTypes = new HashMap<String, String>(); + private Map<String, String> dataObjectFormatMimeTypes = new HashMap<>(); @Override @@ -192,7 +192,7 @@ public class XAdESSignatureFacet extends } // add XAdES ds:Object - List<XMLStructure> xadesObjectContent = new ArrayList<XMLStructure>(); + List<XMLStructure> xadesObjectContent = new ArrayList<>(); Element qualDocElSrc = (Element)qualifyingProperties.getDomNode(); Element qualDocEl = (Element)document.importNode(qualDocElSrc, true); xadesObjectContent.add(new DOMStructure(qualDocEl)); @@ -200,7 +200,7 @@ public class XAdESSignatureFacet extends objects.add(xadesObject); // add XAdES ds:Reference - List<Transform> transforms = new ArrayList<Transform>(); + List<Transform> transforms = new ArrayList<>(); Transform exclusiveTransform = newTransform(CanonicalizationMethod.INCLUSIVE); transforms.add(exclusiveTransform); Reference reference = newReference Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java Sat Sep 16 08:27:23 2017 @@ -249,7 +249,7 @@ public class XAdESXLSignatureFacet exten // marshal XAdES-C // XAdES-X Type 1 timestamp - List<Node> timeStampNodesXadesX1 = new ArrayList<Node>(); + List<Node> timeStampNodesXadesX1 = new ArrayList<>(); timeStampNodesXadesX1.add(nlSigVal.item(0)); timeStampNodesXadesX1.add(signatureTimeStamp.getDomNode()); timeStampNodesXadesX1.add(completeCertificateRefs.getDomNode()); Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java Sat Sep 16 08:27:23 2017 @@ -82,7 +82,7 @@ public class RelationshipTransformServic * Relationship Transform parameter specification class. */ public static class RelationshipTransformParameterSpec implements TransformParameterSpec { - List<String> sourceIds = new ArrayList<String>(); + List<String> sourceIds = new ArrayList<>(); public void addRelationshipReference(String relationshipId) { sourceIds.add(relationshipId); } @@ -95,7 +95,7 @@ public class RelationshipTransformServic public RelationshipTransformService() { super(); LOG.log(POILogger.DEBUG, "constructor"); - this.sourceIds = new ArrayList<String>(); + this.sourceIds = new ArrayList<>(); } /** @@ -197,7 +197,7 @@ public class RelationshipTransformServic // keep only those relationships which id is registered in the sourceIds Element root = doc.getDocumentElement(); NodeList nl = root.getChildNodes(); - TreeMap<String,Element> rsList = new TreeMap<String,Element>(); + TreeMap<String,Element> rsList = new TreeMap<>(); for (int i=nl.getLength()-1; i>=0; i--) { Node n = nl.item(i); if ("Relationship".equals(n.getLocalName())) { Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java Sat Sep 16 08:27:23 2017 @@ -45,8 +45,8 @@ public class RevocationData { * Default constructor. */ public RevocationData() { - this.crls = new ArrayList<byte[]>(); - this.ocsps = new ArrayList<byte[]>(); + this.crls = new ArrayList<>(); + this.ocsps = new ArrayList<>(); } /** Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java Sat Sep 16 08:27:23 2017 @@ -207,7 +207,7 @@ public class TSPTimeStampService impleme Collection<X509CertificateHolder> certificates = timeStampToken.getCertificates().getMatches(null); X509CertificateHolder signerCert = null; - Map<X500Name, X509CertificateHolder> certificateMap = new HashMap<X500Name, X509CertificateHolder>(); + Map<X500Name, X509CertificateHolder> certificateMap = new HashMap<>(); for (X509CertificateHolder certificate : certificates) { if (signerCertIssuer.equals(certificate.getIssuer()) && signerCertSerialNumber.equals(certificate.getSerialNumber())) { @@ -220,7 +220,7 @@ public class TSPTimeStampService impleme if (signerCert == null) { throw new RuntimeException("TSP response token has no signer certificate"); } - List<X509Certificate> tspCertificateChain = new ArrayList<X509Certificate>(); + List<X509Certificate> tspCertificateChain = new ArrayList<>(); JcaX509CertificateConverter x509converter = new JcaX509CertificateConverter(); x509converter.setProvider("BC"); X509CertificateHolder certificate = signerCert; Modified: poi/trunk/src/ooxml/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java Sat Sep 16 08:27:23 2017 @@ -98,7 +98,7 @@ public class EmbeddedExtractor implement if (null == patriarch){ return Collections.emptyList(); } - List<EmbeddedData> embeddings = new ArrayList<EmbeddedData>(); + List<EmbeddedData> embeddings = new ArrayList<>(); extractAll(patriarch, embeddings); return embeddings; } Modified: poi/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/util/IdentifierManager.java Sat Sep 16 08:27:23 2017 @@ -69,7 +69,7 @@ public class IdentifierManager { } this.lowerbound = lowerbound; this.upperbound = upperbound; - this.segments = new LinkedList<Segment>(); + this.segments = new LinkedList<>(); segments.add(new Segment(lowerbound, upperbound)); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java Sat Sep 16 08:27:23 2017 @@ -89,7 +89,7 @@ public final class OOXMLLite { } void build() throws IOException, ClassNotFoundException { - List<Class<?>> lst = new ArrayList<Class<?>>(); + List<Class<?>> lst = new ArrayList<>(); //collect unit tests String exclude = StringUtil.join("|", "BaseTestXWorkbook", @@ -276,7 +276,7 @@ public final class OOXMLLite { ClassLoader appLoader = ClassLoader.getSystemClassLoader(); try { Vector<Class<?>> classes = (Vector<Class<?>>) _classes.get(appLoader); - Map<String, Class<?>> map = new HashMap<String, Class<?>>(); + Map<String, Class<?>> map = new HashMap<>(); for (Class<?> cls : classes) { // e.g. proxy-classes, ... ProtectionDomain pd = cls.getProtectionDomain(); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java Sat Sep 16 08:27:23 2017 @@ -32,7 +32,7 @@ import com.graphbuilder.geom.PointFactor public class SplineCollector { SplineStart _start; - ArrayList<SplineKnot> _knots = new ArrayList<SplineKnot>(); + ArrayList<SplineKnot> _knots = new ArrayList<>(); public SplineCollector(SplineStart start) { _start = start; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java Sat Sep 16 08:27:23 2017 @@ -49,9 +49,9 @@ public class XDGFBaseContents extends XD protected PageContentsType _pageContents; // shapes without parents - protected List<XDGFShape> _toplevelShapes = new ArrayList<XDGFShape>(); - protected Map<Long, XDGFShape> _shapes = new HashMap<Long, XDGFShape>(); - protected List<XDGFConnection> _connections = new ArrayList<XDGFConnection>(); + protected List<XDGFShape> _toplevelShapes = new ArrayList<>(); + protected Map<Long, XDGFShape> _shapes = new HashMap<>(); + protected List<XDGFConnection> _connections = new ArrayList<>(); /** * @since POI 3.14-Beta1 Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ public class XDGFDocument { protected VisioDocumentType _document; - Map<Long, XDGFStyleSheet> _styleSheets = new HashMap<Long, XDGFStyleSheet>(); + Map<Long, XDGFStyleSheet> _styleSheets = new HashMap<>(); // defaults long _defaultFillStyle; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java Sat Sep 16 08:27:23 2017 @@ -43,7 +43,7 @@ public class XDGFMasters extends XDGFXML MastersType _mastersObject; // key: id of master - protected Map<Long, XDGFMaster> _masters = new HashMap<Long, XDGFMaster>(); + protected Map<Long, XDGFMaster> _masters = new HashMap<>(); /** * @since POI 3.14-Beta1 @@ -68,7 +68,7 @@ public class XDGFMasters extends XDGFXML throw new POIXMLException(e); } - Map<String, MasterType> masterSettings = new HashMap<String, MasterType>(); + Map<String, MasterType> masterSettings = new HashMap<>(); for (MasterType master: _mastersObject.getMasterArray()) { masterSettings.put(master.getRel().getId(), master); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java Sat Sep 16 08:27:23 2017 @@ -31,7 +31,7 @@ import com.microsoft.schemas.office.visi public class XDGFPageContents extends XDGFBaseContents { - protected Map<Long, XDGFMaster> _masters = new HashMap<Long, XDGFMaster>(); + protected Map<Long, XDGFMaster> _masters = new HashMap<>(); protected XDGFPage _page; /** Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java Sat Sep 16 08:27:23 2017 @@ -42,7 +42,7 @@ public class XDGFPages extends XDGFXMLDo PagesType _pagesObject; // ordered by page number - List<XDGFPage> _pages = new ArrayList<XDGFPage>(); + List<XDGFPage> _pages = new ArrayList<>(); /** * @since POI 3.14-Beta1 Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java Sat Sep 16 08:27:23 2017 @@ -29,7 +29,7 @@ public class XDGFRelation extends POIXML /** * A map to lookup POIXMLRelation by its relation type */ - private static final Map<String, XDGFRelation> _table = new HashMap<String, XDGFRelation>(); + private static final Map<String, XDGFRelation> _table = new HashMap<>(); public static final XDGFRelation DOCUMENT = new XDGFRelation( "application/vnd.ms-visio.drawing.main+xml", Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java Sat Sep 16 08:27:23 2017 @@ -120,7 +120,7 @@ public class XDGFShape extends XDGFSheet _text = new XDGFText(text, this); if (shapeSheet.isSetShapes()) { - _shapes = new ArrayList<XDGFShape>(); + _shapes = new ArrayList<>(); for (ShapeSheetType shape : shapeSheet.getShapes().getShapeArray()) _shapes.add(new XDGFShape(this, shape, parentPage, document)); } @@ -781,7 +781,7 @@ public class XDGFShape extends XDGFSheet // public Iterable<GeometrySection> getGeometrySections() { - return new CombinedIterable<GeometrySection>(_geometry, + return new CombinedIterable<>(_geometry, _masterShape != null ? _masterShape._geometry : null); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java Sat Sep 16 08:27:23 2017 @@ -43,13 +43,13 @@ public abstract class XDGFSheet { protected SheetType _sheet; // cells - protected Map<String, XDGFCell> _cells = new HashMap<String, XDGFCell>(); + protected Map<String, XDGFCell> _cells = new HashMap<>(); // sections - protected Map<String, XDGFSection> _sections = new HashMap<String, XDGFSection>(); + protected Map<String, XDGFSection> _sections = new HashMap<>(); // special: geometry sections (key: index, value: section) - protected SortedMap<Long, GeometrySection> _geometry = new TreeMap<Long, GeometrySection>(); + protected SortedMap<Long, GeometrySection> _geometry = new TreeMap<>(); // special: character section protected CharacterSection _character; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java Sat Sep 16 08:27:23 2017 @@ -113,7 +113,7 @@ public class XmlVisioDocument extends PO */ @Override public List<PackagePart> getAllEmbedds() throws OpenXML4JException { - return new ArrayList<PackagePart>(); + return new ArrayList<>(); } // Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java Sat Sep 16 08:27:23 2017 @@ -33,7 +33,7 @@ public class CharacterSection extends XD Double _fontSize; Color _fontColor; - Map<String, XDGFCell> _characterCells = new HashMap<String, XDGFCell>(); + Map<String, XDGFCell> _characterCells = new HashMap<>(); public CharacterSection(SectionType section, XDGFSheet containingSheet) { super(section, containingSheet); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java Sat Sep 16 08:27:23 2017 @@ -43,7 +43,7 @@ public class GeometrySection extends XDG GeometrySection _master; // rows - SortedMap<Long, GeometryRow> _rows = new TreeMap<Long, GeometryRow>(); + SortedMap<Long, GeometryRow> _rows = new TreeMap<>(); public GeometrySection(SectionType section, XDGFSheet containingSheet) { super(section, containingSheet); @@ -89,7 +89,7 @@ public class GeometrySection extends XDG } public Iterable<GeometryRow> getCombinedRows() { - return new CombinedIterable<GeometryRow>(_rows, + return new CombinedIterable<>(_rows, _master == null ? null : _master._rows); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java Sat Sep 16 08:27:23 2017 @@ -34,7 +34,7 @@ public abstract class XDGFSection { static final ObjectFactory<XDGFSection, SectionType> _sectionTypes; static { - _sectionTypes = new ObjectFactory<XDGFSection, SectionType>(); + _sectionTypes = new ObjectFactory<>(); try { _sectionTypes.put("LineGradient", GenericSection.class, SectionType.class, XDGFSheet.class); _sectionTypes.put("FillGradient", GenericSection.class, SectionType.class, XDGFSheet.class); @@ -71,7 +71,7 @@ public abstract class XDGFSection { protected SectionType _section; protected XDGFSheet _containingSheet; - protected Map<String, XDGFCell> _cells = new HashMap<String, XDGFCell>(); + protected Map<String, XDGFCell> _cells = new HashMap<>(); public XDGFSection(SectionType section, XDGFSheet containingSheet) { Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRowFactory.java Sat Sep 16 08:27:23 2017 @@ -27,7 +27,7 @@ public class GeometryRowFactory { static final ObjectFactory<GeometryRow, RowType> _rowTypes; static { - _rowTypes = new ObjectFactory<GeometryRow, RowType>(); + _rowTypes = new ObjectFactory<>(); try { _rowTypes.put("ArcTo", ArcTo.class, RowType.class); _rowTypes.put("Ellipse", Ellipse.class, RowType.class); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/ObjectFactory.java Sat Sep 16 08:27:23 2017 @@ -28,7 +28,7 @@ import org.apache.xmlbeans.XmlObject; public class ObjectFactory<T, X extends XmlObject> { - Map<String, Constructor<? extends T>> _types = new HashMap<String, Constructor<? extends T>>(); + Map<String, Constructor<? extends T>> _types = new HashMap<>(); public void put(String typeName, Class<? extends T> cls, Class<?>... varargs) throws NoSuchMethodException, SecurityException { _types.put(typeName, cls.getDeclaredConstructor(varargs)); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java Sat Sep 16 08:27:23 2017 @@ -126,8 +126,8 @@ implements SlideShow<XSLFShape,XSLFTextP PresentationDocument.Factory.parse(getCorePart().getInputStream(), DEFAULT_XML_OPTIONS); _presentation = doc.getPresentation(); - Map<String, XSLFSlideMaster> masterMap = new HashMap<String, XSLFSlideMaster>(); - Map<String, XSLFSlide> shIdMap = new HashMap<String, XSLFSlide>(); + Map<String, XSLFSlideMaster> masterMap = new HashMap<>(); + Map<String, XSLFSlide> shIdMap = new HashMap<>(); for (RelationPart rp : getRelationParts()) { POIXMLDocumentPart p = rp.getDocumentPart(); if (p instanceof XSLFSlide) { @@ -143,13 +143,13 @@ implements SlideShow<XSLFShape,XSLFTextP } } - _masters = new ArrayList<XSLFSlideMaster>(masterMap.size()); + _masters = new ArrayList<>(masterMap.size()); for (CTSlideMasterIdListEntry masterId : _presentation.getSldMasterIdLst().getSldMasterIdList()) { XSLFSlideMaster master = masterMap.get(masterId.getId2()); _masters.add(master); } - _slides = new ArrayList<XSLFSlide>(shIdMap.size()); + _slides = new ArrayList<>(shIdMap.size()); if (_presentation.isSetSldIdLst()) { for (CTSlideIdListEntry slId : _presentation.getSldIdLst().getSldIdList()) { XSLFSlide sh = shIdMap.get(slId.getId2()); @@ -187,7 +187,7 @@ implements SlideShow<XSLFShape,XSLFTextP public List<XSLFPictureData> getPictureData() { if(_pictures == null){ List<PackagePart> mediaParts = getPackage().getPartsByName(Pattern.compile("/ppt/media/.*?")); - _pictures = new ArrayList<XSLFPictureData>(mediaParts.size()); + _pictures = new ArrayList<>(mediaParts.size()); for(PackagePart part : mediaParts){ XSLFPictureData pd = new XSLFPictureData(part); pd.setIndex(_pictures.size()); @@ -354,7 +354,7 @@ implements SlideShow<XSLFShape,XSLFTextP Integer themeIndex = 1; // TODO: check if that list can be replaced by idx = Math.max(idx,themeIdx) - List<Integer> themeIndexList = new ArrayList<Integer>(); + List<Integer> themeIndexList = new ArrayList<>(); for (POIXMLDocumentPart p : getRelations()) { if (p instanceof XSLFTheme) { themeIndexList.add(XSLFRelation.THEME.getFileNameIndex(p)); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java Sat Sep 16 08:27:23 2017 @@ -54,7 +54,7 @@ public class XSLFCommonSlideData { public List<DrawingTextBody> getDrawingText() { CTGroupShape gs = data.getSpTree(); - List<DrawingTextBody> out = new ArrayList<DrawingTextBody>(); + List<DrawingTextBody> out = new ArrayList<>(); processShape(gs, out); @@ -97,7 +97,7 @@ public class XSLFCommonSlideData { return out; } public List<DrawingParagraph> getText() { - List<DrawingParagraph> paragraphs = new ArrayList<DrawingParagraph>(); + List<DrawingParagraph> paragraphs = new ArrayList<>(); for(DrawingTextBody textBody : getDrawingText()) { paragraphs.addAll(Arrays.asList(textBody.getParagraphs())); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java Sat Sep 16 08:27:23 2017 @@ -391,7 +391,7 @@ implements XSLFShapeContainer, GroupShap */ @Override public void clear() { - List<XSLFShape> shapes = new ArrayList<XSLFShape>(getShapes()); + List<XSLFShape> shapes = new ArrayList<>(getShapes()); for(XSLFShape shape : shapes){ removeShape(shape); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java Sat Sep 16 08:27:23 2017 @@ -99,7 +99,7 @@ implements Notes<XSLFShape,XSLFTextParag @Override public List<List<XSLFTextParagraph>> getTextParagraphs() { - List<List<XSLFTextParagraph>> tp = new ArrayList<List<XSLFTextParagraph>>(); + List<List<XSLFTextParagraph>> tp = new ArrayList<>(); for (XSLFShape sh : super.getShapes()) { if (sh instanceof XSLFTextShape) { XSLFTextShape txt = (XSLFTextShape)sh; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java Sat Sep 16 08:27:23 2017 @@ -30,7 +30,7 @@ public class XSLFRelation extends POIXML /** * A map to lookup POIXMLRelation by its relation type */ - private static final Map<String, XSLFRelation> _table = new HashMap<String, XSLFRelation>(); + private static final Map<String, XSLFRelation> _table = new HashMap<>(); public static final XSLFRelation MAIN = new XSLFRelation( "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml", Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java Sat Sep 16 08:27:23 2017 @@ -94,7 +94,7 @@ implements XSLFShapeContainer, Sheet<XSL } protected static List<XSLFShape> buildShapes(CTGroupShape spTree, XSLFSheet sheet){ - List<XSLFShape> shapes = new ArrayList<XSLFShape>(); + List<XSLFShape> shapes = new ArrayList<>(); XmlCursor cur = spTree.newCursor(); try { for (boolean b=cur.toFirstChild();b;b=cur.toNextSibling()) { @@ -324,7 +324,7 @@ implements XSLFShapeContainer, Sheet<XSL */ @Override public void clear() { - List<XSLFShape> shapes = new ArrayList<XSLFShape>(getShapes()); + List<XSLFShape> shapes = new ArrayList<>(getShapes()); for(XSLFShape shape : shapes){ removeShape(shape); } @@ -472,9 +472,9 @@ implements XSLFShapeContainer, Sheet<XSL void initPlaceholders() { if(_placeholders == null) { - _placeholders = new ArrayList<XSLFTextShape>(); - _placeholderByIdMap = new HashMap<Integer, XSLFSimpleShape>(); - _placeholderByTypeMap = new HashMap<Integer, XSLFSimpleShape>(); + _placeholders = new ArrayList<>(); + _placeholderByIdMap = new HashMap<>(); + _placeholderByTypeMap = new HashMap<>(); for(XSLFShape sh : getShapes()){ if(sh instanceof XSLFTextShape){ Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java Sat Sep 16 08:27:23 2017 @@ -96,7 +96,7 @@ import org.openxmlformats.schemas.presen private Map<String, XSLFSlideLayout> getLayouts(){ if(_layouts == null){ - _layouts = new HashMap<String, XSLFSlideLayout>(); + _layouts = new HashMap<>(); for (POIXMLDocumentPart p : getRelations()) { if (p instanceof XSLFSlideLayout){ XSLFSlideLayout layout = (XSLFSlideLayout)p; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java Sat Sep 16 08:27:23 2017 @@ -77,7 +77,7 @@ public class XSLFSlideShow extends POIXM presentationDoc = PresentationDocument.Factory.parse(getCorePart().getInputStream(), DEFAULT_XML_OPTIONS); - embedds = new LinkedList<PackagePart>(); + embedds = new LinkedList<>(); for (CTSlideIdListEntry ctSlide : getSlideReferences().getSldIdArray()) { PackagePart corePart = getCorePart(); PackagePart slidePart = corePart.getRelatedPart(corePart.getRelationship(ctSlide.getId2())); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java Sat Sep 16 08:27:23 2017 @@ -78,7 +78,7 @@ public class XSLFTable extends XSLFGraph _table = (CTTable)xo; xc.dispose(); - _rows = new ArrayList<XSLFTableRow>(_table.sizeOfTrArray()); + _rows = new ArrayList<>(_table.sizeOfTrArray()); for(CTTableRow row : _table.getTrArray()) { _rows.add(new XSLFTableRow(row, this)); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java Sat Sep 16 08:27:23 2017 @@ -40,7 +40,7 @@ public class XSLFTableRow implements Ite _row = row; _table = table; CTTableCell[] tcArray = _row.getTcArray(); - _cells = new ArrayList<XSLFTableCell>(tcArray.length); + _cells = new ArrayList<>(tcArray.length); for(CTTableCell cell : tcArray) { _cells.add(new XSLFTableCell(cell, table)); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java Sat Sep 16 08:27:23 2017 @@ -51,7 +51,7 @@ public class XSLFTableStyles extends POI is.close(); _tblStyleLst = styleDoc.getTblStyleLst(); CTTableStyle[] tblStyleArray = _tblStyleLst.getTblStyleArray(); - _styles = new ArrayList<XSLFTableStyle>(tblStyleArray.length); + _styles = new ArrayList<>(tblStyleArray.length); for(CTTableStyle c : tblStyleArray){ _styles.add(new XSLFTableStyle(c)); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java Sat Sep 16 08:27:23 2017 @@ -69,7 +69,7 @@ public class XSLFTextParagraph implement XSLFTextParagraph(CTTextParagraph p, XSLFTextShape shape){ _p = p; - _runs = new ArrayList<XSLFTextRun>(); + _runs = new ArrayList<>(); _shape = shape; XmlCursor c = _p.newCursor(); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java Sat Sep 16 08:27:23 2017 @@ -59,7 +59,7 @@ public abstract class XSLFTextShape exte /*package*/ XSLFTextShape(XmlObject shape, XSLFSheet sheet) { super(shape, sheet); - _paragraphs = new ArrayList<XSLFTextParagraph>(); + _paragraphs = new ArrayList<>(); CTTextBody txBody = getTextBody(false); if (txBody != null) { for (CTTextParagraph p : txBody.getPArray()) { Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java Sat Sep 16 08:27:23 2017 @@ -75,7 +75,7 @@ public class XSLFTheme extends POIXMLDoc CTBaseStyles elems = _theme.getThemeElements(); CTColorScheme scheme = elems.getClrScheme(); // The color scheme is responsible for defining a list of twelve colors. - _schemeColors = new HashMap<String, CTColor>(12); + _schemeColors = new HashMap<>(12); for(XmlObject o : scheme.selectPath("*")){ CTColor c = (CTColor)o; String name = c.getDomNode().getLocalName(); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java Sat Sep 16 08:27:23 2017 @@ -174,7 +174,7 @@ public class PPTX2PNG { } private static Set<Integer> slideIndexes(final int slideCount, String range) { - Set<Integer> slideIdx = new TreeSet<Integer>(); + Set<Integer> slideIdx = new TreeSet<>(); if ("-1".equals(range)) { for (int i=0; i<slideCount; i++) { slideIdx.add(i); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java Sat Sep 16 08:27:23 2017 @@ -36,9 +36,9 @@ import org.apache.poi.util.LittleEndian; @Internal public class XSSFBCommentsTable extends XSSFBParser { - private Map<CellAddress, XSSFBComment> comments = new TreeMap<CellAddress, XSSFBComment>(); - private Queue<CellAddress> commentAddresses = new LinkedList<CellAddress>(); - private List<String> authors = new ArrayList<String>(); + private Map<CellAddress, XSSFBComment> comments = new TreeMap<>(); + private Queue<CellAddress> commentAddresses = new LinkedList<>(); + private List<String> authors = new ArrayList<>(); //these are all used only during parsing, and they are mutable! private int authorId = -1; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java Sat Sep 16 08:27:23 2017 @@ -51,10 +51,10 @@ public class XSSFBHyperlinksTable { } - private final List<XSSFHyperlinkRecord> hyperlinkRecords = new ArrayList<XSSFHyperlinkRecord>(); + private final List<XSSFHyperlinkRecord> hyperlinkRecords = new ArrayList<>(); //cache the relId to hyperlink url from the sheet's .rels - private Map<String, String> relIdToHyperlink = new HashMap<String, String>(); + private Map<String, String> relIdToHyperlink = new HashMap<>(); public XSSFBHyperlinksTable(PackagePart sheetPart) throws IOException { //load the urls from the sheet .rels @@ -70,13 +70,13 @@ public class XSSFBHyperlinksTable { */ public Map<CellAddress, List<XSSFHyperlinkRecord>> getHyperLinks() { Map<CellAddress, List<XSSFHyperlinkRecord>> hyperlinkMap = - new TreeMap<CellAddress, List<XSSFHyperlinkRecord>>(new TopLeftCellAddressComparator()); + new TreeMap<>(new TopLeftCellAddressComparator()); for (XSSFHyperlinkRecord hyperlinkRecord : hyperlinkRecords) { CellAddress cellAddress = new CellAddress(hyperlinkRecord.getCellRangeAddress().getFirstRow(), hyperlinkRecord.getCellRangeAddress().getFirstColumn()); List<XSSFHyperlinkRecord> list = hyperlinkMap.get(cellAddress); if (list == null) { - list = new ArrayList<XSSFHyperlinkRecord>(); + list = new ArrayList<>(); } list.add(hyperlinkRecord); hyperlinkMap.put(cellAddress, list); @@ -99,7 +99,7 @@ public class XSSFBHyperlinksTable { for (XSSFHyperlinkRecord record : hyperlinkRecords) { if (CellRangeUtil.intersect(targetCellRangeAddress, record.getCellRangeAddress()) != CellRangeUtil.NO_INTERSECTION) { if (overlapping == null) { - overlapping = new ArrayList<XSSFHyperlinkRecord>(); + overlapping = new ArrayList<>(); } overlapping.add(record); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java Sat Sep 16 08:27:23 2017 @@ -82,7 +82,7 @@ public enum XSSFBRecordType { Unimplemented(-1); private static final Map<Integer, XSSFBRecordType> TYPE_MAP = - new HashMap<Integer, XSSFBRecordType>(); + new HashMap<>(); static { for (XSSFBRecordType type : XSSFBRecordType.values()) { Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java Sat Sep 16 08:27:23 2017 @@ -50,7 +50,7 @@ public class XSSFBSharedStringsTable { /** * The shared strings table. */ - private List<String> strings = new ArrayList<String>(); + private List<String> strings = new ArrayList<>(); /** * @param pkg The {@link OPCPackage} to use as basis for the shared-strings table. @@ -87,7 +87,7 @@ public class XSSFBSharedStringsTable { * @return a defensive copy of strings */ public List<String> getItems() { - List<String> ret = new ArrayList<String>(strings.size()); + List<String> ret = new ArrayList<>(strings.size()); ret.addAll(strings); return ret; } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java Sat Sep 16 08:27:23 2017 @@ -37,8 +37,8 @@ import org.apache.poi.util.Internal; @Internal public class XSSFBStylesTable extends XSSFBParser { - private final SortedMap<Short, String> numberFormats = new TreeMap<Short,String>(); - private final List<Short> styleIds = new ArrayList<Short>(); + private final SortedMap<Short, String> numberFormats = new TreeMap<>(); + private final List<Short> styleIds = new ArrayList<>(); private boolean inCellXFS; private boolean inFmts; Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java Sat Sep 16 08:27:23 2017 @@ -239,8 +239,8 @@ public class ReadOnlySharedStringsTable String uniqueCount = attributes.getValue("uniqueCount"); if(uniqueCount != null) this.uniqueCount = Integer.parseInt(uniqueCount); - this.strings = new ArrayList<String>(this.uniqueCount); - this.phoneticStrings = new HashMap<Integer, String>(); + this.strings = new ArrayList<>(this.uniqueCount); + this.phoneticStrings = new HashMap<>(); characters = new StringBuffer(); } else if ("si".equals(localName)) { characters.setLength(0); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java Sat Sep 16 08:27:23 2017 @@ -59,7 +59,7 @@ public class XSSFBReader extends XSSFRea private static final POILogger log = POILogFactory.getLogger(XSSFBReader.class); private static final Set<String> WORKSHEET_RELS = - Collections.unmodifiableSet(new HashSet<String>( + Collections.unmodifiableSet(new HashSet<>( Arrays.asList(new String[]{ XSSFRelation.WORKSHEET.getRelation(), XSSFRelation.CHARTSHEET.getRelation(), @@ -208,7 +208,7 @@ public class XSSFBReader extends XSSFRea } private static class SheetRefLoader extends XSSFBParser { - List<XSSFSheetRef> sheets = new LinkedList<XSSFSheetRef>(); + List<XSSFSheetRef> sheets = new LinkedList<>(); private SheetRefLoader(InputStream is) { super(is); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java Sat Sep 16 08:27:23 2017 @@ -67,7 +67,7 @@ import org.xml.sax.helpers.DefaultHandle public class XSSFReader { private static final Set<String> WORKSHEET_RELS = - Collections.unmodifiableSet(new HashSet<String>( + Collections.unmodifiableSet(new HashSet<>( Arrays.asList(new String[]{ XSSFRelation.WORKSHEET.getRelation(), XSSFRelation.CHARTSHEET.getRelation(), @@ -229,7 +229,7 @@ public class XSSFReader { */ try { //step 1. Map sheet's relationship Id and the corresponding PackagePart - sheetMap = new HashMap<String, PackagePart>(); + sheetMap = new HashMap<>(); OPCPackage pkg = wb.getPackage(); Set<String> worksheetRels = getSheetRelationships(); for(PackageRelationship rel : wb.getRelationships()){ @@ -265,7 +265,7 @@ public class XSSFReader { throw new POIXMLException(e); } - List<XSSFSheetRef> validSheets = new ArrayList<XSSFSheetRef>(); + List<XSSFSheetRef> validSheets = new ArrayList<>(); for (XSSFSheetRef xssfSheetRef : xmlSheetRefReader.getSheetRefs()) { //if there's no relationship id, silently skip the sheet String sheetId = xssfSheetRef.getId(); @@ -356,7 +356,7 @@ public class XSSFReader { */ public List<XSSFShape> getShapes() { PackagePart sheetPkg = getSheetPart(); - List<XSSFShape> shapes= new LinkedList<XSSFShape>(); + List<XSSFShape> shapes= new LinkedList<>(); // Do we have a comments relationship? (Only ever one if so) try { PackageRelationshipCollection drawingsList = sheetPkg.getRelationshipsByType(XSSFRelation.DRAWINGS.getRelation()); @@ -421,7 +421,7 @@ public class XSSFReader { private static final String ID = "id"; private static final String NAME = "name"; - private final List<XSSFSheetRef> sheetRefs = new LinkedList<XSSFSheetRef>(); + private final List<XSSFSheetRef> sheetRefs = new LinkedList<>(); // read <sheet name="Sheet6" sheetId="4" r:id="rId6"/> // and add XSSFSheetRef(id="rId6", name="Sheet6") to sheetRefs Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java Sat Sep 16 08:27:23 2017 @@ -162,7 +162,7 @@ public class XSSFSheetXMLHandler extends private void init() { if (commentsTable != null) { - commentCellRefs = new LinkedList<CellAddress>(); + commentCellRefs = new LinkedList<>(); //noinspection deprecation for (CTComment comment : commentsTable.getCTComments().getCommentList().getCommentArray()) { commentCellRefs.add(new CellAddress(comment.getRef())); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java Sat Sep 16 08:27:23 2017 @@ -335,7 +335,7 @@ public class XSSFEventBasedExcelExtracto protected SheetTextExtractor() { this.output = new StringBuffer(); this.firstCellOfRow = true; - this.headerFooterMap = includeHeadersFooters ? new HashMap<String, String>() : null; + this.headerFooterMap = includeHeadersFooters ? new HashMap<>() : null; } @Override Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java Sat Sep 16 08:27:23 2017 @@ -133,9 +133,9 @@ public class XSSFExportToXml implements doc.appendChild(root); - List<String> xpaths = new Vector<String>(); - Map<String,XSSFSingleXmlCell> singleXmlCellsMappings = new HashMap<String,XSSFSingleXmlCell>(); - Map<String,XSSFTable> tableMappings = new HashMap<String,XSSFTable>(); + List<String> xpaths = new Vector<>(); + Map<String,XSSFSingleXmlCell> singleXmlCellsMappings = new HashMap<>(); + Map<String,XSSFTable> tableMappings = new HashMap<>(); for(XSSFSingleXmlCell simpleXmlCell : singleXMLCells) { xpaths.add(simpleXmlCell.getXpath()); Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java Sat Sep 16 08:27:23 2017 @@ -171,7 +171,7 @@ public class XSSFImportFromXML { private Set<STXmlDataType.Enum> xmlDataTypes; private DataType(STXmlDataType.Enum... xmlDataTypes) { - this.xmlDataTypes = new HashSet<STXmlDataType.Enum>(Arrays.asList(xmlDataTypes)); + this.xmlDataTypes = new HashSet<>(Arrays.asList(xmlDataTypes)); } public static DataType getDataType(STXmlDataType.Enum xmlDataType) { Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java Sat Sep 16 08:27:23 2017 @@ -157,7 +157,7 @@ public class CommentsTable extends POIXM */ public Map<CellAddress, XSSFComment> getCellComments() { prepareCTCommentCache(); - final TreeMap<CellAddress, XSSFComment> map = new TreeMap<CellAddress, XSSFComment>(); + final TreeMap<CellAddress, XSSFComment> map = new TreeMap<>(); for (final Entry<CellAddress, CTComment> e: commentRefs.entrySet()) { map.put(e.getKey(), new XSSFComment(this, e.getValue(), null)); @@ -174,7 +174,7 @@ public class CommentsTable extends POIXM private void prepareCTCommentCache() { // Create the cache if needed if(commentRefs == null) { - commentRefs = new HashMap<CellAddress, CTComment>(); + commentRefs = new HashMap<>(); for (CTComment comment : comments.getCommentList().getCommentArray()) { commentRefs.put(new CellAddress(comment.getRef()), comment); } Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java Sat Sep 16 08:27:23 2017 @@ -122,7 +122,7 @@ public class ExternalLinksTable extends public List<String> getSheetNames() { CTExternalSheetName[] sheetNames = link.getExternalBook().getSheetNames().getSheetNameArray(); - List<String> names = new ArrayList<String>(sheetNames.length); + List<String> names = new ArrayList<>(sheetNames.length); for (CTExternalSheetName name : sheetNames) { names.add(name.getVal()); } @@ -132,7 +132,7 @@ public class ExternalLinksTable extends public List<Name> getDefinedNames() { CTExternalDefinedName[] extNames = link.getExternalBook().getDefinedNames().getDefinedNameArray(); - List<Name> names = new ArrayList<Name>(extNames.length); + List<Name> names = new ArrayList<>(extNames.length); for (CTExternalDefinedName extName : extNames) { names.add(new ExternalName(extName)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
