changeset 9361:5a7f8d2f441a 9-b92

Improve InteliJ Idea support
author jgiles
date Mon, 09 Nov 2015 12:54:13 +1300
parents 2755e737e5b2
children eb0b9f8ad098 79a71b4442cc 7cccd159246c
files .idea/base.iml .idea/buildSrc.iml .idea/controls.iml .idea/encodings.xml .idea/fxml.iml .idea/fxpackager.iml .idea/graphics.iml .idea/libraries/hamcrest_core_1_3.xml .idea/rt-closed.iml .idea/swt.iml .idea/tests.iml .idea/vcs.xml .idea/web.iml
diffstat 13 files changed, 28 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/base.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/base.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -18,6 +18,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="buildSrc" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/buildSrc.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/buildSrc.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -73,26 +73,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="junit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.10.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" exported="" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/controls.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/controls.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -17,6 +17,6 @@
     <orderEntry type="module" module-name="base" exported="" />
     <orderEntry type="module" module-name="graphics" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/encodings.xml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/encodings.xml	Mon Nov 09 12:54:13 2015 +1300
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
--- a/.idea/fxml.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/fxml.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -16,6 +16,6 @@
     <orderEntry type="module" module-name="swing" exported="" />
     <orderEntry type="module" module-name="swt" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/fxpackager.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/fxpackager.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -5,13 +5,13 @@
     <content url="file://$MODULE_DIR$/modules/fxpackager">
       <sourceFolder url="file://$MODULE_DIR$/modules/fxpackager/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/fxpackager/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/fxpackager/src/test/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/modules/fxpackager/src/test/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/fxpackager/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/fxpackager/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/modules/fxpackager/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="controls" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/graphics.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/graphics.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -20,6 +20,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="base" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/libraries/hamcrest_core_1_3.xml	Mon Nov 09 11:50:06 2015 +1300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="hamcrest-core-1.3">
-    <CLASSES>
-      <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
-      <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
--- a/.idea/rt-closed.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/rt-closed.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -180,15 +180,7 @@
       </library>
     </orderEntry>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module-library">
-      <library name="junit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="junit4" level="application" />
+    <orderEntry type="library" name="swt" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/swt.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/swt.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -10,6 +10,6 @@
     <orderEntry type="module" module-name="base" exported="" />
     <orderEntry type="module" module-name="graphics" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" name="swt" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/tests.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/tests.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -12,15 +12,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module-library">
-      <library name="junit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
--- a/.idea/vcs.xml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/vcs.xml	Mon Nov 09 12:54:13 2015 +1300
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
     <mapping directory="$PROJECT_DIR$/../deploy" vcs="hg4idea" />
     <mapping directory="$PROJECT_DIR$" vcs="hg4idea" />
     <mapping directory="$PROJECT_DIR$/../rt-closed" vcs="hg4idea" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
--- a/.idea/web.iml	Mon Nov 09 11:50:06 2015 +1300
+++ b/.idea/web.iml	Mon Nov 09 12:54:13 2015 +1300
@@ -15,6 +15,6 @@
     <orderEntry type="module" module-name="controls" exported="" />
     <orderEntry type="module" module-name="media" exported="" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="TEST" name="junit4" level="application" />
   </component>
-</module>
-
+</module>
\ No newline at end of file