You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2019/12/15 14:53:12 UTC
svn commit: r1871590 [2/2] - in /poi/trunk/src:
examples/src/org/apache/poi/hsmf/examples/
examples/src/org/apache/poi/hssf/usermodel/examples/
java/org/apache/poi/hssf/dev/ java/org/apache/poi/hssf/eventusermodel/
java/org/apache/poi/poifs/crypt/stand...
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java Sun Dec 15 14:53:11 2019
@@ -50,7 +50,7 @@ import org.w3c.dom.Text;
/**
* Converts xls files (97-2007) to XSL FO.
- *
+ *
* @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
*/
@Beta
@@ -69,7 +69,7 @@ public class ExcelToFoConverter extends
/**
* Java main() interface to interact with {@link ExcelToFoConverter}
- *
+ *
* <p>
* Usage: ExcelToHtmlConverter infile outfile
* </p>
@@ -97,21 +97,18 @@ public class ExcelToFoConverter extends
/**
* Converts Excel file (97-2007) into XSL FO file.
- *
+ *
* @param xlsFile
* file to process
* @return DOM representation of result XSL FO
*/
public static Document process( File xlsFile ) throws Exception
{
- final HSSFWorkbook workbook = AbstractExcelUtils.loadXls( xlsFile );
- try {
+ try (HSSFWorkbook workbook = AbstractExcelUtils.loadXls(xlsFile)) {
ExcelToFoConverter excelToHtmlConverter = new ExcelToFoConverter(
XMLHelper.newDocumentBuilder().newDocument() );
- excelToHtmlConverter.processWorkbook( workbook );
+ excelToHtmlConverter.processWorkbook(workbook);
return excelToHtmlConverter.getDocument();
- } finally {
- workbook.close();
}
}
@@ -182,7 +179,7 @@ public class ExcelToFoConverter extends
/**
* Returns <tt>false</tt> if cell style by itself (without text, i.e.
* borders, fill, etc.) worth a mention, <tt>true</tt> otherwise
- *
+ *
* @return <tt>false</tt> if cell style by itself (without text, i.e.
* borders, fill, etc.) worth a mention, <tt>true</tt> otherwise
*/
@@ -453,7 +450,7 @@ public class ExcelToFoConverter extends
/**
* Creates COLGROUP element with width specified for all columns. (Except
* first if <tt>{@link #isOutputRowNumbers()}==true</tt>)
- *
+ *
* @return table width in inches
*/
protected float processColumnWidths( HSSFSheet sheet, int maxSheetColumns,
@@ -714,7 +711,7 @@ public class ExcelToFoConverter extends
/**
* Process single sheet (as specified by 0-based sheet index)
- *
+ *
* @return <tt>true</tt> if result were added to FO document, <tt>false</tt>
* otherwise
*/
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java Sun Dec 15 14:53:11 2019
@@ -478,11 +478,8 @@ public class AbstractWordUtils
public static HWPFDocumentCore loadDoc( File docFile ) throws IOException
{
- final FileInputStream istream = new FileInputStream( docFile );
- try {
- return loadDoc( istream );
- } finally {
- istream.close();
+ try (FileInputStream istream = new FileInputStream(docFile)) {
+ return loadDoc(istream);
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java Sun Dec 15 14:53:11 2019
@@ -134,11 +134,8 @@ public final class TestVisioExtractor {
}
private VisioTextExtractor openExtractor(String fileName) throws IOException {
- InputStream is = _dgTests.openResourceAsStream(fileName);
- try {
+ try (InputStream is = _dgTests.openResourceAsStream(fileName)) {
return new VisioTextExtractor(is);
- } finally {
- is.close();
}
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java Sun Dec 15 14:53:11 2019
@@ -166,9 +166,9 @@ public final class TestCompressedRTF {
msg = new HMEFMessage(is);
}
- MAPIAttribute attr = msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
- assertNotNull(attr);
- MAPIRtfAttribute rtfAttr = (MAPIRtfAttribute) attr;
+ MAPIAttribute attr = msg.getMessageMAPIAttribute(MAPIProperty.RTF_COMPRESSED);
+ assertNotNull(attr);
+ MAPIRtfAttribute rtfAttr = (MAPIRtfAttribute)attr;
final byte[] expected;
try (InputStream stream = _samples.openResourceAsStream("quick-contents/message.rtf")) {
@@ -196,7 +196,7 @@ public final class TestCompressedRTF {
}
// By String
- String expString = new String(expected, StandardCharsets.US_ASCII);
+ String expString = new String(expected, StandardCharsets.US_ASCII);
String decompStr = rtfAttr.getDataString();
assertEquals(expString.length(), decompStr.length());
assertEquals(expString, decompStr);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java Sun Dec 15 14:53:11 2019
@@ -44,12 +44,9 @@ public class HSLFTestDataSamples {
}
public static HSLFSlideShow getSlideShow(String fileName) throws IOException {
- InputStream is = openSampleFileStream(fileName);
- try {
- return new HSLFSlideShow(is);
- } finally {
- is.close();
- }
+ try (InputStream is = openSampleFileStream(fileName)) {
+ return new HSLFSlideShow(is);
+ }
}
/**
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java Sun Dec 15 14:53:11 2019
@@ -45,31 +45,22 @@ public final class TestEncryptedFile {
@Test(expected=EncryptedPowerPointFileException.class)
public void testLoadEncrypted1() throws IOException {
- InputStream is = slTests.openResourceAsStream("Password_Protected-hello.ppt");
- try {
+ try (InputStream is = slTests.openResourceAsStream("Password_Protected-hello.ppt")) {
new HSLFSlideShowImpl(is).close();
- } finally {
- is.close();
- }
+ }
}
@Test(expected=EncryptedPowerPointFileException.class)
public void testLoadEncrypted2() throws IOException {
- InputStream is = slTests.openResourceAsStream("Password_Protected-np-hello.ppt");
- try {
+ try (InputStream is = slTests.openResourceAsStream("Password_Protected-np-hello.ppt")) {
new HSLFSlideShowImpl(is).close();
- } finally {
- is.close();
- }
+ }
}
@Test(expected=EncryptedPowerPointFileException.class)
public void testLoadEncrypted3() throws IOException {
- InputStream is = slTests.openResourceAsStream("Password_Protected-56-hello.ppt");
- try {
+ try (InputStream is = slTests.openResourceAsStream("Password_Protected-56-hello.ppt")) {
new HSLFSlideShowImpl(is).close();
- } finally {
- is.close();
- }
+ }
}
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java Sun Dec 15 14:53:11 2019
@@ -67,16 +67,13 @@ public final class TestCurrentUserAtom {
@Test(expected = EncryptedPowerPointFileException.class)
public void readEnc() throws Exception {
- POIFSFileSystem fs = new POIFSFileSystem(_slTests.getFile(encFile));
- try {
- new CurrentUserAtom(fs.getRoot());
- assertTrue(true); // not yet failed
-
- new HSLFSlideShowImpl(fs).close();
- } finally {
- fs.close();
- }
+ try (POIFSFileSystem fs = new POIFSFileSystem(_slTests.getFile(encFile))) {
+ new CurrentUserAtom(fs.getRoot());
+ assertTrue(true); // not yet failed
+
+ new HSLFSlideShowImpl(fs).close();
+ }
}
@Test
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java Sun Dec 15 14:53:11 2019
@@ -366,12 +366,9 @@ public final class TestPictures {
expectImages(docA, 1);
HWPFDocument docB = HWPFTestDataSamples.writeOutAndReadBack(docA);
-
- OutputStream out = new FileOutputStream("/tmp/58804_1_out.doc");
- try {
+
+ try (OutputStream out = new FileOutputStream("/tmp/58804_1_out.doc")) {
docB.write(out);
- } finally {
- out.close();
}
expectImages(docB, 1);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java Sun Dec 15 14:53:11 2019
@@ -157,13 +157,12 @@ public final class TestFormulaParser {
public void testMacroFunction() throws IOException {
// testNames.xls contains a VB function called 'myFunc'
final String testFile = "testNames.xls";
- HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(testFile);
- try {
+ try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(testFile)) {
HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(wb);
//Expected ptg stack: [NamePtg(myFunc), StringPtg(arg), (additional operands go here...), FunctionPtg(myFunc)]
Ptg[] ptg = FormulaParser.parse("myFunc(\"arg\")", book, FormulaType.CELL, -1);
- assertEquals(3, ptg.length);
+ assertEquals(3, ptg.length);
// the name gets encoded as the first operand on the stack
NamePtg tname = (NamePtg) ptg[0];
@@ -192,8 +191,7 @@ public final class TestFormulaParser {
FormulaParser.parse("yourFunc(\"arg\")", book, FormulaType.CELL, -1);
// Verify that myFunc and yourFunc were successfully added to Workbook names
- HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb);
- try {
+ try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb)) {
// HSSFWorkbook/EXCEL97-specific side-effects user-defined function names must be added to Workbook's defined names in order to be saved.
assertNotNull(wb2.getName("myFunc"));
assertEqualsIgnoreCase("myFunc", wb2.getName("myFunc").getNameName());
@@ -210,11 +208,7 @@ public final class TestFormulaParser {
wb2.write(fos);
fos.close();
*/
- } finally {
- wb2.close();
}
- } finally {
- wb.close();
}
}
@@ -779,21 +773,18 @@ public final class TestFormulaParser {
}
assertEquals("test\"ing", sp.getValue());
- HSSFWorkbook wb = new HSSFWorkbook();
- try {
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet sheet = wb.createSheet();
wb.setSheetName(0, "Sheet1");
-
+
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
cell.setCellFormula("right(\"test\"\"ing\", 3)");
String actualCellFormula = cell.getCellFormula();
- if("RIGHT(\"test\"ing\",3)".equals(actualCellFormula)) {
+ if ("RIGHT(\"test\"ing\",3)".equals(actualCellFormula)) {
fail("Identified bug 28754b");
}
assertEquals("RIGHT(\"test\"\"ing\",3)", actualCellFormula);
- } finally {
- wb.close();
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java Sun Dec 15 14:53:11 2019
@@ -158,21 +158,15 @@ public final class TestLbsDataSubRecord
"00, " + //compression flag
"00"); //padding byte
- LittleEndianInputStream in = new LittleEndianInputStream(new ByteArrayInputStream(data));
- try {
+ try (LittleEndianInputStream in = new LittleEndianInputStream(new ByteArrayInputStream(data))) {
LbsDataSubRecord.LbsDropData lbs = new LbsDataSubRecord.LbsDropData(in);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- LittleEndianOutputStream out = new LittleEndianOutputStream(baos);
- try {
+ try (LittleEndianOutputStream out = new LittleEndianOutputStream(baos)) {
lbs.serialize(out);
-
+
assertArrayEquals(data, baos.toByteArray());
- } finally {
- out.close();
}
- } finally {
- in.close();
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java Sun Dec 15 14:53:11 2019
@@ -116,17 +116,11 @@ public class TestDataSource extends Test
}
private void writeDataToFile(File temp) throws IOException {
- OutputStream str = new FileOutputStream(temp);
- try {
- InputStream in = data.openResourceAsStream("Notes.ole2");
- try {
- IOUtils.copy(in, str);
- } finally {
- in.close();
- }
- } finally {
- str.close();
- }
+ try (OutputStream str = new FileOutputStream(temp)) {
+ try (InputStream in = data.openResourceAsStream("Notes.ole2")) {
+ IOUtils.copy(in, str);
+ }
+ }
}
private void checkDataSource(FileBackedDataSource ds, boolean writeable) throws IOException {
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java Sun Dec 15 14:53:11 2019
@@ -226,8 +226,7 @@ public class TestWorkbookEvaluator {
*/
@Test
public void testResultOutsideRange() throws IOException {
- Workbook wb = new HSSFWorkbook();
- try {
+ try (Workbook wb = new HSSFWorkbook()) {
Cell cell = wb.createSheet("Sheet1").createRow(0).createCell(0);
cell.setCellFormula("D2:D5"); // IF(TRUE,D2:D5,D2) or OFFSET(D2:D5,0,0) would work too
FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
@@ -249,8 +248,6 @@ public class TestWorkbookEvaluator {
cv = fe.evaluate(cell);
assertEquals(CellType.ERROR, cv.getCellType());
assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cv.getErrorValue());
- } finally {
- wb.close();
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java Sun Dec 15 14:53:11 2019
@@ -44,13 +44,10 @@ public final class TestFixed {
@Before
public void setUp() throws IOException {
- HSSFWorkbook wb = new HSSFWorkbook();
- try {
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
HSSFSheet sheet = wb.createSheet("new sheet");
cell11 = sheet.createRow(0).createCell(0);
evaluator = new HSSFFormulaEvaluator(wb);
- } finally {
- wb.close();
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java Sun Dec 15 14:53:11 2019
@@ -112,14 +112,11 @@ public abstract class BaseTestDataFormat
}
private void readbackFormat(String msg, String fmt) throws IOException {
- Workbook wb = _testDataProvider.createWorkbook();
- try {
+ try (Workbook wb = _testDataProvider.createWorkbook()) {
DataFormat dataFormat = wb.createDataFormat();
short fmtIdx = dataFormat.getFormat(fmt);
String readbackFmt = dataFormat.getFormat(fmtIdx);
assertEquals(msg, fmt, readbackFmt);
- } finally {
- wb.close();
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java?rev=1871590&r1=1871589&r2=1871590&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java Sun Dec 15 14:53:11 2019
@@ -76,30 +76,24 @@ public abstract class BaseTestPicture {
@Test
public void testResizeNoColumns() throws IOException {
- Workbook wb = _testDataProvider.createWorkbook();
- try {
+ try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet sheet = wb.createSheet();
-
+
Row row = sheet.createRow(0);
-
+
handleResize(wb, sheet, row);
- } finally {
- wb.close();
}
}
@Test
public void testResizeWithColumns() throws IOException {
- Workbook wb = _testDataProvider.createWorkbook();
- try {
+ try (Workbook wb = _testDataProvider.createWorkbook()) {
Sheet sheet = wb.createSheet();
-
+
Row row = sheet.createRow(0);
row.createCell(0);
-
+
handleResize(wb, sheet, row);
- } finally {
- wb.close();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org