Permalink
Browse files

Update code style.

- Don't align param and exception comments (less changes).
- Don't preserve manual line feeds (e.g. wrap text if it's not using
<p>).
- Drop unused arrangements.
  • Loading branch information...
1 parent d55bd50 commit 2035e72fdd22c65c02eaf2054a0d428922c1776d @UweTrottmann committed Sep 4, 2014
Showing with 4 additions and 203 deletions.
  1. +4 −203 codestyles/intellij/SgAndroidStyle.xml
@@ -2,8 +2,8 @@
<code_scheme name="SgAndroidStyle">
<option name="FIELD_NAME_PREFIX" value="m" />
<option name="STATIC_FIELD_NAME_PREFIX" value="s" />
- <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
- <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
@@ -15,12 +15,13 @@
</value>
</option>
<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_P_AT_EMPTY_LINES" value="false" />
<option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
<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="JD_PRESERVE_LINE_FEEDS" value="true" />
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
@@ -115,206 +116,6 @@
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
- <arrangement>
- <groups>
- <group>
- <type>GETTERS_AND_SETTERS</type>
- <order>KEEP</order>
- </group>
- </groups>
- <rules>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PUBLIC />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PROTECTED />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PACKAGE_PRIVATE />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PRIVATE />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PUBLIC />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PROTECTED />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PACKAGE_PRIVATE />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PRIVATE />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PUBLIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PROTECTED />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PACKAGE_PRIVATE />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <FINAL />
- <PRIVATE />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PUBLIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PROTECTED />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PACKAGE_PRIVATE />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <FIELD />
- <PRIVATE />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <FIELD />
- </match>
- </rule>
- <rule>
- <match>
- <CONSTRUCTOR />
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <METHOD />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <METHOD />
- </match>
- </rule>
- <rule>
- <match>
- <ENUM />
- </match>
- </rule>
- <rule>
- <match>
- <INTERFACE />
- </match>
- </rule>
- <rule>
- <match>
- <AND>
- <CLASS />
- <STATIC />
- </AND>
- </match>
- </rule>
- <rule>
- <match>
- <CLASS />
- </match>
- </rule>
- </rules>
- </arrangement>
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>

0 comments on commit 2035e72

Please sign in to comment.