Fix some Eclipse warnings, remove trailing whitespaces
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1535517 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b646166b6c
commit
5ad89d96b6
@ -104,7 +104,7 @@ public final class ConstantValueParser {
|
|||||||
if(object == EMPTY_REPRESENTATION) {
|
if(object == EMPTY_REPRESENTATION) {
|
||||||
return 8;
|
return 8;
|
||||||
}
|
}
|
||||||
Class cls = object.getClass();
|
Class<?> cls = object.getClass();
|
||||||
|
|
||||||
if(cls == Boolean.class || cls == Double.class || cls == ErrorConstant.class) {
|
if(cls == Boolean.class || cls == Double.class || cls == ErrorConstant.class) {
|
||||||
return 8;
|
return 8;
|
||||||
|
@ -106,7 +106,7 @@ public class POIXMLDocumentPart {
|
|||||||
*
|
*
|
||||||
* @param part - The package part that holds xml data represenring this sheet.
|
* @param part - The package part that holds xml data represenring this sheet.
|
||||||
* @param rel - the relationship of the given package part
|
* @param rel - the relationship of the given package part
|
||||||
* @see #read(POIXMLFactory, java.util.Map)
|
* @see #read(POIXMLFactory, java.util.Map)
|
||||||
*/
|
*/
|
||||||
public POIXMLDocumentPart(PackagePart part, PackageRelationship rel){
|
public POIXMLDocumentPart(PackagePart part, PackageRelationship rel){
|
||||||
this.packagePart = part;
|
this.packagePart = part;
|
||||||
@ -131,7 +131,7 @@ public class POIXMLDocumentPart {
|
|||||||
/**
|
/**
|
||||||
* When you open something like a theme, call this to
|
* When you open something like a theme, call this to
|
||||||
* re-base the XML Document onto the core child of the
|
* re-base the XML Document onto the core child of the
|
||||||
* current core document
|
* current core document
|
||||||
*/
|
*/
|
||||||
protected final void rebase(OPCPackage pkg) throws InvalidFormatException {
|
protected final void rebase(OPCPackage pkg) throws InvalidFormatException {
|
||||||
PackageRelationshipCollection cores =
|
PackageRelationshipCollection cores =
|
||||||
@ -179,7 +179,7 @@ public class POIXMLDocumentPart {
|
|||||||
* {@link POIXMLDocumentPart} to the {@link PackagePart} of the target
|
* {@link POIXMLDocumentPart} to the {@link PackagePart} of the target
|
||||||
* {@link POIXMLDocumentPart} with a {@link PackageRelationship#getId()}
|
* {@link POIXMLDocumentPart} with a {@link PackageRelationship#getId()}
|
||||||
* matching the given parameter value.
|
* matching the given parameter value.
|
||||||
*
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* The relation id to look for
|
* The relation id to look for
|
||||||
* @return the target part of the relation, or null, if none exists
|
* @return the target part of the relation, or null, if none exists
|
||||||
@ -193,7 +193,7 @@ public class POIXMLDocumentPart {
|
|||||||
* {@link PackageRelationship}, that sources from the {@link PackagePart} of
|
* {@link PackageRelationship}, that sources from the {@link PackagePart} of
|
||||||
* this {@link POIXMLDocumentPart} to the {@link PackagePart} of the given
|
* this {@link POIXMLDocumentPart} to the {@link PackagePart} of the given
|
||||||
* parameter value.
|
* parameter value.
|
||||||
*
|
*
|
||||||
* @param part
|
* @param part
|
||||||
* The {@link POIXMLDocumentPart} for which the according
|
* The {@link POIXMLDocumentPart} for which the according
|
||||||
* relation-id shall be found.
|
* relation-id shall be found.
|
||||||
@ -233,7 +233,7 @@ public class POIXMLDocumentPart {
|
|||||||
/**
|
/**
|
||||||
* Remove the relation to the specified part in this package and remove the
|
* Remove the relation to the specified part in this package and remove the
|
||||||
* part, if it is no longer needed and flag is set to true.
|
* part, if it is no longer needed and flag is set to true.
|
||||||
*
|
*
|
||||||
* @param part
|
* @param part
|
||||||
* The related part, to which the relation shall be removed.
|
* The related part, to which the relation shall be removed.
|
||||||
* @param removeUnusedParts
|
* @param removeUnusedParts
|
||||||
@ -343,8 +343,7 @@ public class POIXMLDocumentPart {
|
|||||||
* @param noRelation if true, then no relationship is added.
|
* @param noRelation if true, then no relationship is added.
|
||||||
* @return the created child POIXMLDocumentPart
|
* @return the created child POIXMLDocumentPart
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("null")
|
protected final POIXMLDocumentPart createRelationship(POIXMLRelation descriptor, POIXMLFactory factory, int idx, boolean noRelation){
|
||||||
protected final POIXMLDocumentPart createRelationship(POIXMLRelation descriptor, POIXMLFactory factory, int idx, boolean noRelation){
|
|
||||||
try {
|
try {
|
||||||
PackagePartName ppName = PackagingURIHelper.createPartName(descriptor.getFileName(idx));
|
PackagePartName ppName = PackagingURIHelper.createPartName(descriptor.getFileName(idx));
|
||||||
PackageRelationship rel = null;
|
PackageRelationship rel = null;
|
||||||
@ -415,7 +414,7 @@ public class POIXMLDocumentPart {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the PackagePart that is the target of a relationship from this Part.
|
* Get the PackagePart that is the target of a relationship from this Part.
|
||||||
*
|
*
|
||||||
|
@ -28,8 +28,6 @@ import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
|
|||||||
import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
|
import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
|
||||||
import org.apache.poi.openxml4j.opc.internal.ZipContentTypeManager;
|
import org.apache.poi.openxml4j.opc.internal.ZipContentTypeManager;
|
||||||
import org.apache.poi.openxml4j.util.Nullable;
|
import org.apache.poi.openxml4j.util.Nullable;
|
||||||
import org.apache.poi.util.POILogFactory;
|
|
||||||
import org.apache.poi.util.POILogger;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated (name clash with {@link java.lang.Package} use {@link OPCPackage} instead.
|
* @deprecated (name clash with {@link java.lang.Package} use {@link OPCPackage} instead.
|
||||||
@ -43,7 +41,7 @@ public abstract class Package extends OPCPackage {
|
|||||||
/**
|
/**
|
||||||
* Logger.
|
* Logger.
|
||||||
*/
|
*/
|
||||||
private static POILogger logger = POILogFactory.getLogger(Package.class);
|
//private static POILogger logger = POILogFactory.getLogger(Package.class);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,7 +23,13 @@ import java.io.File;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import javax.xml.namespace.QName;
|
import javax.xml.namespace.QName;
|
||||||
@ -32,7 +38,6 @@ import org.apache.poi.POIXMLDocument;
|
|||||||
import org.apache.poi.POIXMLDocumentPart;
|
import org.apache.poi.POIXMLDocumentPart;
|
||||||
import org.apache.poi.POIXMLException;
|
import org.apache.poi.POIXMLException;
|
||||||
import org.apache.poi.POIXMLProperties;
|
import org.apache.poi.POIXMLProperties;
|
||||||
import org.apache.poi.ss.formula.SheetNameFormatter;
|
|
||||||
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
|
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
|
||||||
import org.apache.poi.openxml4j.opc.OPCPackage;
|
import org.apache.poi.openxml4j.opc.OPCPackage;
|
||||||
import org.apache.poi.openxml4j.opc.PackagePart;
|
import org.apache.poi.openxml4j.opc.PackagePart;
|
||||||
@ -41,17 +46,26 @@ import org.apache.poi.openxml4j.opc.PackageRelationship;
|
|||||||
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
|
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
|
||||||
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
|
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
|
||||||
import org.apache.poi.openxml4j.opc.TargetMode;
|
import org.apache.poi.openxml4j.opc.TargetMode;
|
||||||
|
import org.apache.poi.ss.formula.SheetNameFormatter;
|
||||||
import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
|
import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
|
||||||
import org.apache.poi.ss.formula.udf.UDFFinder;
|
import org.apache.poi.ss.formula.udf.UDFFinder;
|
||||||
import org.apache.poi.ss.usermodel.Row;
|
import org.apache.poi.ss.usermodel.Row;
|
||||||
|
import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
|
||||||
import org.apache.poi.ss.usermodel.Sheet;
|
import org.apache.poi.ss.usermodel.Sheet;
|
||||||
import org.apache.poi.ss.usermodel.Workbook;
|
import org.apache.poi.ss.usermodel.Workbook;
|
||||||
import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
|
|
||||||
import org.apache.poi.ss.util.CellRangeAddress;
|
import org.apache.poi.ss.util.CellRangeAddress;
|
||||||
import org.apache.poi.ss.util.CellReference;
|
import org.apache.poi.ss.util.CellReference;
|
||||||
import org.apache.poi.ss.util.WorkbookUtil;
|
import org.apache.poi.ss.util.WorkbookUtil;
|
||||||
import org.apache.poi.util.*;
|
import org.apache.poi.util.IOUtils;
|
||||||
import org.apache.poi.xssf.model.*;
|
import org.apache.poi.util.Internal;
|
||||||
|
import org.apache.poi.util.POILogFactory;
|
||||||
|
import org.apache.poi.util.POILogger;
|
||||||
|
import org.apache.poi.util.PackageHelper;
|
||||||
|
import org.apache.poi.xssf.model.CalculationChain;
|
||||||
|
import org.apache.poi.xssf.model.MapInfo;
|
||||||
|
import org.apache.poi.xssf.model.SharedStringsTable;
|
||||||
|
import org.apache.poi.xssf.model.StylesTable;
|
||||||
|
import org.apache.poi.xssf.model.ThemesTable;
|
||||||
import org.apache.poi.xssf.usermodel.helpers.XSSFFormulaUtils;
|
import org.apache.poi.xssf.usermodel.helpers.XSSFFormulaUtils;
|
||||||
import org.apache.xmlbeans.XmlException;
|
import org.apache.xmlbeans.XmlException;
|
||||||
import org.apache.xmlbeans.XmlObject;
|
import org.apache.xmlbeans.XmlObject;
|
||||||
@ -1385,7 +1399,8 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Iterable<X
|
|||||||
/**
|
/**
|
||||||
* Get the document's embedded files.
|
* Get the document's embedded files.
|
||||||
*/
|
*/
|
||||||
public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
|
@Override
|
||||||
|
public List<PackagePart> getAllEmbedds() throws OpenXML4JException {
|
||||||
List<PackagePart> embedds = new LinkedList<PackagePart>();
|
List<PackagePart> embedds = new LinkedList<PackagePart>();
|
||||||
|
|
||||||
for(XSSFSheet sheet : sheets){
|
for(XSSFSheet sheet : sheets){
|
||||||
|
Loading…
Reference in New Issue
Block a user