diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-05-12 20:39:34 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-05-13 07:33:03 +0200 |
| commit | 29d6e9e4bb286f4bbe4ba5166ad8886d241e5f4f (patch) | |
| tree | 581fcc4acd2e9744918b2376dd648cd759ca8b90 | |
| parent | b379a72027df947ff2e936d6b3478f75de5598a1 (diff) | |
| download | cgeo-29d6e9e4bb286f4bbe4ba5166ad8886d241e5f4f.zip cgeo-29d6e9e4bb286f4bbe4ba5166ad8886d241e5f4f.tar.gz cgeo-29d6e9e4bb286f4bbe4ba5166ad8886d241e5f4f.tar.bz2 | |
Update IntelliJ IDEA files
| -rw-r--r-- | .idea/codeStyleSettings.xml | 56 | ||||
| -rw-r--r-- | cgeo-contacts/cgeo-contacts.iml | 1 | ||||
| -rw-r--r-- | mapswithme-api/mapswithme-api.iml | 1 |
3 files changed, 55 insertions, 3 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index cab819f..7cd87fc 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -3,12 +3,66 @@ <component name="ProjectCodeStyleSettingsManager"> <option name="PER_PROJECT_SETTINGS"> <value> + <option name="GENERATE_FINAL_LOCALS" value="true" /> + <option name="GENERATE_FINAL_PARAMETERS" value="true" /> + <option name="INSERT_INNER_CLASS_IMPORTS" value="true" /> + <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" /> + <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" /> + <option name="IMPORT_LAYOUT_TABLE"> + <value> + <package name="" withSubpackages="true" static="true" /> + <emptyLine /> + <package name="butterknife" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="cgeo" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="ch" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="com" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="edu" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="menion" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="org" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="rx" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="android" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="java" withSubpackages="true" static="false" /> + <emptyLine /> + <package name="javax" withSubpackages="true" static="false" /> + <emptyLine /> + </value> + </option> + <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" /> + <option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" /> + <option name="WRAP_COMMENTS" value="true" /> <XML> + <option name="XML_KEEP_LINE_BREAKS" value="false" /> + <option name="XML_ALIGN_ATTRIBUTES" value="false" /> + <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" /> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> </XML> + <codeStyleSettings language="Groovy"> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> + </codeStyleSettings> + <codeStyleSettings language="JAVA"> + <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" /> + </codeStyleSettings> + <codeStyleSettings language="XML"> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + </codeStyleSettings> </value> </option> - <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" /> + <option name="USE_PER_PROJECT_SETTINGS" value="true" /> </component> </project> diff --git a/cgeo-contacts/cgeo-contacts.iml b/cgeo-contacts/cgeo-contacts.iml index 107cc3a..c045b7e 100644 --- a/cgeo-contacts/cgeo-contacts.iml +++ b/cgeo-contacts/cgeo-contacts.iml @@ -19,7 +19,6 @@ </facet> </component> <component name="NewModuleRootManager" inherit-compiler-output="true"> - <output url="file://$MODULE_DIR$/bin/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> diff --git a/mapswithme-api/mapswithme-api.iml b/mapswithme-api/mapswithme-api.iml index 488455c..4d01e37 100644 --- a/mapswithme-api/mapswithme-api.iml +++ b/mapswithme-api/mapswithme-api.iml @@ -17,7 +17,6 @@ </facet> </component> <component name="NewModuleRootManager" inherit-compiler-output="true"> - <output url="file://$MODULE_DIR$/bin/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> |