From 235f3e059c95c405f99a9a9bdb9aa19ebeebbbf9 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Wed, 26 Dec 2018 13:27:50 +0000 Subject: [PATCH] Remove unnecesssary semicolons git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1849761 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/sl/usermodel/PlaceholderDetails.java | 2 +- src/java/org/apache/poi/ss/formula/functions/Trend.java | 2 +- .../internal/marshallers/PackagePropertiesMarshaller.java | 4 ++-- .../org/apache/poi/xddf/usermodel/chart/ChartTypes.java | 2 +- .../org/apache/poi/xddf/usermodel/chart/LayoutMode.java | 2 +- .../org/apache/poi/xddf/usermodel/chart/LayoutTarget.java | 2 +- .../org/apache/poi/xddf/usermodel/chart/XDDFChartData.java | 2 +- .../org/apache/poi/xddf/usermodel/text/XDDFSpacing.java | 2 +- .../apache/poi/xddf/usermodel/text/XDDFTextParagraph.java | 1 - .../org/apache/poi/xslf/usermodel/XSLFPictureShape.java | 2 +- .../poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java | 2 +- src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java | 2 +- .../org/apache/poi/openxml4j/opc/ZipFileAssert.java | 2 +- src/ooxml/testcases/org/apache/poi/sl/TestOleShape.java | 6 +++--- .../org/apache/poi/xssf/usermodel/TestUnfixedBugs.java | 2 +- .../org/apache/poi/xssf/usermodel/TestXSSFTable.java | 2 +- 16 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java b/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java index 377b5c5b76..7c4418f164 100644 --- a/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java +++ b/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java @@ -25,7 +25,7 @@ package org.apache.poi.sl.usermodel; */ public interface PlaceholderDetails { enum PlaceholderSize { - quarter, half, full; + quarter, half, full } Placeholder getPlaceholder(); diff --git a/src/java/org/apache/poi/ss/formula/functions/Trend.java b/src/java/org/apache/poi/ss/formula/functions/Trend.java index 155c1a57a5..ec10277d7e 100644 --- a/src/java/org/apache/poi/ss/formula/functions/Trend.java +++ b/src/java/org/apache/poi/ss/formula/functions/Trend.java @@ -207,7 +207,7 @@ public final class Trend implements Function { allEquals = false; break; } - }; + } return allEquals; } diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java index 6daffae21c..4e858067fe 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java @@ -37,11 +37,11 @@ public class PackagePropertiesMarshaller implements PartMarshaller { private final static NamespaceImpl namespaceDC = new NamespaceImpl("dc", PackagePropertiesPart.NAMESPACE_DC_URI); private final static NamespaceImpl namespaceCoreProperties = - new NamespaceImpl("cp", PackagePropertiesPart.NAMESPACE_CP_URI);; + new NamespaceImpl("cp", PackagePropertiesPart.NAMESPACE_CP_URI); private final static NamespaceImpl namespaceDcTerms = new NamespaceImpl("dcterms", PackagePropertiesPart.NAMESPACE_DCTERMS_URI); private final static NamespaceImpl namespaceXSI = - new NamespaceImpl("xsi", XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);; + new NamespaceImpl("xsi", XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI); protected static final String KEYWORD_CATEGORY = "category"; diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java index 9dbec09aaa..7ecaab0699 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java @@ -21,5 +21,5 @@ public enum ChartTypes { LINE, PIE, RADAR, - SCATTER; + SCATTER } diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java index 398d71b3c8..31ad6e7a49 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java @@ -19,7 +19,7 @@ package org.apache.poi.xddf.usermodel.chart; import java.util.HashMap; -import org.openxmlformats.schemas.drawingml.x2006.chart.STLayoutMode;; +import org.openxmlformats.schemas.drawingml.x2006.chart.STLayoutMode; public enum LayoutMode { EDGE(STLayoutMode.EDGE), diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java index b4ba3513c0..9ef337e417 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java @@ -19,7 +19,7 @@ package org.apache.poi.xddf.usermodel.chart; import java.util.HashMap; -import org.openxmlformats.schemas.drawingml.x2006.chart.STLayoutTarget;; +import org.openxmlformats.schemas.drawingml.x2006.chart.STLayoutTarget; public enum LayoutTarget { INNER(STLayoutTarget.INNER), diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java index 8c3f6a7559..e23b51a46c 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java @@ -132,7 +132,7 @@ public abstract class XDDFChartData { } if (cache.sizeOfPtArray() < 1) { cache.addNewPtCount().setVal(1); - cache.addNewPt().setIdx(0);; + cache.addNewPt().setIdx(0); } cache.getPtArray(0).setV(title); ref.setF(titleRef.formatAsString()); diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java index 56970386c2..39da4a4c36 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java @@ -25,7 +25,7 @@ import org.openxmlformats.schemas.drawingml.x2006.main.CTTextSpacing; public abstract class XDDFSpacing { public static enum Kind { PERCENT, - POINTS; + POINTS } protected CTTextSpacing spacing; diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java index fffa2da81a..0b595241f5 100644 --- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java +++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java @@ -242,7 +242,6 @@ public class XDDFTextParagraph { public void setIndentation(Double points) { if (points != null || _p.isSetPPr()) { getOrCreateProperties().setIndentation(points); - ; } } diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java index 07b2f01726..9c4e23f060 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java @@ -238,7 +238,7 @@ public class XSLFPictureShape extends XSLFSimpleShape cur.dispose(); } - final int svgId = getExt(extLst, SVG_URI);; + final int svgId = getExt(extLst, SVG_URI); if (svgId != -1) { extLst.removeExt(svgId); } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java index 7756abdf86..e053c7eea7 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSeries.java @@ -22,7 +22,7 @@ import org.apache.poi.ss.usermodel.charts.TitleType; import org.apache.poi.ss.util.CellReference; import org.apache.poi.util.Removal; import org.openxmlformats.schemas.drawingml.x2006.chart.CTSerTx; -import org.apache.poi.xddf.usermodel.chart.XDDFChartData.Series;; +import org.apache.poi.xddf.usermodel.chart.XDDFChartData.Series; /** * Base of all XSSF Chart Series diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java index 9352fe8a1d..df607fd517 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java @@ -65,7 +65,7 @@ public class XWPFTable implements IBodyElement, ISDTContents { THIN_THICK_MEDIUM_GAP, THICK_THIN_MEDIUM_GAP, THIN_THICK_THIN_MEDIUM_GAP, THIN_THICK_LARGE_GAP, THICK_THIN_LARGE_GAP, THIN_THICK_THIN_LARGE_GAP, WAVE, DOUBLE_WAVE, DASH_SMALL_GAP, DASH_DOT_STROKED, THREE_D_EMBOSS, THREE_D_ENGRAVE, - OUTSET, INSET; + OUTSET, INSET } private enum Border { INSIDE_V, INSIDE_H, LEFT, TOP, BOTTOM, RIGHT } diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java index 05325791ff..56f4a9baec 100644 --- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java +++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java @@ -99,7 +99,7 @@ public final class ZipFileAssert { BufferedInputStream buffi = new BufferedInputStream(file_decompress); /* Open the file with the buffer */ - ZipArchiveInputStream zis = new ZipArchiveInputStream(buffi); + ZipArchiveInputStream zis = new ZipArchiveInputStream(buffi) ) { /* Processing entries of the zip file */ diff --git a/src/ooxml/testcases/org/apache/poi/sl/TestOleShape.java b/src/ooxml/testcases/org/apache/poi/sl/TestOleShape.java index 00614e2102..44f901d5e0 100644 --- a/src/ooxml/testcases/org/apache/poi/sl/TestOleShape.java +++ b/src/ooxml/testcases/org/apache/poi/sl/TestOleShape.java @@ -95,9 +95,9 @@ public class TestOleShape { "jHkKLEAUFMA+04XC1EzX6UdMAALxcERgK444+wB0Go1CA3jANCNRGdj1UoyIZhlpPsMobf48GmkeI1Pp8xi" + "Nsm0eo9O3/mAoAvIFEKIQ58wPgrAtK+oJwyjAmL0+bBEPBugzGsUoiKAKhSQGmYjD4y3trXD/AmBc9IeqBwAA"; - enum Api { HSLF, XSLF }; - - + enum Api { HSLF, XSLF } + + @Parameter(value = 0) public Api api; @Parameter(value = 1) diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java index bc058c8f20..45b130578a 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java @@ -343,7 +343,7 @@ public final class TestUnfixedBugs { @Test public void bug57423_shiftRowsByLargeOffset() throws IOException { try ( - XSSFWorkbook wb = new XSSFWorkbook(); + XSSFWorkbook wb = new XSSFWorkbook() //OutputStream out = new FileOutputStream("/tmp/57423." + wb.getClass().getName() + ".xlsx")); ) { Sheet sh = wb.createSheet(); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java index b004319426..5a949d6caf 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java @@ -451,7 +451,7 @@ public final class TestXSSFTable { @Test(expected = IllegalArgumentException.class) public void testCreateColumnInvalidIndex() throws IOException { - try (XSSFWorkbook wb = new XSSFWorkbook();) { + try (XSSFWorkbook wb = new XSSFWorkbook()) { XSSFSheet sh = wb.createSheet(); AreaReference tableArea = new AreaReference("D2:D3", wb.getSpreadsheetVersion()); XSSFTable table = sh.createTable(tableArea); -- 2.39.5