From 32c43c068cbaaa6ed5fa25f701f7cc61c61d7d41 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 11 Jan 2019 19:31:05 +0000 Subject: [PATCH] IDE and JavaDoc fixes, move/remove some unfixed tests git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1851089 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/TestAllFiles.java | 6 +- .../poi/ddf/DefaultEscherRecordFactory.java | 6 +- .../poi/hssf/extractor/ExcelExtractor.java | 6 +- .../apache/poi/hssf/record/RecordFactory.java | 10 +-- .../apache/poi/hssf/record/SupBookRecord.java | 2 +- .../record/aggregates/SharedValueManager.java | 13 ++-- .../function/FunctionMetadataReader.java | 6 +- .../ss/formula/ptg/AbstractFunctionPtg.java | 7 +- .../poi/xddf/usermodel/chart/XDDFChart.java | 3 +- .../poi/xslf/usermodel/XSLFGraphicFrame.java | 4 +- .../poi/xssf/eventusermodel/XSSFReader.java | 4 +- .../apache/poi/xwpf/usermodel/XWPFRun.java | 4 +- .../poi/xssf/usermodel/TestUnfixedBugs.java | 46 +---------- .../poi/xssf/usermodel/TestXSSFBugs.java | 42 ++++++++++ .../org/apache/poi/hpsf/basic/TestBasic.java | 4 +- .../poi/hpsf/basic/TestEmptyProperties.java | 4 +- .../poi/hssf/usermodel/TestUnfixedBugs.java | 78 ++++--------------- .../ExcelFileFormatDocFunctionExtractor.java | 6 +- 18 files changed, 82 insertions(+), 169 deletions(-) diff --git a/src/integrationtest/org/apache/poi/TestAllFiles.java b/src/integrationtest/org/apache/poi/TestAllFiles.java index 33bd696195..6daf088ac3 100644 --- a/src/integrationtest/org/apache/poi/TestAllFiles.java +++ b/src/integrationtest/org/apache/poi/TestAllFiles.java @@ -474,15 +474,15 @@ public class TestAllFiles { public static class NullFileHandler implements FileHandler { @Override - public void handleFile(InputStream stream, String path) throws Exception { + public void handleFile(InputStream stream, String path) { } @Override - public void handleExtracting(File file) throws Exception { + public void handleExtracting(File file) { } @Override - public void handleAdditional(File file) throws Exception { + public void handleAdditional(File file) { } } } diff --git a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java index 954163cb60..a2a601ea1f 100644 --- a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java +++ b/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java @@ -117,11 +117,7 @@ public class DefaultEscherRecordFactory implements EscherRecordFactory { short sid; try { sid = recCls.getField("RECORD_ID").getShort(null); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (NoSuchFieldException e) { + } catch (IllegalArgumentException | NoSuchFieldException | IllegalAccessException e) { throw new RuntimeException(e); } Constructor constructor; diff --git a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java index 28ee51f32b..55c32fb4f5 100644 --- a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java +++ b/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java @@ -276,7 +276,7 @@ public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.p @Override public String getText() { - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); // We don't care about the difference between // null (missing) and blank cells @@ -374,7 +374,7 @@ public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.p // Replace any newlines with spaces, otherwise it // breaks the output String commentText = comment.getString().getString().replace('\n', ' '); - text.append(" Comment by "+comment.getAuthor()+": "+commentText); + text.append(" Comment by ").append(comment.getAuthor()).append(": ").append(commentText); } } @@ -398,7 +398,7 @@ public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.p } public static String _extractHeaderFooter(HeaderFooter hf) { - StringBuffer text = new StringBuffer(); + StringBuilder text = new StringBuilder(); if(hf.getLeft() != null) { text.append(hf.getLeft()); diff --git a/src/java/org/apache/poi/hssf/record/RecordFactory.java b/src/java/org/apache/poi/hssf/record/RecordFactory.java index 8b5c0224c1..4bc14d68d3 100644 --- a/src/java/org/apache/poi/hssf/record/RecordFactory.java +++ b/src/java/org/apache/poi/hssf/record/RecordFactory.java @@ -82,11 +82,7 @@ public final class RecordFactory { Object[] args = { in, }; try { return _c.newInstance(args); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException | InstantiationException e) { throw new RuntimeException(e); } catch (InvocationTargetException e) { Throwable t = e.getTargetException(); @@ -118,9 +114,7 @@ public final class RecordFactory { Object[] args = { in, }; try { return (Record) _m.invoke(null, args); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new RuntimeException(e); } catch (InvocationTargetException e) { throw new org.apache.poi.util.RecordFormatException("Unable to construct record instance" , e.getTargetException()); diff --git a/src/java/org/apache/poi/hssf/record/SupBookRecord.java b/src/java/org/apache/poi/hssf/record/SupBookRecord.java index bda7cca026..32046669a6 100644 --- a/src/java/org/apache/poi/hssf/record/SupBookRecord.java +++ b/src/java/org/apache/poi/hssf/record/SupBookRecord.java @@ -135,7 +135,7 @@ public final class SupBookRecord extends StandardRecord { if(isExternalReferences()) { sb.append("External References]\n"); - sb.append(" .url = ").append(field_2_encoded_url).append("\n"); + sb.append(" .url = ").append(getURL()).append("\n"); sb.append(" .nSheets = ").append(field_1_number_of_sheets).append("\n"); for (String sheetname : field_3_sheet_names) { sb.append(" .name = ").append(sheetname).append("\n"); diff --git a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java index ff12e1df8c..03de03ebbd 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java @@ -18,6 +18,7 @@ package org.apache.poi.hssf.record.aggregates; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -92,11 +93,9 @@ public final class SharedValueManager { } public final String toString() { - StringBuffer sb = new StringBuffer(64); - sb.append(getClass().getName()).append(" ["); - sb.append(_sfr.getRange()); - sb.append("]"); - return sb.toString(); + return getClass().getName() + " [" + + _sfr.getRange() + + "]"; } } @@ -135,9 +134,7 @@ public final class SharedValueManager { */ private static List toList(Z[] zz) { List result = new ArrayList<>(zz.length); - for (int i = 0; i < zz.length; i++) { - result.add(zz[i]); - } + Collections.addAll(result, zz); return result; } diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java b/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java index feea7d7b45..dc6a8c0255 100644 --- a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java +++ b/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java @@ -21,7 +21,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashSet; @@ -146,9 +145,8 @@ final class FunctionMetadataReader { private static boolean isDash(String codes) { if(codes.length() == 1) { - switch (codes.charAt(0)) { - case '-': - return true; + if (codes.charAt(0) == '-') { + return true; } } return false; diff --git a/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java b/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java index 8888687157..28b5e7d9e5 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java @@ -59,12 +59,7 @@ public abstract class AbstractFunctionPtg extends OperationPtg { } public final String toString() { - StringBuilder sb = new StringBuilder(64); - sb.append(getClass().getName()).append(" ["); - sb.append(lookupName(_functionIndex)); - sb.append(" nArgs=").append(_numberOfArgs); - sb.append("]"); - return sb.toString(); + return getClass().getName() + " [" + lookupName(_functionIndex) + " nArgs=" + _numberOfArgs + "]"; } public final short getFunctionIndex() { diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java index 4267898309..e1a7b2e9d3 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java @@ -799,8 +799,7 @@ public abstract class XDDFChart extends POIXMLDocumentPart implements TextContai XSSFSheet sheet = null; try { sheet = getWorkbook().getSheetAt(0); - } catch (InvalidFormatException ife) { - } catch (IOException ioe) { + } catch (InvalidFormatException | IOException ife) { } return sheet; } diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java index b3283ff110..8b9d152848 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java @@ -192,9 +192,7 @@ public class XSLFGraphicFrame extends XSLFShape implements GraphicalFrame