diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-07-07 15:46:42 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-07-07 15:47:06 +0300 |
| commit | 7ea4956303dcc0b25488a17727d345db5f4d685a (patch) | |
| tree | 868ae2aa9c17c8b6a76c518fce0b364e4127a4f8 /idea | |
| parent | d170a25c8e53400bc69a56095e8b22e07e979320 (diff) | |
| download | jdk8u_jdk-7ea4956303dcc0b25488a17727d345db5f4d685a.tar.gz | |
idea project update
Diffstat (limited to 'idea')
| -rw-r--r-- | idea/java/.idea/misc.xml | 2 | ||||
| -rw-r--r-- | idea/java/.idea/modules.xml | 2 | ||||
| -rw-r--r-- | idea/java/share/share.iml | 1 | ||||
| -rw-r--r-- | idea/java/solaris/solaris.iml | 1 | ||||
| -rw-r--r-- | idea/java/tests/tests.iml | 9 |
5 files changed, 6 insertions, 9 deletions
diff --git a/idea/java/.idea/misc.xml b/idea/java/.idea/misc.xml index 5df049e64e..600bd87957 100644 --- a/idea/java/.idea/misc.xml +++ b/idea/java/.idea/misc.xml @@ -13,7 +13,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JBSDK" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="JBSDK" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project>
\ No newline at end of file diff --git a/idea/java/.idea/modules.xml b/idea/java/.idea/modules.xml index 7505b75865..89d553d561 100644 --- a/idea/java/.idea/modules.xml +++ b/idea/java/.idea/modules.xml @@ -9,4 +9,4 @@ <module fileurl="file://$PROJECT_DIR$/windows/windows.iml" filepath="$PROJECT_DIR$/windows/windows.iml" /> </modules> </component> -</project> +</project>
\ No newline at end of file diff --git a/idea/java/share/share.iml b/idea/java/share/share.iml index e5569a0ec7..76487f3b88 100644 --- a/idea/java/share/share.iml +++ b/idea/java/share/share.iml @@ -9,6 +9,7 @@ <excludeFolder url="file://$MODULE_DIR$/../../../src/share/classes/javax/management" /> <excludeFolder url="file://$MODULE_DIR$/../../../src/share/classes/sun/dc" /> <excludeFolder url="file://$MODULE_DIR$/../../../src/share/classes/sun/management" /> + <excludeFolder url="file://$MODULE_DIR$/../../../src/share/classes/sun/tools/jconsole" /> </content> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="jdk" jdkName="JBSDK" jdkType="JavaSDK" /> diff --git a/idea/java/solaris/solaris.iml b/idea/java/solaris/solaris.iml index 1ec139ca00..42b80ca533 100644 --- a/idea/java/solaris/solaris.iml +++ b/idea/java/solaris/solaris.iml @@ -4,6 +4,7 @@ <exclude-output /> <content url="file://$MODULE_DIR$/../../../src/solaris/classes"> <sourceFolder url="file://$MODULE_DIR$/../../../src/solaris/classes" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/../../../src/solaris/classes/sun/nio" /> </content> <orderEntry type="module" module-name="share" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/idea/java/tests/tests.iml b/idea/java/tests/tests.iml index 1929187336..ada1b5dd88 100644 --- a/idea/java/tests/tests.iml +++ b/idea/java/tests/tests.iml @@ -1,22 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <content url="file://$MODULE_DIR$/../../../test/java/awt/Focus"> - <sourceFolder url="file://$MODULE_DIR$/../../../test/java/awt/Focus" isTestSource="false" /> - </content> <content url="file://$MODULE_DIR$/../../../test/java/awt/Graphics2D"> <sourceFolder url="file://$MODULE_DIR$/../../../test/java/awt/Graphics2D" isTestSource="false" /> </content> <content url="file://$MODULE_DIR$/../../../test/sun/java2d"> <sourceFolder url="file://$MODULE_DIR$/../../../test/sun/java2d" isTestSource="false" /> </content> - <orderEntry type="module" module-name="osx" /> - <orderEntry type="module" module-name="share" /> - <orderEntry type="jdk" jdkName="JBSDK" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="jdk" jdkName="JBSDK" jdkType="JavaSDK" /> </component> </module>
\ No newline at end of file |