This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch spotless-take2-base in repository https://gitbox.apache.org/repos/asf/tika.git
commit 33a0fe947e74dc0f88f1bbcffd7873dcf9178078 Author: tallison <[email protected]> AuthorDate: Thu Nov 20 12:12:37 2025 -0500 fix line_width, maybe --- tika-parent/google-style-eclipse.xml | 2 + tika-parent/intellij-code-style.xml | 75 ------------------------------------ 2 files changed, 2 insertions(+), 75 deletions(-) diff --git a/tika-parent/google-style-eclipse.xml b/tika-parent/google-style-eclipse.xml index 688ecdae4..49ff188d2 100644 --- a/tika-parent/google-style-eclipse.xml +++ b/tika-parent/google-style-eclipse.xml @@ -192,6 +192,8 @@ <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/> <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/> + <setting id="org.eclipse.jdt.core.formatter.line_width" value="180"/> + <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/> <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/> diff --git a/tika-parent/intellij-code-style.xml b/tika-parent/intellij-code-style.xml deleted file mode 100644 index 1026b7256..000000000 --- a/tika-parent/intellij-code-style.xml +++ /dev/null @@ -1,75 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<code_scheme name="tika" version="173"> - <JavaCodeStyleSettings> - <option name="ANNOTATION_PARAMETER_WRAP" value="1" /> - <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100000" /> - <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10000" /> - <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND"> - <value /> - </option> - <option name="IMPORT_LAYOUT_TABLE"> - <value> - <package name="" withSubpackages="true" static="true" /> - <emptyLine /> - <package name="java" withSubpackages="true" static="false" /> - <package name="javax" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="org.apache.tika" withSubpackages="true" static="false" /> - </value> - </option> - </JavaCodeStyleSettings> - <editorconfig> - <option name="ENABLED" value="false" /> - </editorconfig> - <codeStyleSettings language="JAVA"> - <option name="RIGHT_MARGIN" value="180" /> - <option name="KEEP_LINE_BREAKS" value="false" /> - <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" /> - <option name="CALL_PARAMETERS_WRAP" value="1" /> - <option name="METHOD_PARAMETERS_WRAP" value="1" /> - <option name="RESOURCE_LIST_WRAP" value="1" /> - <option name="EXTENDS_LIST_WRAP" value="1" /> - <option name="THROWS_LIST_WRAP" value="1" /> - <option name="EXTENDS_KEYWORD_WRAP" value="1" /> - <option name="THROWS_KEYWORD_WRAP" value="1" /> - <option name="METHOD_CALL_CHAIN_WRAP" value="2" /> - <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" /> - <option name="BINARY_OPERATION_WRAP" value="1" /> - <option name="TERNARY_OPERATION_WRAP" value="1" /> - <option name="FOR_STATEMENT_WRAP" value="1" /> - <option name="ARRAY_INITIALIZER_WRAP" value="1" /> - <option name="ASSIGNMENT_WRAP" value="1" /> - <option name="ASSERT_STATEMENT_WRAP" value="1" /> - <option name="IF_BRACE_FORCE" value="3" /> - <option name="PARAMETER_ANNOTATION_WRAP" value="1" /> - <option name="VARIABLE_ANNOTATION_WRAP" value="1" /> - <option name="ENUM_CONSTANTS_WRAP" value="1" /> - <option name="WRAP_ON_TYPING" value="1" /> - </codeStyleSettings> - <codeStyleSettings language="XML"> - <indentOptions> - <option name="INDENT_SIZE" value="2" /> - <option name="CONTINUATION_INDENT_SIZE" value="4" /> - <option name="TAB_SIZE" value="2" /> - </indentOptions> - </codeStyleSettings> -</code_scheme> \ No newline at end of file
