diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:24:04 -0700 |
commit | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (patch) | |
tree | fc0dcd722b6d445468dbe7dad13b4c11781b1cbe /tools | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-c3d3a90f6b4ead083d63e28e6b9fcea93d675678.tar.gz |
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git
Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Diffstat (limited to 'tools')
3 files changed, 2 insertions, 204 deletions
diff --git a/tools/launcher-generator/.idea/codeStyleSettings.xml b/tools/launcher-generator/.idea/codeStyleSettings.xml index 203f145b61f7..fcffa69814c6 100644 --- a/tools/launcher-generator/.idea/codeStyleSettings.xml +++ b/tools/launcher-generator/.idea/codeStyleSettings.xml @@ -25,206 +25,6 @@ <option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="TAB_SIZE" value="2" /> </indentOptions> - <arrangement> - <groups> - <group> - <type>GETTERS_AND_SETTERS</type> - <order>KEEP</order> - </group> - </groups> - <rules> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PUBLIC</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PROTECTED</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PACKAGE_PRIVATE</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PRIVATE</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PUBLIC</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PROTECTED</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PACKAGE_PRIVATE</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PRIVATE</MODIFIER> - <MODIFIER>STATIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PUBLIC</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PROTECTED</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PACKAGE_PRIVATE</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PRIVATE</MODIFIER> - <MODIFIER>FINAL</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PUBLIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PROTECTED</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PACKAGE_PRIVATE</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>FIELD</TYPE> - <MODIFIER>PRIVATE</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <TYPE>FIELD</TYPE> - </match> - </rule> - <rule> - <match> - <TYPE>CONSTRUCTOR</TYPE> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>METHOD</TYPE> - <MODIFIER>STATIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <TYPE>METHOD</TYPE> - </match> - </rule> - <rule> - <match> - <TYPE>ENUM</TYPE> - </match> - </rule> - <rule> - <match> - <TYPE>INTERFACE</TYPE> - </match> - </rule> - <rule> - <match> - <AND> - <TYPE>CLASS</TYPE> - <MODIFIER>STATIC</MODIFIER> - </AND> - </match> - </rule> - <rule> - <match> - <TYPE>CLASS</TYPE> - </match> - </rule> - </rules> - </arrangement> </codeStyleSettings> </value> </option> diff --git a/tools/launcher-generator/.idea/copyright/profiles_settings.xml b/tools/launcher-generator/.idea/copyright/profiles_settings.xml index ad23b0748861..d282fc12f62f 100644 --- a/tools/launcher-generator/.idea/copyright/profiles_settings.xml +++ b/tools/launcher-generator/.idea/copyright/profiles_settings.xml @@ -1,5 +1,3 @@ <component name="CopyrightManager"> - <settings default="apache 2 productiveme"> - <module2copyright /> - </settings> + <settings default="apache 2 productiveme" /> </component>
\ No newline at end of file diff --git a/tools/launcher-generator/.idea/libraries/guava.xml b/tools/launcher-generator/.idea/libraries/guava.xml index 3383a0eb8540..d0bf7efad7c6 100644 --- a/tools/launcher-generator/.idea/libraries/guava.xml +++ b/tools/launcher-generator/.idea/libraries/guava.xml @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="guava"> <CLASSES> - <root url="jar://$PROJECT_DIR$/../../lib/guava-14.0.1.jar!/" /> + <root url="jar://$PROJECT_DIR$/../../lib/guava-17.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> |