You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2017/06/19 22:17:51 UTC
[07/29] geode git commit: Resolve Eclipse/IntelliJ import order
disagreement in style files.
Resolve Eclipse/IntelliJ import order disagreement in style files.
The style files contained in `etc/` are not consistent between IDEs.
This commit modifies `etc/intellij-java-google-style.xml` to adhere to the import order specified in `etc/eclipseOrganizeImports.importorder`.
This seems a significant enough deviation from the original Google style guide to warrant a name change in the XML.
this closes #569
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c2747ae7
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c2747ae7
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c2747ae7
Branch: refs/heads/feature/GEODE-2804
Commit: c2747ae700613a2429457faf45ab520f9f40253b
Parents: c3756ff
Author: Patrick Rhomberg <pr...@pivotal.io>
Authored: Thu Jun 8 11:48:47 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 13:47:55 2017 -0700
----------------------------------------------------------------------
etc/intellij-java-google-style.xml | 365 -----------------------
etc/intellij-java-modified-google-style.xml | 255 ++++++++++++++++
gradle/rat.gradle | 2 +-
3 files changed, 256 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c2747ae7/etc/intellij-java-google-style.xml
----------------------------------------------------------------------
diff --git a/etc/intellij-java-google-style.xml b/etc/intellij-java-google-style.xml
deleted file mode 100644
index 22d9c23..0000000
--- a/etc/intellij-java-google-style.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<code_scheme name="GoogleStyle">
- <option name="JAVA_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="OTHER_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="LINE_SEPARATOR" value="
" />
- <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
- <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
- <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="com.google" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="android" withSubpackages="true" static="false" />
- <package name="antenna" withSubpackages="true" static="false" />
- <package name="antlr" withSubpackages="true" static="false" />
- <package name="ar" withSubpackages="true" static="false" />
- <package name="asposewobfuscated" withSubpackages="true" static="false" />
- <package name="asquare" withSubpackages="true" static="false" />
- <package name="atg" withSubpackages="true" static="false" />
- <package name="au" withSubpackages="true" static="false" />
- <package name="beaver" withSubpackages="true" static="false" />
- <package name="bibtex" withSubpackages="true" static="false" />
- <package name="bmsi" withSubpackages="true" static="false" />
- <package name="bsh" withSubpackages="true" static="false" />
- <package name="ccl" withSubpackages="true" static="false" />
- <package name="cern" withSubpackages="true" static="false" />
- <package name="ChartDirector" withSubpackages="true" static="false" />
- <package name="checkers" withSubpackages="true" static="false" />
- <package name="com" withSubpackages="true" static="false" />
- <package name="COM" withSubpackages="true" static="false" />
- <package name="common" withSubpackages="true" static="false" />
- <package name="contribs" withSubpackages="true" static="false" />
- <package name="corejava" withSubpackages="true" static="false" />
- <package name="cryptix" withSubpackages="true" static="false" />
- <package name="cybervillains" withSubpackages="true" static="false" />
- <package name="dalvik" withSubpackages="true" static="false" />
- <package name="danbikel" withSubpackages="true" static="false" />
- <package name="de" withSubpackages="true" static="false" />
- <package name="EDU" withSubpackages="true" static="false" />
- <package name="eg" withSubpackages="true" static="false" />
- <package name="eu" withSubpackages="true" static="false" />
- <package name="examples" withSubpackages="true" static="false" />
- <package name="fat" withSubpackages="true" static="false" />
- <package name="fit" withSubpackages="true" static="false" />
- <package name="fitlibrary" withSubpackages="true" static="false" />
- <package name="fmpp" withSubpackages="true" static="false" />
- <package name="freemarker" withSubpackages="true" static="false" />
- <package name="gnu" withSubpackages="true" static="false" />
- <package name="groovy" withSubpackages="true" static="false" />
- <package name="groovyjarjarantlr" withSubpackages="true" static="false" />
- <package name="groovyjarjarasm" withSubpackages="true" static="false" />
- <package name="hak" withSubpackages="true" static="false" />
- <package name="hep" withSubpackages="true" static="false" />
- <package name="ie" withSubpackages="true" static="false" />
- <package name="io" withSubpackages="true" static="false" />
- <package name="imageinfo" withSubpackages="true" static="false" />
- <package name="info" withSubpackages="true" static="false" />
- <package name="it" withSubpackages="true" static="false" />
- <package name="jal" withSubpackages="true" static="false" />
- <package name="Jama" withSubpackages="true" static="false" />
- <package name="japa" withSubpackages="true" static="false" />
- <package name="japacheckers" withSubpackages="true" static="false" />
- <package name="jas" withSubpackages="true" static="false" />
- <package name="jasmin" withSubpackages="true" static="false" />
- <package name="javancss" withSubpackages="true" static="false" />
- <package name="javanet" withSubpackages="true" static="false" />
- <package name="javassist" withSubpackages="true" static="false" />
- <package name="javazoom" withSubpackages="true" static="false" />
- <package name="java_cup" withSubpackages="true" static="false" />
- <package name="jcifs" withSubpackages="true" static="false" />
- <package name="jetty" withSubpackages="true" static="false" />
- <package name="JFlex" withSubpackages="true" static="false" />
- <package name="jj2000" withSubpackages="true" static="false" />
- <package name="jline" withSubpackages="true" static="false" />
- <package name="jp" withSubpackages="true" static="false" />
- <package name="JSci" withSubpackages="true" static="false" />
- <package name="jsr166y" withSubpackages="true" static="false" />
- <package name="junit" withSubpackages="true" static="false" />
- <package name="jxl" withSubpackages="true" static="false" />
- <package name="jxxload_help" withSubpackages="true" static="false" />
- <package name="kawa" withSubpackages="true" static="false" />
- <package name="kea" withSubpackages="true" static="false" />
- <package name="libcore" withSubpackages="true" static="false" />
- <package name="libsvm" withSubpackages="true" static="false" />
- <package name="lti" withSubpackages="true" static="false" />
- <package name="memetic" withSubpackages="true" static="false" />
- <package name="mt" withSubpackages="true" static="false" />
- <package name="mx4j" withSubpackages="true" static="false" />
- <package name="net" withSubpackages="true" static="false" />
- <package name="netscape" withSubpackages="true" static="false" />
- <package name="nl" withSubpackages="true" static="false" />
- <package name="nu" withSubpackages="true" static="false" />
- <package name="oauth" withSubpackages="true" static="false" />
- <package name="ognl" withSubpackages="true" static="false" />
- <package name="opennlp" withSubpackages="true" static="false" />
- <package name="oracle" withSubpackages="true" static="false" />
- <package name="org" withSubpackages="true" static="false" />
- <package name="penn2dg" withSubpackages="true" static="false" />
- <package name="pennconverter" withSubpackages="true" static="false" />
- <package name="pl" withSubpackages="true" static="false" />
- <package name="prefuse" withSubpackages="true" static="false" />
- <package name="proguard" withSubpackages="true" static="false" />
- <package name="repackage" withSubpackages="true" static="false" />
- <package name="scm" withSubpackages="true" static="false" />
- <package name="se" withSubpackages="true" static="false" />
- <package name="serp" withSubpackages="true" static="false" />
- <package name="simple" withSubpackages="true" static="false" />
- <package name="soot" withSubpackages="true" static="false" />
- <package name="sqlj" withSubpackages="true" static="false" />
- <package name="src" withSubpackages="true" static="false" />
- <package name="ssa" withSubpackages="true" static="false" />
- <package name="sun" withSubpackages="true" static="false" />
- <package name="sunlabs" withSubpackages="true" static="false" />
- <package name="tcl" withSubpackages="true" static="false" />
- <package name="testdata" withSubpackages="true" static="false" />
- <package name="testshell" withSubpackages="true" static="false" />
- <package name="testsuite" withSubpackages="true" static="false" />
- <package name="twitter4j" withSubpackages="true" static="false" />
- <package name="uk" withSubpackages="true" static="false" />
- <package name="ViolinStrings" withSubpackages="true" static="false" />
- <package name="weka" withSubpackages="true" static="false" />
- <package name="wet" withSubpackages="true" static="false" />
- <package name="winstone" withSubpackages="true" static="false" />
- <package name="woolfel" withSubpackages="true" static="false" />
- <package name="wowza" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="java" withSubpackages="true" static="false" />
- <package name="javax" withSubpackages="true" static="false" />
- <package name="" withSubpackages="true" static="false" />
- </value>
- </option>
- <option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
- <option name="METHODS_ORDER_WEIGHT" value="4" />
- <option name="RIGHT_MARGIN" value="100" />
- <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
- <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
- <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
- <option name="JD_P_AT_EMPTY_LINES" value="false" />
- <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
- <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
- <option name="JD_KEEP_EMPTY_RETURN" value="false" />
- <option name="HTML_KEEP_BLANK_LINES" value="1" />
- <option name="HTML_ALIGN_TEXT" value="true" />
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
- <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
- <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
- <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
- <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
- <option name="BLANK_LINES_AROUND_CLASS" value="0" />
- <option name="BLANK_LINES_AROUND_FIELD" value="1" />
- <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
- <option name="BRACE_STYLE" value="2" />
- <option name="CLASS_BRACE_STYLE" value="2" />
- <option name="METHOD_BRACE_STYLE" value="2" />
- <option name="ELSE_ON_NEW_LINE" value="true" />
- <option name="WHILE_ON_NEW_LINE" value="true" />
- <option name="CATCH_ON_NEW_LINE" value="true" />
- <option name="FINALLY_ON_NEW_LINE" value="true" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
- <option name="SPACE_AFTER_TYPE_CAST" value="false" />
- <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
- <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
- <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
- <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
- <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
- <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
- <option name="METHOD_PARAMETERS_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="1" />
- <option name="BINARY_OPERATION_WRAP" value="1" />
- <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
- <option name="TERNARY_OPERATION_WRAP" value="1" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="1" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="5" />
- <option name="WRAP_COMMENTS" value="true" />
- <option name="IF_BRACE_FORCE" value="3" />
- <option name="DOWHILE_BRACE_FORCE" value="3" />
- <option name="WHILE_BRACE_FORCE" value="3" />
- <option name="FOR_BRACE_FORCE" value="3" />
- <JavaCodeStyleSettings>
- <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
- <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
- </JavaCodeStyleSettings>
- <MarkdownNavigatorCodeStyleSettings>
- <option name="RIGHT_MARGIN" value="72" />
- </MarkdownNavigatorCodeStyleSettings>
- <XML>
- <option name="XML_KEEP_BLANK_LINES" value="1" />
- <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
- </XML>
- <ADDITIONAL_INDENT_OPTIONS fileType="haml">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="java">
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="js">
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="sass">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="yml">
- <option name="INDENT_SIZE" value="2" />
- </ADDITIONAL_INDENT_OPTIONS>
- <codeStyleSettings language="ECMA Script Level 4">
- <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="1" />
- <option name="EXTENDS_LIST_WRAP" value="1" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="1" />
- <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
- <option name="TERNARY_OPERATION_WRAP" value="1" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="1" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="5" />
- <option name="WRAP_COMMENTS" value="true" />
- <option name="IF_BRACE_FORCE" value="3" />
- <option name="DOWHILE_BRACE_FORCE" value="3" />
- <option name="WHILE_BRACE_FORCE" value="3" />
- <option name="FOR_BRACE_FORCE" value="3" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="JAVA">
- <option name="RIGHT_MARGIN" value="100" />
- <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
- <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_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="1" />
- <option name="BINARY_OPERATION_WRAP" value="1" />
- <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
- <option name="TERNARY_OPERATION_WRAP" value="1" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="1" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="5" />
- <option name="IF_BRACE_FORCE" value="3" />
- <option name="DOWHILE_BRACE_FORCE" value="3" />
- <option name="WHILE_BRACE_FORCE" value="3" />
- <option name="FOR_BRACE_FORCE" value="3" />
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JavaScript">
- <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
- <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
- <option name="BINARY_OPERATION_WRAP" value="1" />
- <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
- <option name="TERNARY_OPERATION_WRAP" value="1" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="1" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="5" />
- <option name="WRAP_COMMENTS" value="true" />
- <option name="IF_BRACE_FORCE" value="3" />
- <option name="DOWHILE_BRACE_FORCE" value="3" />
- <option name="WHILE_BRACE_FORCE" value="3" />
- <option name="FOR_BRACE_FORCE" value="3" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- </codeStyleSettings>
- <codeStyleSettings language="PHP">
- <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
- <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
- <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
- <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
- <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="CALL_PARAMETERS_WRAP" value="1" />
- <option name="METHOD_PARAMETERS_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="1" />
- <option name="BINARY_OPERATION_WRAP" value="1" />
- <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
- <option name="TERNARY_OPERATION_WRAP" value="1" />
- <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
- <option name="FOR_STATEMENT_WRAP" value="1" />
- <option name="ARRAY_INITIALIZER_WRAP" value="1" />
- <option name="ASSIGNMENT_WRAP" value="5" />
- <option name="WRAP_COMMENTS" value="true" />
- <option name="IF_BRACE_FORCE" value="3" />
- <option name="DOWHILE_BRACE_FORCE" value="3" />
- <option name="WHILE_BRACE_FORCE" value="3" />
- <option name="FOR_BRACE_FORCE" value="3" />
- <option name="PARENT_SETTINGS_INSTALLED" value="true" />
- <indentOptions>
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </indentOptions>
- </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/c2747ae7/etc/intellij-java-modified-google-style.xml
----------------------------------------------------------------------
diff --git a/etc/intellij-java-modified-google-style.xml b/etc/intellij-java-modified-google-style.xml
new file mode 100644
index 0000000..696500c
--- /dev/null
+++ b/etc/intellij-java-modified-google-style.xml
@@ -0,0 +1,255 @@
+<code_scheme name="GeodeStyle">
+ <option name="JAVA_INDENT_OPTIONS">
+ <value>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </value>
+ </option>
+ <option name="OTHER_INDENT_OPTIONS">
+ <value>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </value>
+ </option>
+ <option name="LINE_SEPARATOR" value="
" />
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <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" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org.apache.geode" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="com.gemstone" withSubpackages="true" static="false" />
+ </value>
+ </option>
+ <option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
+ <option name="METHODS_ORDER_WEIGHT" value="4" />
+ <option name="RIGHT_MARGIN" value="100" />
+ <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+ <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+ <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
+ <option name="JD_P_AT_EMPTY_LINES" value="false" />
+ <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+ <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+ <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+ <option name="HTML_KEEP_BLANK_LINES" value="1" />
+ <option name="HTML_ALIGN_TEXT" value="true" />
+ <option name="KEEP_LINE_BREAKS" value="false" />
+ <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+ <option name="BLANK_LINES_AROUND_CLASS" value="0" />
+ <option name="BLANK_LINES_AROUND_FIELD" value="1" />
+ <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+ <option name="BRACE_STYLE" value="2" />
+ <option name="CLASS_BRACE_STYLE" value="2" />
+ <option name="METHOD_BRACE_STYLE" value="2" />
+ <option name="ELSE_ON_NEW_LINE" value="true" />
+ <option name="WHILE_ON_NEW_LINE" value="true" />
+ <option name="CATCH_ON_NEW_LINE" value="true" />
+ <option name="FINALLY_ON_NEW_LINE" value="true" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+ <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+ <option name="METHOD_PARAMETERS_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="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <JavaCodeStyleSettings>
+ <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+ <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+ </JavaCodeStyleSettings>
+ <MarkdownNavigatorCodeStyleSettings>
+ <option name="RIGHT_MARGIN" value="72" />
+ </MarkdownNavigatorCodeStyleSettings>
+ <XML>
+ <option name="XML_KEEP_BLANK_LINES" value="1" />
+ <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+ </XML>
+ <ADDITIONAL_INDENT_OPTIONS fileType="haml">
+ <option name="INDENT_SIZE" value="2" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="java">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="js">
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="sass">
+ <option name="INDENT_SIZE" value="2" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+ <option name="INDENT_SIZE" value="2" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <codeStyleSettings language="ECMA Script Level 4">
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="EXTENDS_LIST_WRAP" value="1" />
+ <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ </codeStyleSettings>
+ <codeStyleSettings language="JAVA">
+ <option name="RIGHT_MARGIN" value="100" />
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_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="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <indentOptions>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ </indentOptions>
+ </codeStyleSettings>
+ <codeStyleSettings language="JavaScript">
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ </codeStyleSettings>
+ <codeStyleSettings language="PHP">
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_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="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ <indentOptions>
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </indentOptions>
+ </codeStyleSettings>
+</code_scheme>
http://git-wip-us.apache.org/repos/asf/geode/blob/c2747ae7/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 10df53f..1bea584 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -47,7 +47,7 @@ rat {
// IDE
'etc/eclipse-java-google-style.xml',
- 'etc/intellij-java-google-style.xml',
+ 'etc/intellij-java-modified-google-style.xml',
'etc/eclipseOrganizeImports.importorder',
'**/.project',
'**/.classpath',