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/09/23 19:03:07 UTC
svn commit: r1893576 - in /poi/trunk: ./ poi-examples/ poi-excelant/
poi-integration/ poi-ooxml/ poi-scratchpad/ poi/
poi/src/main/java/org/apache/poi/ss/formula/atp/
poi/src/test/java/org/apache/poi/ss/formula/atp/
Author: fanningpj
Date: Thu Sep 23 19:03:06 2021
New Revision: 1893576
URL: http://svn.apache.org/viewvc?rev=1893576&view=rev
Log:
tabs to spaces
Modified:
poi/trunk/build.gradle
poi/trunk/poi-examples/build.gradle
poi/trunk/poi-excelant/build.gradle
poi/trunk/poi-integration/build.gradle
poi/trunk/poi-ooxml/build.gradle
poi/trunk/poi-scratchpad/build.gradle
poi/trunk/poi/build.gradle
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Thu Sep 23 19:03:06 2021
@@ -93,7 +93,7 @@ wrapper.finalizedBy adjustWrapperPropert
*/
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 options see https://docs.gradle.org/current/javadoc/org/gradle/external/javadoc/StandardJavadocDocletOptions.html
- options.use = true
- options.splitIndex = true
+ // 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
options.addBooleanOption('Xdoclint:all,-missing', true)
- title = 'POI API Documentation'
- options.bottom = '<![CDATA[<i>Copyright ' + new Date().format('yyyy') + ' The Apache Software Foundation or its licensors, as applicable.</i>]]>'
+ title = 'POI API Documentation'
+ options.bottom = '<![CDATA[<i>Copyright ' + new Date().format('yyyy') + ' The Apache Software Foundation or its licensors, as applicable.</i>]]>'
- 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.*"
- ]
+ ]
/*
<exclude name="documentation/*.txt" />
Modified: poi/trunk/poi-examples/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-examples/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi-examples/build.gradle (original)
+++ poi/trunk/poi-examples/build.gradle Thu Sep 23 19:03:06 2021
@@ -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'
Modified: poi/trunk/poi-excelant/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Thu Sep 23 19:03:06 2021
@@ -18,7 +18,7 @@
import java.util.regex.Pattern
configurations {
- tests
+ tests
}
sourceSets {
Modified: poi/trunk/poi-integration/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-integration/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi-integration/build.gradle (original)
+++ poi/trunk/poi-integration/build.gradle Thu Sep 23 19:03:06 2021
@@ -23,7 +23,7 @@ final String VERSIONS9 = 'META-INF/versi
final boolean IBMVM = System.getProperty("java.vendor").contains("IBM")
configurations {
- tests
+ tests
misc
}
Modified: poi/trunk/poi-ooxml/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Thu Sep 23 19:03:06 2021
@@ -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'
- }
- }
-
- compileClasspath {
- 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'
+ }
+ }
- broken
- tests
+ compileClasspath {
+ exclude group: 'xalan', module: 'xalan'
+ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+ exclude group: 'xml-apis', module: 'xml-apis'
+ }
+ }
+
+ 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'
}
Modified: poi/trunk/poi-scratchpad/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/build.gradle (original)
+++ poi/trunk/poi-scratchpad/build.gradle Thu Sep 23 19:03:06 2021
@@ -136,11 +136,11 @@ task testJar(type: Jar, dependsOn: testC
}
javadoc {
- doFirst {
- options {
- classpath += configurations.javadocs.files
- }
- }
+ doFirst {
+ options {
+ classpath += configurations.javadocs.files
+ }
+ }
}
artifacts {
Modified: poi/trunk/poi/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Thu Sep 23 19:03:06 2021
@@ -167,11 +167,11 @@ task testJar(type: Jar, dependsOn: [ tes
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 {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/atp/TextJoinFunction.java Thu Sep 23 19:03:06 2021
@@ -56,7 +56,7 @@ final class TextJoinFunction implements
* 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
*/
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java?rev=1893576&r1=1893575&r2=1893576&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfna.java Thu Sep 23 19:03:06 2021
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org