You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/05/22 20:22:17 UTC
svn commit: r1890119 [6/10] - in /poi/trunk/poi-ooxml/src:
main/java/org/apache/poi/ooxml/extractor/
main/java/org/apache/poi/ooxml/util/
main/java/org/apache/poi/openxml4j/exceptions/
main/java/org/apache/poi/openxml4j/opc/ main/java/org/apache/poi/op...
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java Sat May 22 20:22:16 2021
@@ -360,7 +360,7 @@ public class XSSFHyperlink implements Hy
@Override
public void setLastRow(int row) {
setFirstRow(row);
- }
+ }
/**
* @return additional text to help the user understand more about the hyperlink
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java Sat May 22 20:22:16 2021
@@ -53,10 +53,10 @@ public class XSSFOddFooter extends XSSFH
*/
@Override
public void setText(String text) {
- if(text == null) {
- getHeaderFooter().unsetOddFooter();
- } else {
- getHeaderFooter().setOddFooter(text);
- }
+ if(text == null) {
+ getHeaderFooter().unsetOddFooter();
+ } else {
+ getHeaderFooter().setOddFooter(text);
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java Sat May 22 20:22:16 2021
@@ -53,10 +53,10 @@ public class XSSFOddHeader extends XSSFH
*/
@Override
public void setText(String text) {
- if(text == null) {
- getHeaderFooter().unsetOddHeader();
- } else {
- getHeaderFooter().setOddHeader(text);
- }
+ if(text == null) {
+ getHeaderFooter().unsetOddHeader();
+ } else {
+ getHeaderFooter().setOddHeader(text);
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java Sat May 22 20:22:16 2021
@@ -60,7 +60,7 @@ public class XSSFPivotCache extends POIX
@Beta
protected void readFrom(InputStream is) throws IOException {
- try {
+ try {
XmlOptions options = new XmlOptions(DEFAULT_XML_OPTIONS);
//Removing root element
options.setLoadReplaceDocumentElement(null);
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java Sat May 22 20:22:16 2021
@@ -70,7 +70,7 @@ public class XSSFPivotCacheDefinition ex
@Beta
public void readFrom(InputStream is) throws IOException {
- try {
+ try {
XmlOptions options = new XmlOptions(DEFAULT_XML_OPTIONS);
//Removing root element
options.setLoadReplaceDocumentElement(null);
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java Sat May 22 20:22:16 2021
@@ -57,7 +57,7 @@ public class XSSFPivotCacheRecords exten
@Beta
protected void readFrom(InputStream is) throws IOException {
- try {
+ try {
XmlOptions options = new XmlOptions(DEFAULT_XML_OPTIONS);
//Removing root element
options.setLoadReplaceDocumentElement(null);
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java Sat May 22 20:22:16 2021
@@ -100,7 +100,7 @@ public class XSSFPivotTable extends POIX
@Beta
public void readFrom(InputStream is) throws IOException {
- try {
+ try {
XmlOptions options = new XmlOptions(DEFAULT_XML_OPTIONS);
//Removing root element
options.setLoadReplaceDocumentElement(null);
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java Sat May 22 20:22:16 2021
@@ -56,16 +56,16 @@ public class XSSFSheetConditionalFormatt
* TODO - formulas containing cell references are currently not parsed properly
*
* @param comparisonOperation - a constant value from
- * {@code {@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator}}:
+ * {@code {@link org.apache.poi.hssf.record.CFRuleBase.ComparisonOperator}}:
* <ul>
- * <li>BETWEEN</li>
- * <li>NOT_BETWEEN</li>
- * <li>EQUAL</li>
- * <li>NOT_EQUAL</li>
- * <li>GT</li>
- * <li>LT</li>
- * <li>GE</li>
- * <li>LE</li>
+ * <li>BETWEEN</li>
+ * <li>NOT_BETWEEN</li>
+ * <li>EQUAL</li>
+ * <li>NOT_EQUAL</li>
+ * <li>GT</li>
+ * <li>LT</li>
+ * <li>GE</li>
+ * <li>LE</li>
* </ul>
*
* @param formula1 - formula for the valued, compared with the cell
@@ -266,7 +266,7 @@ public class XSSFSheetConditionalFormatt
* gets Conditional Formatting object at a particular index
*
* @param index
- * of the Conditional Formatting object to fetch
+ * of the Conditional Formatting object to fetch
* @return Conditional Formatting object
*/
@Override
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java Sat May 22 20:22:16 2021
@@ -111,7 +111,7 @@ public class XSSFTextRun {
*/
public double getFontSize(){
double scale = 1;
- double size = XSSFFont.DEFAULT_FONT_SIZE; // default font size
+ double size = XSSFFont.DEFAULT_FONT_SIZE; // default font size
CTTextNormalAutofit afit = getParentParagraph().getParentShape().getTxBody().getBodyPr().getNormAutofit();
if(afit != null) scale = (double)afit.getFontScale() / 100000;
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java Sat May 22 20:22:16 2021
@@ -192,11 +192,11 @@ public class XSSFCellAlignment {
}
public boolean getShrinkToFit() {
- return cellAlignement.getShrinkToFit();
+ return cellAlignement.getShrinkToFit();
}
public void setShrinkToFit(boolean shrink) {
- cellAlignement.setShrinkToFit(shrink);
+ cellAlignement.setShrinkToFit(shrink);
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java Sat May 22 20:22:16 2021
@@ -121,124 +121,124 @@ import org.openxmlformats.schemas.spread
*
*/
public abstract class XSSFHeaderFooter implements HeaderFooter {
- private final HeaderFooterHelper helper;
- private final CTHeaderFooter headerFooter;
+ private final HeaderFooterHelper helper;
+ private final CTHeaderFooter headerFooter;
- private boolean stripFields;
+ private boolean stripFields;
- /**
- * Create an instance of XSSFAbstractHeaderFooter from the supplied XML bean
- */
- public XSSFHeaderFooter(CTHeaderFooter headerFooter) {
+ /**
+ * Create an instance of XSSFAbstractHeaderFooter from the supplied XML bean
+ */
+ public XSSFHeaderFooter(CTHeaderFooter headerFooter) {
this.headerFooter = headerFooter;
- this.helper = new HeaderFooterHelper();
- }
+ this.helper = new HeaderFooterHelper();
+ }
- /**
- * Returns the underlying CTHeaderFooter xml bean
- *
- * @return the underlying CTHeaderFooter xml bean
- */
+ /**
+ * Returns the underlying CTHeaderFooter xml bean
+ *
+ * @return the underlying CTHeaderFooter xml bean
+ */
@Internal
- public CTHeaderFooter getHeaderFooter() {
- return this.headerFooter;
- }
+ public CTHeaderFooter getHeaderFooter() {
+ return this.headerFooter;
+ }
/**
* Returns the value of the header or footer.
*
* @return the value of the header or footer.
*/
- public String getValue() {
- String value = getText();
- if (value == null)
- return "";
- return value;
- }
-
- /**
- * Are fields currently being stripped from the text that this
- * XSSFHeaderFooter returns? Default is false, but can be changed
- */
- public boolean areFieldsStripped() {
- return stripFields;
- }
-
- /**
- * Should fields (eg macros) be stripped from the text that this class
- * returns? Default is not to strip.
- */
- public void setAreFieldsStripped(boolean stripFields) {
- this.stripFields = stripFields;
- }
-
- /**
- * Removes any fields (eg macros, page markers etc) from the string.
- * Normally used to make some text suitable for showing to humans, and the
- * resultant text should not normally be saved back into the document!
- */
- public static String stripFields(String text) {
- return org.apache.poi.hssf.usermodel.HeaderFooter.stripFields(text);
- }
-
- public abstract String getText();
-
- protected abstract void setText(String text);
-
- /**
- * get the text representing the center part of this element
- */
- @Override
- public String getCenter() {
- String text = helper.getCenterSection(getText());
- if (stripFields)
- return stripFields(text);
- return text;
- }
-
- /**
- * get the text representing the left part of this element
- */
- @Override
- public String getLeft() {
- String text = helper.getLeftSection(getText());
- if (stripFields)
- return stripFields(text);
- return text;
- }
-
- /**
- * get the text representing the right part of this element
- */
- @Override
- public String getRight() {
- String text = helper.getRightSection(getText());
- if (stripFields)
- return stripFields(text);
- return text;
- }
-
- /**
- * set a centered string value for this element
- */
- @Override
- public void setCenter(String newCenter) {
- setText(helper.setCenterSection(getText(), newCenter));
- }
-
- /**
- * set a left string value for this element
- */
- @Override
- public void setLeft(String newLeft) {
- setText(helper.setLeftSection(getText(), newLeft));
- }
-
- /**
- * set a right string value for this element
- */
- @Override
- public void setRight(String newRight) {
- setText(helper.setRightSection(getText(), newRight));
- }
+ public String getValue() {
+ String value = getText();
+ if (value == null)
+ return "";
+ return value;
+ }
+
+ /**
+ * Are fields currently being stripped from the text that this
+ * XSSFHeaderFooter returns? Default is false, but can be changed
+ */
+ public boolean areFieldsStripped() {
+ return stripFields;
+ }
+
+ /**
+ * Should fields (eg macros) be stripped from the text that this class
+ * returns? Default is not to strip.
+ */
+ public void setAreFieldsStripped(boolean stripFields) {
+ this.stripFields = stripFields;
+ }
+
+ /**
+ * Removes any fields (eg macros, page markers etc) from the string.
+ * Normally used to make some text suitable for showing to humans, and the
+ * resultant text should not normally be saved back into the document!
+ */
+ public static String stripFields(String text) {
+ return org.apache.poi.hssf.usermodel.HeaderFooter.stripFields(text);
+ }
+
+ public abstract String getText();
+
+ protected abstract void setText(String text);
+
+ /**
+ * get the text representing the center part of this element
+ */
+ @Override
+ public String getCenter() {
+ String text = helper.getCenterSection(getText());
+ if (stripFields)
+ return stripFields(text);
+ return text;
+ }
+
+ /**
+ * get the text representing the left part of this element
+ */
+ @Override
+ public String getLeft() {
+ String text = helper.getLeftSection(getText());
+ if (stripFields)
+ return stripFields(text);
+ return text;
+ }
+
+ /**
+ * get the text representing the right part of this element
+ */
+ @Override
+ public String getRight() {
+ String text = helper.getRightSection(getText());
+ if (stripFields)
+ return stripFields(text);
+ return text;
+ }
+
+ /**
+ * set a centered string value for this element
+ */
+ @Override
+ public void setCenter(String newCenter) {
+ setText(helper.setCenterSection(getText(), newCenter));
+ }
+
+ /**
+ * set a left string value for this element
+ */
+ @Override
+ public void setLeft(String newLeft) {
+ setText(helper.setLeftSection(getText(), newLeft));
+ }
+
+ /**
+ * set a right string value for this element
+ */
+ @Override
+ public void setRight(String newRight) {
+ setText(helper.setRightSection(getText(), newRight));
+ }
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java Sat May 22 20:22:16 2021
@@ -20,7 +20,7 @@ package org.apache.poi.xssf.usermodel.he
public class HeaderFooterHelper {
// Note - XmlBeans handles entity encoding for us,
- // so these should be & forms, not the & ones!
+ // so these should be & forms, not the & ones!
private static final String HeaderFooterEntity_L = "&L";
private static final String HeaderFooterEntity_C = "&C";
private static final String HeaderFooterEntity_R = "&R";
@@ -32,28 +32,28 @@ public class HeaderFooterHelper {
public static final String HeaderFooterEntity_Time = "&T";
public String getLeftSection(String string) {
- return getParts(string)[0];
+ return getParts(string)[0];
}
public String getCenterSection(String string) {
- return getParts(string)[1];
+ return getParts(string)[1];
}
public String getRightSection(String string) {
- return getParts(string)[2];
+ return getParts(string)[2];
}
public String setLeftSection(String string, String newLeft) {
- String[] parts = getParts(string);
- parts[0] = newLeft;
+ String[] parts = getParts(string);
+ parts[0] = newLeft;
return joinParts(parts);
}
public String setCenterSection(String string, String newCenter) {
- String[] parts = getParts(string);
- parts[1] = newCenter;
+ String[] parts = getParts(string);
+ parts[1] = newCenter;
return joinParts(parts);
}
public String setRightSection(String string, String newRight) {
- String[] parts = getParts(string);
- parts[2] = newRight;
+ String[] parts = getParts(string);
+ parts[2] = newRight;
return joinParts(parts);
}
@@ -61,59 +61,59 @@ public class HeaderFooterHelper {
* Split into left, center, right
*/
private String[] getParts(String string) {
- String[] parts = new String[] { "", "", "" };
- if(string == null)
- return parts;
-
- // They can come in any order, which is just nasty
- // Work backwards from the end, picking the last
- // on off each time as we go
- int lAt = 0;
- int cAt = 0;
- int rAt = 0;
-
- while(
- // Ensure all indicies get updated, then -1 tested
- (lAt = string.indexOf(HeaderFooterEntity_L)) > -2 &&
- (cAt = string.indexOf(HeaderFooterEntity_C)) > -2 &&
- (rAt = string.indexOf(HeaderFooterEntity_R)) > -2 &&
- (lAt > -1 || cAt > -1 || rAt > -1)
- ) {
- // Pick off the last one
- if(rAt > cAt && rAt > lAt) {
- parts[2] = string.substring(rAt + HeaderFooterEntity_R.length());
- string = string.substring(0, rAt);
- } else if(cAt > rAt && cAt > lAt) {
- parts[1] = string.substring(cAt + HeaderFooterEntity_C.length());
- string = string.substring(0, cAt);
- } else {
- parts[0] = string.substring(lAt + HeaderFooterEntity_L.length());
- string = string.substring(0, lAt);
- }
- }
-
- return parts;
+ String[] parts = new String[] { "", "", "" };
+ if(string == null)
+ return parts;
+
+ // They can come in any order, which is just nasty
+ // Work backwards from the end, picking the last
+ // on off each time as we go
+ int lAt = 0;
+ int cAt = 0;
+ int rAt = 0;
+
+ while(
+ // Ensure all indicies get updated, then -1 tested
+ (lAt = string.indexOf(HeaderFooterEntity_L)) > -2 &&
+ (cAt = string.indexOf(HeaderFooterEntity_C)) > -2 &&
+ (rAt = string.indexOf(HeaderFooterEntity_R)) > -2 &&
+ (lAt > -1 || cAt > -1 || rAt > -1)
+ ) {
+ // Pick off the last one
+ if(rAt > cAt && rAt > lAt) {
+ parts[2] = string.substring(rAt + HeaderFooterEntity_R.length());
+ string = string.substring(0, rAt);
+ } else if(cAt > rAt && cAt > lAt) {
+ parts[1] = string.substring(cAt + HeaderFooterEntity_C.length());
+ string = string.substring(0, cAt);
+ } else {
+ parts[0] = string.substring(lAt + HeaderFooterEntity_L.length());
+ string = string.substring(0, lAt);
+ }
+ }
+
+ return parts;
}
private String joinParts(String[] parts) {
- return joinParts(parts[0], parts[1], parts[2]);
+ return joinParts(parts[0], parts[1], parts[2]);
}
private String joinParts(String l, String c, String r) {
- StringBuilder ret = new StringBuilder(64);
+ StringBuilder ret = new StringBuilder(64);
- // Join as c, l, r
- if(c.length() > 0) {
- ret.append(HeaderFooterEntity_C);
- ret.append(c);
- }
- if(l.length() > 0) {
- ret.append(HeaderFooterEntity_L);
- ret.append(l);
- }
- if(r.length() > 0) {
- ret.append(HeaderFooterEntity_R);
- ret.append(r);
- }
-
- return ret.toString();
+ // Join as c, l, r
+ if(c.length() > 0) {
+ ret.append(HeaderFooterEntity_C);
+ ret.append(c);
+ }
+ if(l.length() > 0) {
+ ret.append(HeaderFooterEntity_L);
+ ret.append(l);
+ }
+ if(r.length() > 0) {
+ ret.append(HeaderFooterEntity_R);
+ ret.append(r);
+ }
+
+ return ret.toString();
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java Sat May 22 20:22:16 2021
@@ -32,53 +32,53 @@ import org.openxmlformats.schemas.spread
*/
public class XSSFSingleXmlCell {
- private CTSingleXmlCell singleXmlCell;
- private SingleXmlCells parent;
+ private CTSingleXmlCell singleXmlCell;
+ private SingleXmlCells parent;
- public XSSFSingleXmlCell(CTSingleXmlCell singleXmlCell, SingleXmlCells parent){
- this.singleXmlCell = singleXmlCell;
- this.parent = parent;
- }
+ public XSSFSingleXmlCell(CTSingleXmlCell singleXmlCell, SingleXmlCells parent){
+ this.singleXmlCell = singleXmlCell;
+ this.parent = parent;
+ }
- /**
- * Gets the XSSFCell referenced by the R attribute or creates a new one if cell doesn't exists
- * @return the referenced XSSFCell, null if the cell reference is invalid
- */
- public XSSFCell getReferencedCell(){
- XSSFCell cell = null;
+ /**
+ * Gets the XSSFCell referenced by the R attribute or creates a new one if cell doesn't exists
+ * @return the referenced XSSFCell, null if the cell reference is invalid
+ */
+ public XSSFCell getReferencedCell(){
+ XSSFCell cell = null;
- CellReference cellReference = new CellReference(singleXmlCell.getR());
+ CellReference cellReference = new CellReference(singleXmlCell.getR());
- XSSFRow row = parent.getXSSFSheet().getRow(cellReference.getRow());
- if(row==null){
- row = parent.getXSSFSheet().createRow(cellReference.getRow());
- }
+ XSSFRow row = parent.getXSSFSheet().getRow(cellReference.getRow());
+ if(row==null){
+ row = parent.getXSSFSheet().createRow(cellReference.getRow());
+ }
- cell = row.getCell(cellReference.getCol());
- if(cell==null){
- cell = row.createCell(cellReference.getCol());
- }
+ cell = row.getCell(cellReference.getCol());
+ if(cell==null){
+ cell = row.createCell(cellReference.getCol());
+ }
- return cell;
- }
+ return cell;
+ }
- public String getXpath(){
- CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr();
- CTXmlPr xmlPr = xmlCellPr.getXmlPr();
+ public String getXpath(){
+ CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr();
+ CTXmlPr xmlPr = xmlCellPr.getXmlPr();
return xmlPr.getXpath();
- }
+ }
- public long getMapId(){
- return singleXmlCell.getXmlCellPr().getXmlPr().getMapId();
- }
-
- public String getXmlDataType() {
- CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr();
- CTXmlPr xmlPr = xmlCellPr.getXmlPr();
- return xmlPr.getXmlDataType();
- }
+ public long getMapId(){
+ return singleXmlCell.getXmlCellPr().getXmlPr().getMapId();
+ }
+
+ public String getXmlDataType() {
+ CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr();
+ CTXmlPr xmlPr = xmlCellPr.getXmlPr();
+ return xmlPr.getXmlDataType();
+ }
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java Sat May 22 20:22:16 2021
@@ -241,14 +241,14 @@ public class XWPFHeaderFooterPolicy {
}
private CTHdrFtr buildFtr(Enum type, XWPFHeaderFooter wrapper, XWPFParagraph[] pars) {
- //CTHdrFtr ftr = buildHdrFtr(pStyle, pars); // MB 24 May 2010
+ //CTHdrFtr ftr = buildHdrFtr(pStyle, pars); // MB 24 May 2010
CTHdrFtr ftr = buildHdrFtr(pars, wrapper); // MB 24 May 2010
setFooterReference(type, wrapper);
return ftr;
}
private CTHdrFtr buildHdr(Enum type, XWPFHeaderFooter wrapper, XWPFParagraph[] pars) {
- //CTHdrFtr hdr = buildHdrFtr(pStyle, pars); // MB 24 May 2010
+ //CTHdrFtr hdr = buildHdrFtr(pStyle, pars); // MB 24 May 2010
CTHdrFtr hdr = buildHdrFtr(pars, wrapper); // MB 24 May 2010
setHeaderReference(type, wrapper);
return hdr;
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java Sat May 22 20:22:16 2021
@@ -109,7 +109,7 @@ public class XWPFSettings extends POIXML
zoom.setPercent(BigInteger.valueOf(zoomPercent));
}
- /**
+ /**
* Verifies the documentProtection tag inside settings.xml file <br>
* if the protection is enforced (w:enforcement="1") <br>
* <p>
@@ -122,7 +122,7 @@ public class XWPFSettings extends POIXML
*
* @return true if documentProtection is enforced with option any
*/
- public boolean isEnforcedWith() {
+ public boolean isEnforcedWith() {
CTDocProtect ctDocProtect = ctSettings.getDocumentProtection();
return ctDocProtect != null && POIXMLUnits.parseOnOff(ctDocProtect.xgetEnforcement());
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java Sat May 22 20:22:16 2021
@@ -42,30 +42,30 @@ import org.junit.jupiter.params.provider
@SuppressWarnings("deprecation")
class TestDetectAsOOXML {
@Test
- void testOpensProperly() throws IOException, InvalidFormatException {
- try (InputStream is = openSampleFileStream("sample.xlsx");
- OPCPackage pkg = OPCPackage.open(is)) {
- assertNotNull(pkg);
- }
- }
+ void testOpensProperly() throws IOException, InvalidFormatException {
+ try (InputStream is = openSampleFileStream("sample.xlsx");
+ OPCPackage pkg = OPCPackage.open(is)) {
+ assertNotNull(pkg);
+ }
+ }
@ParameterizedTest
- @CsvSource({"SampleSS.xlsx, OOXML", "SampleSS.xls, OLE2", "SampleSS.txt, UNKNOWN"})
- void testDetectAsPOIFS(String file, FileMagic fm) throws IOException {
- try (InputStream is = FileMagic.prepareToCheckMagic(openSampleFileStream(file))) {
- FileMagic act = FileMagic.valueOf(is);
-
- assertEquals(act == FileMagic.OOXML, DocumentFactoryHelper.hasOOXMLHeader(is),
- "OOXML files should be detected, others not");
-
- assertEquals(fm, act, "file magic failed for " + file);
- }
- }
+ @CsvSource({"SampleSS.xlsx, OOXML", "SampleSS.xls, OLE2", "SampleSS.txt, UNKNOWN"})
+ void testDetectAsPOIFS(String file, FileMagic fm) throws IOException {
+ try (InputStream is = FileMagic.prepareToCheckMagic(openSampleFileStream(file))) {
+ FileMagic act = FileMagic.valueOf(is);
+
+ assertEquals(act == FileMagic.OOXML, DocumentFactoryHelper.hasOOXMLHeader(is),
+ "OOXML files should be detected, others not");
+
+ assertEquals(fm, act, "file magic failed for " + file);
+ }
+ }
@Test
void testFileCorruption() throws Exception {
- // create test InputStream
- byte[] testData = { 1, 2, 3 };
+ // create test InputStream
+ byte[] testData = { 1, 2, 3 };
ByteArrayInputStream testInput = new ByteArrayInputStream(testData);
InputStream is = FileMagic.prepareToCheckMagic(testInput);
@@ -77,5 +77,5 @@ class TestDetectAsOOXML {
assertArrayEquals(testData, act);
assertEquals(-1, is.read());
is.close();
- }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java Sat May 22 20:22:16 2021
@@ -36,42 +36,42 @@ import org.junit.jupiter.api.Test;
* Class to test that we handle embeded bits in OOXML files properly
*/
class TestEmbedded {
- @Test
- void testExcel() throws Exception {
- POIXMLDocument doc = new XSSFWorkbook(
+ @Test
+ void testExcel() throws Exception {
+ POIXMLDocument doc = new XSSFWorkbook(
POIDataSamples.getSpreadSheetInstance().openResourceAsStream("ExcelWithAttachments.xlsm")
);
- test(doc, 4);
- }
+ test(doc, 4);
+ }
- @Test
- void testWord() throws Exception {
- POIXMLDocument doc = new XWPFDocument(
+ @Test
+ void testWord() throws Exception {
+ POIXMLDocument doc = new XWPFDocument(
POIDataSamples.getDocumentInstance().openResourceAsStream("WordWithAttachments.docx")
);
- test(doc, 5);
- }
+ test(doc, 5);
+ }
- @Test
- void testPowerPoint() throws Exception {
- POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open(
+ @Test
+ void testPowerPoint() throws Exception {
+ POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open(
POIDataSamples.getSlideShowInstance().openResourceAsStream("PPTWithAttachments.pptm"))
);
- test(doc, 4);
- }
+ test(doc, 4);
+ }
- private void test(POIXMLDocument doc, int expectedCount) throws Exception {
- assertNotNull(doc.getAllEmbeddedParts());
- assertEquals(expectedCount, doc.getAllEmbeddedParts().size());
-
- for(int i=0; i<doc.getAllEmbeddedParts().size(); i++) {
- PackagePart pp = doc.getAllEmbeddedParts().get(i);
- assertNotNull(pp);
-
- byte[] b = IOUtils.toByteArray(pp.getInputStream());
- assertTrue(b.length > 0);
- }
+ private void test(POIXMLDocument doc, int expectedCount) throws Exception {
+ assertNotNull(doc.getAllEmbeddedParts());
+ assertEquals(expectedCount, doc.getAllEmbeddedParts().size());
+
+ for(int i=0; i<doc.getAllEmbeddedParts().size(); i++) {
+ PackagePart pp = doc.getAllEmbeddedParts().get(i);
+ assertNotNull(pp);
+
+ byte[] b = IOUtils.toByteArray(pp.getInputStream());
+ assertTrue(b.length > 0);
+ }
- doc.close();
- }
+ doc.close();
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java Sat May 22 20:22:16 2021
@@ -34,74 +34,74 @@ public final class TestXMLPropertiesText
private static final POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
private static final POIDataSamples _slSamples = POIDataSamples.getSlideShowInstance();
- @Test
- void testGetFromMainExtractor() throws Exception {
- OPCPackage pkg = PackageHelper.open(_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm"));
+ @Test
+ void testGetFromMainExtractor() throws Exception {
+ OPCPackage pkg = PackageHelper.open(_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm"));
- XSSFWorkbook wb = new XSSFWorkbook(pkg);
+ XSSFWorkbook wb = new XSSFWorkbook(pkg);
- XSSFExcelExtractor ext = new XSSFExcelExtractor(wb);
- POIXMLPropertiesTextExtractor textExt = ext.getMetadataTextExtractor();
+ XSSFExcelExtractor ext = new XSSFExcelExtractor(wb);
+ POIXMLPropertiesTextExtractor textExt = ext.getMetadataTextExtractor();
- // Check basics
- assertNotNull(textExt);
- assertTrue(textExt.getText().length() > 0);
+ // Check basics
+ assertNotNull(textExt);
+ assertTrue(textExt.getText().length() > 0);
- // Check some of the content
- String text = textExt.getText();
- String cText = textExt.getCorePropertiesText();
+ // Check some of the content
+ String text = textExt.getText();
+ String cText = textExt.getCorePropertiesText();
- assertContains(text, "LastModifiedBy = Yury Batrakov");
- assertContains(cText, "LastModifiedBy = Yury Batrakov");
+ assertContains(text, "LastModifiedBy = Yury Batrakov");
+ assertContains(cText, "LastModifiedBy = Yury Batrakov");
- textExt.close();
- ext.close();
- }
+ textExt.close();
+ ext.close();
+ }
- @Test
- void testCore() throws Exception {
- OPCPackage pkg = PackageHelper.open(
+ @Test
+ void testCore() throws Exception {
+ OPCPackage pkg = PackageHelper.open(
_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
- );
- XSSFWorkbook wb = new XSSFWorkbook(pkg);
+ );
+ XSSFWorkbook wb = new XSSFWorkbook(pkg);
- POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
- ext.getText();
+ POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
+ ext.getText();
- // Now check
- String text = ext.getText();
- String cText = ext.getCorePropertiesText();
+ // Now check
+ String text = ext.getText();
+ String cText = ext.getCorePropertiesText();
- assertContains(text, "LastModifiedBy = Yury Batrakov");
- assertContains(cText, "LastModifiedBy = Yury Batrakov");
+ assertContains(text, "LastModifiedBy = Yury Batrakov");
+ assertContains(cText, "LastModifiedBy = Yury Batrakov");
- ext.close();
- }
+ ext.close();
+ }
- @Test
- void testExtended() throws Exception {
- OPCPackage pkg = OPCPackage.open(
+ @Test
+ void testExtended() throws Exception {
+ OPCPackage pkg = OPCPackage.open(
_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
- );
- XSSFWorkbook wb = new XSSFWorkbook(pkg);
+ );
+ XSSFWorkbook wb = new XSSFWorkbook(pkg);
- POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
- ext.getText();
+ POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
+ ext.getText();
- // Now check
- String text = ext.getText();
- String eText = ext.getExtendedPropertiesText();
-
- assertContains(text, "Application = Microsoft Excel");
- assertContains(text, "Company = Mera");
- assertContains(eText, "Application = Microsoft Excel");
- assertContains(eText, "Company = Mera");
+ // Now check
+ String text = ext.getText();
+ String eText = ext.getExtendedPropertiesText();
+
+ assertContains(text, "Application = Microsoft Excel");
+ assertContains(text, "Company = Mera");
+ assertContains(eText, "Application = Microsoft Excel");
+ assertContains(eText, "Company = Mera");
- ext.close();
- }
+ ext.close();
+ }
- @Test
- void testCustom() throws Exception {
+ @Test
+ void testCustom() throws Exception {
OPCPackage pkg = OPCPackage.open(
_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
);
@@ -118,14 +118,14 @@ public final class TestXMLPropertiesText
assertContains(cText, "description = another value");
ext.close();
- }
+ }
- /**
- * Bug #49386 - some properties, especially
- * dates can be null
- */
- @Test
- void testWithSomeNulls() throws Exception {
+ /**
+ * Bug #49386 - some properties, especially
+ * dates can be null
+ */
+ @Test
+ void testWithSomeNulls() throws Exception {
OPCPackage pkg = OPCPackage.open(
_slSamples.openResourceAsStream("49386-null_dates.pptx")
);
@@ -140,5 +140,5 @@ public final class TestXMLPropertiesText
assertContains(text, "LastModifiedBy = IT Client Services");
ext.close();
- }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java Sat May 22 20:22:16 2021
@@ -30,23 +30,23 @@ import java.io.IOException;
public final class OpenXML4JTestDataSamples {
private static final POIDataSamples _samples = POIDataSamples.getOpenXML4JInstance();
- private OpenXML4JTestDataSamples() {
- // no instances of this class
- }
+ private OpenXML4JTestDataSamples() {
+ // no instances of this class
+ }
- public static InputStream openSampleStream(String sampleFileName) {
- return _samples.openResourceAsStream(sampleFileName);
- }
- public static String getSampleFileName(String sampleFileName) {
- return getSampleFile(sampleFileName).getAbsolutePath();
- }
+ public static InputStream openSampleStream(String sampleFileName) {
+ return _samples.openResourceAsStream(sampleFileName);
+ }
+ public static String getSampleFileName(String sampleFileName) {
+ return getSampleFile(sampleFileName).getAbsolutePath();
+ }
- public static File getSampleFile(String sampleFileName) {
- return _samples.getFile(sampleFileName);
- }
+ public static File getSampleFile(String sampleFileName) {
+ return _samples.getFile(sampleFileName);
+ }
- public static File getOutputFile(String outputFileName) throws IOException {
- int idx = outputFileName.lastIndexOf('.');
+ public static File getOutputFile(String outputFileName) throws IOException {
+ int idx = outputFileName.lastIndexOf('.');
return TempFile.createTempFile(outputFileName.substring(0,idx), outputFileName.substring(idx));
- }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java Sat May 22 20:22:16 2021
@@ -30,27 +30,27 @@ import org.junit.jupiter.api.Test;
*/
public final class TestFileHelper {
- /**
- * TODO - use simple JDK methods on {@link File} instead:<br>
- * {@link File#getParentFile()} instead of {@link FileHelper#getDirectory(File)
- * {@link File#getName()} instead of {@link FileHelper#getFilename(File)
- */
+ /**
+ * TODO - use simple JDK methods on {@link File} instead:<br>
+ * {@link File#getParentFile()} instead of {@link FileHelper#getDirectory(File)
+ * {@link File#getName()} instead of {@link FileHelper#getFilename(File)
+ */
@Test
- void testGetDirectory() {
- TreeMap<String, String> expectedValue = new TreeMap<>();
- expectedValue.put("/dir1/test.doc", "/dir1");
- expectedValue.put("/dir1/dir2/test.doc.xml", "/dir1/dir2");
+ void testGetDirectory() {
+ TreeMap<String, String> expectedValue = new TreeMap<>();
+ expectedValue.put("/dir1/test.doc", "/dir1");
+ expectedValue.put("/dir1/dir2/test.doc.xml", "/dir1/dir2");
- for (String filename : expectedValue.keySet()) {
- File f1 = new File(expectedValue.get(filename));
- File f2 = FileHelper.getDirectory(new File(filename));
+ for (String filename : expectedValue.keySet()) {
+ File f1 = new File(expectedValue.get(filename));
+ File f2 = FileHelper.getDirectory(new File(filename));
-// if (false) {
-// // YK: The original version asserted expected values against File#getAbsolutePath():
-// assertTrue(expectedValue.get(filename).equalsIgnoreCase(f2.getAbsolutePath()));
-// // This comparison is platform dependent. A better approach is below
-// }
- assertEquals(f1, f2);
- }
- }
+// if (false) {
+// // YK: The original version asserted expected values against File#getAbsolutePath():
+// assertTrue(expectedValue.get(filename).equalsIgnoreCase(f2.getAbsolutePath()));
+// // This comparison is platform dependent. A better approach is below
+// }
+ assertEquals(f1, f2);
+ }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java Sat May 22 20:22:16 2021
@@ -34,71 +34,71 @@ import org.junit.jupiter.api.Test;
public final class TestListParts {
private static final Logger LOG = LogManager.getLogger(TestListParts.class);
- private TreeMap<PackagePartName, String> expectedValues;
+ private TreeMap<PackagePartName, String> expectedValues;
- private TreeMap<PackagePartName, String> values;
+ private TreeMap<PackagePartName, String> values;
- @BeforeEach
- void setUp() throws Exception {
- values = new TreeMap<>();
-
- // Expected values
- expectedValues = new TreeMap<>();
- expectedValues.put(PackagingURIHelper.createPartName("/_rels/.rels"),
- "application/vnd.openxmlformats-package.relationships+xml");
-
- expectedValues
- .put(PackagingURIHelper.createPartName("/docProps/app.xml"),
- "application/vnd.openxmlformats-officedocument.extended-properties+xml");
- expectedValues.put(PackagingURIHelper
- .createPartName("/docProps/core.xml"),
- "application/vnd.openxmlformats-package.core-properties+xml");
- expectedValues.put(PackagingURIHelper
- .createPartName("/word/_rels/document.xml.rels"),
- "application/vnd.openxmlformats-package.relationships+xml");
- expectedValues
- .put(
- PackagingURIHelper.createPartName("/word/document.xml"),
- "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
- expectedValues
- .put(PackagingURIHelper.createPartName("/word/fontTable.xml"),
- "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
- expectedValues.put(PackagingURIHelper
- .createPartName("/word/media/image1.gif"), "image/gif");
- expectedValues
- .put(PackagingURIHelper.createPartName("/word/settings.xml"),
- "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
- expectedValues
- .put(PackagingURIHelper.createPartName("/word/styles.xml"),
- "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
- expectedValues.put(PackagingURIHelper
- .createPartName("/word/theme/theme1.xml"),
- "application/vnd.openxmlformats-officedocument.theme+xml");
- expectedValues
- .put(
- PackagingURIHelper
- .createPartName("/word/webSettings.xml"),
- "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
- }
-
- /**
- * List all parts of a package.
- */
- @Test
- void testListParts() throws InvalidFormatException, IOException {
- try (InputStream is = OpenXML4JTestDataSamples.openSampleStream("sample.docx");
- OPCPackage p = OPCPackage.open(is)) {
-
- for (PackagePart part : p.getParts()) {
- values.put(part.getPartName(), part.getContentType());
- LOG.atDebug().log(part.getPartName());
- }
-
- // Compare expected values with values return by the package
- for (PackagePartName partName : expectedValues.keySet()) {
- assertNotNull(values.get(partName));
- assertEquals(expectedValues.get(partName), values.get(partName));
- }
- }
- }
+ @BeforeEach
+ void setUp() throws Exception {
+ values = new TreeMap<>();
+
+ // Expected values
+ expectedValues = new TreeMap<>();
+ expectedValues.put(PackagingURIHelper.createPartName("/_rels/.rels"),
+ "application/vnd.openxmlformats-package.relationships+xml");
+
+ expectedValues
+ .put(PackagingURIHelper.createPartName("/docProps/app.xml"),
+ "application/vnd.openxmlformats-officedocument.extended-properties+xml");
+ expectedValues.put(PackagingURIHelper
+ .createPartName("/docProps/core.xml"),
+ "application/vnd.openxmlformats-package.core-properties+xml");
+ expectedValues.put(PackagingURIHelper
+ .createPartName("/word/_rels/document.xml.rels"),
+ "application/vnd.openxmlformats-package.relationships+xml");
+ expectedValues
+ .put(
+ PackagingURIHelper.createPartName("/word/document.xml"),
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
+ expectedValues
+ .put(PackagingURIHelper.createPartName("/word/fontTable.xml"),
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
+ expectedValues.put(PackagingURIHelper
+ .createPartName("/word/media/image1.gif"), "image/gif");
+ expectedValues
+ .put(PackagingURIHelper.createPartName("/word/settings.xml"),
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
+ expectedValues
+ .put(PackagingURIHelper.createPartName("/word/styles.xml"),
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
+ expectedValues.put(PackagingURIHelper
+ .createPartName("/word/theme/theme1.xml"),
+ "application/vnd.openxmlformats-officedocument.theme+xml");
+ expectedValues
+ .put(
+ PackagingURIHelper
+ .createPartName("/word/webSettings.xml"),
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
+ }
+
+ /**
+ * List all parts of a package.
+ */
+ @Test
+ void testListParts() throws InvalidFormatException, IOException {
+ try (InputStream is = OpenXML4JTestDataSamples.openSampleStream("sample.docx");
+ OPCPackage p = OPCPackage.open(is)) {
+
+ for (PackagePart part : p.getParts()) {
+ values.put(part.getPartName(), part.getContentType());
+ LOG.atDebug().log(part.getPartName());
+ }
+
+ // Compare expected values with values return by the package
+ for (PackagePartName partName : expectedValues.keySet()) {
+ assertNotNull(values.get(partName));
+ assertEquals(expectedValues.get(partName), values.get(partName));
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org