1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-23 16:18:50 -05:00

IntelliJ IDEA: 12.0 updates.

This commit is contained in:
Andrew Chen 2012-12-18 15:10:41 -08:00
parent 3f84bb54f2
commit 26e5d89ddd
4 changed files with 10 additions and 40 deletions

View File

@ -9,8 +9,6 @@
<option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/assets" />
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/ActionBarSherlock/library/ignored" />
<option name="REGENERATE_R_JAVA" value="true" />
<option name="REGENERATE_JAVA_BY_AIDL" value="true" />
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/plugins/ActionBarSherlock/library/target/generated-sources/combined-resources/res" />
<option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />

View File

@ -9,8 +9,6 @@
<option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/library/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/library/assets" />
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/Android-PullToRefresh/library/libs" />
<option name="REGENERATE_R_JAVA" value="true" />
<option name="REGENERATE_JAVA_BY_AIDL" value="true" />
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/plugins/Android-PullToRefresh/library/target/generated-sources/combined-resources/res" />
<option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />

View File

@ -9,8 +9,6 @@
<option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/ignored" />
<option name="REGENERATE_R_JAVA" value="true" />
<option name="REGENERATE_JAVA_BY_AIDL" value="true" />
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
<option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />

View File

@ -133,7 +133,11 @@
<entry name="?*.tld" />
<entry name="?*.ftl" />
</wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" />
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
<component name="CopyrightManager" default="">
<module2copyright />
@ -169,9 +173,6 @@
<version value="1.0" />
</component>
<component name="IvyIDEA.ProjectSettings">
<option name="artifactTypeSettings">
<ArtifactTypeSettings />
</option>
<option name="propertiesSettings">
<PropertiesSettings />
</option>
@ -206,33 +207,6 @@
<option value="$PROJECT_DIR$/plugins/Android-PullToRefresh/library/pom.xml" />
</list>
</option>
<option name="activeProfiles">
<list>
<option value="sonatype-oss-release" />
</list>
</option>
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
<option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
<option name="myNullables">
<value>
<list size="3">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="3">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
</list>
</value>
</option>
</component>
<component name="Palette2">
<group name="Swing">
@ -361,15 +335,17 @@
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="haml">
<option name="INDENT_SIZE" value="2" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="lua">
<option name="INDENT_SIZE" value="2" />
</ADDITIONAL_INDENT_OPTIONS>
<codeStyleSettings language="GSP">
<indentOptions>
<option name="INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Groovy">
<indentOptions>
<option name="INDENT_SIZE" value="2" />