From 4fbadb0cfd0deaa6dc331853eb755b6e8f557098 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 23 Sep 2021 19:03:06 +0000 Subject: [PATCH] tabs to spaces git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1893576 13f79535-47bb-0310-9956-ffa450edef68 --- build.gradle | 88 +++++++++---------- poi-examples/build.gradle | 4 +- poi-excelant/build.gradle | 2 +- poi-integration/build.gradle | 2 +- poi-ooxml/build.gradle | 32 +++---- poi-scratchpad/build.gradle | 10 +-- poi/build.gradle | 10 +-- .../poi/ss/formula/atp/TextJoinFunction.java | 2 +- .../apache/poi/ss/formula/atp/TestIfna.java | 10 +-- 9 files changed, 80 insertions(+), 80 deletions(-) diff --git a/build.gradle b/build.gradle index 798cea7e1f..246bea995f 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ wrapper.finalizedBy adjustWrapperPropertiesFile */ allprojects { // apply plugin: 'eclipse' - apply plugin: 'idea' + apply plugin: 'idea' } /** @@ -122,11 +122,11 @@ subprojects { xmlbeansVersion = '5.0.1' batikVersion = '1.14' - JAVA9_SRC = 'src/main/java9' - JAVA9_OUT = "${buildDir}/classes/java9/main/" - TEST9_SRC = 'src/test/java9' - TEST9_OUT = "${buildDir}/classes/java9/test/" - VERSIONS9 = 'META-INF/versions/9' + JAVA9_SRC = 'src/main/java9' + JAVA9_OUT = "${buildDir}/classes/java9/main/" + TEST9_SRC = 'src/test/java9' + TEST9_OUT = "${buildDir}/classes/java9/test/" + VERSIONS9 = 'META-INF/versions/9' NO_SCRATCHPAD = (findProperty("scratchpad.ignore") == "true") } @@ -335,11 +335,11 @@ subprojects { // the plugin seems to not detect our non-standard build-layout property "sonar.junit.reportPaths", "$projectDir/build/test-results/test" - // the Gradle run will report an invalid directory for 'ooxml-schema', but it seems to still work fine - property "sonar.coverage.jacoco.xmlReportPaths", "$projectDir/build/reports/jacoco/test/jacocoTestReport.xml" + // the Gradle run will report an invalid directory for 'ooxml-schema', but it seems to still work fine + property "sonar.coverage.jacoco.xmlReportPaths", "$projectDir/build/reports/jacoco/test/jacocoTestReport.xml" - // somehow the version was not use properly - property "sonar.projectVersion", version + // somehow the version was not use properly + property "sonar.projectVersion", version } } } @@ -461,40 +461,40 @@ subprojects { // initial try to provide a combined JavaDoc, grouping is still missing here, though! task allJavaDoc(type: Javadoc) { var prj = [ project(':poi'), project(':poi-excelant'), project(':poi-ooxml'), project(':poi-scratchpad') ] - source prj.collect { it.sourceSets.main.allJava } + source prj.collect { it.sourceSets.main.allJava } - // for possible settings see https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html - classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath }) - destinationDir = file("${buildDir}/docs/javadoc") - maxMemory="2048M" + // for possible settings see https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html + classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath }) + destinationDir = file("${buildDir}/docs/javadoc") + maxMemory="2048M" - // for possible options see https://docs.gradle.org/current/javadoc/org/gradle/external/javadoc/StandardJavadocDocletOptions.html - options.use = true - options.splitIndex = true + // for possible options see https://docs.gradle.org/current/javadoc/org/gradle/external/javadoc/StandardJavadocDocletOptions.html + options.use = true + options.splitIndex = true options.addBooleanOption('Xdoclint:all,-missing', true) - title = 'POI API Documentation' - options.bottom = 'Copyright ' + new Date().format('yyyy') + ' The Apache Software Foundation or its licensors, as applicable.]]>' + title = 'POI API Documentation' + options.bottom = 'Copyright ' + new Date().format('yyyy') + ' The Apache Software Foundation or its licensors, as applicable.]]>' - options.group('DDF - Dreadful Drawing Format', 'org.apache.poi.ddf*') - options.group('HPSF - Horrible Property Set Format', 'org.apache.poi.hpsf*') - options.group('SS - Common Spreadsheet Format', 'org.apache.poi.ss*') - options.group('HSSF - Horrible Spreadsheet Format', 'org.apache.poi.hssf*') - options.group('XSSF - Open Office XML Spreadsheet Format', 'org.apache.poi.xssf*') - options.group('SL - Common Slideshow Format', 'org.apache.poi.sl*') - options.group('HSLF - Horrible Slideshow Format', 'org.apache.poi.hslf*', 'org.apache.poi.hwmf*', 'org.apache.poi.hemf*') - options.group('XSLF - Open Office XML Slideshow Format', 'org.apache.poi.xslf*') - options.group('HWPF - Horrible Word Processor Format', 'org.apache.poi.hwpf*') - options.group('XWPF - Open Office XML Word Processor Format', 'org.apache.poi.xwpf*') - options.group('HDGF - Horrible Diagram Format', 'org.apache.poi.hdgf*') - options.group('XDGF - Open Office XML Diagram Format', 'org.apache.poi.xdgf*') - options.group('HMEF - Transport Neutral Encoding Files (TNEF)', 'org.apache.poi.hmef*') - options.group('HSMF Outlook message file format', 'org.apache.poi.hsmf*') - options.group('HPBF - Publisher Format Files', 'org.apache.poi.hpbf*') - options.group('POIFS - POI File System', 'org.apache.poi.poifs*') - options.group('Utilities', 'org.apache.poi.util*') - options.group('Excelant', 'org.apache.poi.ss.excelant**') -// options.group('Examples', 'org.apache.poi.examples*') + options.group('DDF - Dreadful Drawing Format', 'org.apache.poi.ddf*') + options.group('HPSF - Horrible Property Set Format', 'org.apache.poi.hpsf*') + options.group('SS - Common Spreadsheet Format', 'org.apache.poi.ss*') + options.group('HSSF - Horrible Spreadsheet Format', 'org.apache.poi.hssf*') + options.group('XSSF - Open Office XML Spreadsheet Format', 'org.apache.poi.xssf*') + options.group('SL - Common Slideshow Format', 'org.apache.poi.sl*') + options.group('HSLF - Horrible Slideshow Format', 'org.apache.poi.hslf*', 'org.apache.poi.hwmf*', 'org.apache.poi.hemf*') + options.group('XSLF - Open Office XML Slideshow Format', 'org.apache.poi.xslf*') + options.group('HWPF - Horrible Word Processor Format', 'org.apache.poi.hwpf*') + options.group('XWPF - Open Office XML Word Processor Format', 'org.apache.poi.xwpf*') + options.group('HDGF - Horrible Diagram Format', 'org.apache.poi.hdgf*') + options.group('XDGF - Open Office XML Diagram Format', 'org.apache.poi.xdgf*') + options.group('HMEF - Transport Neutral Encoding Files (TNEF)', 'org.apache.poi.hmef*') + options.group('HSMF Outlook message file format', 'org.apache.poi.hsmf*') + options.group('HPBF - Publisher Format Files', 'org.apache.poi.hpbf*') + options.group('POIFS - POI File System', 'org.apache.poi.poifs*') + options.group('Utilities', 'org.apache.poi.util*') + options.group('Excelant', 'org.apache.poi.ss.excelant**') +// options.group('Examples', 'org.apache.poi.examples*') } @@ -509,7 +509,7 @@ rat { inputDir.set(file(".")) // include all directories which contain files that are included in releases - includes = [ + includes = [ "poi-examples/**", "poi-excelant/**", "poi-integration/**", @@ -525,12 +525,12 @@ rat { "src/**", // "sonar/**", "build.*" - ] + ] // List of Gradle exclude directives, defaults to ['**/.gradle/**'] //excludes.add("main/java/org/apache/poi/**/*-chart-data.txt") excludes = [ - "build.javacheck.xml", + "build.javacheck.xml", "**/build/**", "**/out/**", "**/*.iml", @@ -543,10 +543,10 @@ rat { "poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdES*.xsd", "poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd", "poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd", - "osgi/README.md", + "osgi/README.md", // ignore svn conflict artifacts "**/module-info.*" - ] + ] /* diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle index 4a2a73cb68..b49b11dc9d 100644 --- a/poi-examples/build.gradle +++ b/poi-examples/build.gradle @@ -40,12 +40,12 @@ dependencies { implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}" - testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) { + testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) { if (NO_SCRATCHPAD) { exclude group: 'org.apache.poi', module: 'poi-scratchpad' } } - testImplementation project(path: ':poi', configuration: 'tests') + testImplementation project(path: ':poi', configuration: 'tests') } final String MODULE_NAME = 'org.apache.poi.examples' diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index 2876eb965c..5c705d2e8e 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -18,7 +18,7 @@ import java.util.regex.Pattern configurations { - tests + tests } sourceSets { diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index 7093336061..49cb59784b 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -23,7 +23,7 @@ final String VERSIONS9 = 'META-INF/versions/9' final boolean IBMVM = System.getProperty("java.vendor").contains("IBM") configurations { - tests + tests misc } diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 45c16f38d5..81dd5f65d2 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -18,22 +18,22 @@ import java.util.regex.Pattern configurations { - runtimeClasspath { - exclude group: 'xalan', module: 'xalan' - if (JavaVersion.current() != JavaVersion.VERSION_1_8) { - exclude group: 'xml-apis', module: 'xml-apis' - } - } + runtimeClasspath { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } - compileClasspath { - exclude group: 'xalan', module: 'xalan' - if (JavaVersion.current() != JavaVersion.VERSION_1_8) { - exclude group: 'xml-apis', module: 'xml-apis' - } - } + compileClasspath { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } - broken - tests + broken + tests javadocs } @@ -97,7 +97,7 @@ dependencies { } } renderImplementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { - exclude group: 'xalan', module: 'xalan' + exclude group: 'xalan', module: 'xalan' if (JavaVersion.current() != JavaVersion.VERSION_1_8) { exclude group: 'xml-apis', module: 'xml-apis' } @@ -118,7 +118,7 @@ dependencies { } } rendersignImplementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { - exclude group: 'xalan', module: 'xalan' + exclude group: 'xalan', module: 'xalan' if (JavaVersion.current() != JavaVersion.VERSION_1_8) { exclude group: 'xml-apis', module: 'xml-apis' } diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle index 078bb7e5bc..4360c505e1 100644 --- a/poi-scratchpad/build.gradle +++ b/poi-scratchpad/build.gradle @@ -136,11 +136,11 @@ task testJar(type: Jar, dependsOn: testClasses) { } javadoc { - doFirst { - options { - classpath += configurations.javadocs.files - } - } + doFirst { + options { + classpath += configurations.javadocs.files + } + } } artifacts { diff --git a/poi/build.gradle b/poi/build.gradle index da8eeb9ff1..96cf549b2f 100644 --- a/poi/build.gradle +++ b/poi/build.gradle @@ -167,11 +167,11 @@ task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ]) { javadoc { dependsOn configurations.javadocs.dependencies.collect{ ':' + it.dependencyProject.name + ':compileJava' } - doFirst { - options { - classpath += files(configurations.javadocs.dependencies.collect{ it.dependencyProject.sourceSets.main.output.classesDirs }) - } - } + doFirst { + options { + classpath += files(configurations.javadocs.dependencies.collect{ it.dependencyProject.sourceSets.main.output.classesDirs }) + } + } } artifacts { diff --git a/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java index 5e3232834c..14a17854f3 100644 --- a/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java +++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java @@ -56,7 +56,7 @@ final class TextJoinFunction implements FreeRefFunction { * Must be at least three arguments: * - delimiter Delimiter for joining text arguments * - ignoreEmpty If true, empty strings will be ignored in the join - * - text1 First value to be evaluated as text and joined + * - text1 First value to be evaluated as text and joined * - text2, etc. Optional additional values to be evaluated and joined */ diff --git a/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java index a57f197b37..87567743e4 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java +++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java @@ -33,17 +33,17 @@ import org.junit.jupiter.api.BeforeEach; * IfNa unit tests. */ class TestIfna { - + HSSFWorkbook wb; HSSFCell cell; HSSFFormulaEvaluator fe; - @BeforeEach - void setup() { + @BeforeEach + void setup() { wb = new HSSFWorkbook(); cell = wb.createSheet().createRow(0).createCell(0); fe = new HSSFFormulaEvaluator(wb); - } + } @Test void testNumbericArgsWorkCorrectly() { @@ -54,7 +54,7 @@ class TestIfna { @Test void testStringArgsWorkCorrectly() { confirmResult(fe, cell, "IFNA(\"a1\",\"a2\")", new CellValue("a1")); - confirmResult(fe, cell, "IFNA(NA(),\"a2\")", new CellValue("a2")); + confirmResult(fe, cell, "IFNA(NA(),\"a2\")", new CellValue("a2")); } @Test