changeset 459:d679865a5840

Updated Intellij project files for OpenJFX
author rbair
date Fri, 17 Feb 2012 21:37:24 -0800
parents a17d086fef92
children 5396516a9687
files .idea/codeStyleSettings.xml .idea/libraries/jfxrt_binary_stub.xml .idea/misc.xml .idea/modules.xml javafx-beans-dt/javafx-beans-dt.iml javafx-concurrent/javafx-concurrent.iml javafx-designtime/javafx-designtime.iml javafx-ui-common/javafx-ui-common.iml javafx-ui-controls/javafx-ui-controls.iml
diffstat 9 files changed, 31 insertions(+), 226 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/codeStyleSettings.xml	Fri Feb 17 17:38:03 2012 -0500
+++ b/.idea/codeStyleSettings.xml	Fri Feb 17 21:37:24 2012 -0800
@@ -3,6 +3,7 @@
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
       <value>
+        <option name="LINE_SEPARATOR" value="&#10;" />
         <option name="IMPORT_LAYOUT_TABLE">
           <value>
             <package name="java" withSubpackages="true" static="false" />
@@ -16,6 +17,9 @@
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
+        <codeStyleSettings language="JAVA">
+          <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+        </codeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
--- a/.idea/libraries/jfxrt_binary_stub.xml	Fri Feb 17 17:38:03 2012 -0500
+++ b/.idea/libraries/jfxrt_binary_stub.xml	Fri Feb 17 21:37:24 2012 -0800
@@ -2,6 +2,7 @@
   <library name="jfxrt-binary-stub">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/../artifacts/sdk/rt/lib/jfxrt.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../artifacts/sdk/tools/javafx-mx.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
--- a/.idea/misc.xml	Fri Feb 17 17:38:03 2012 -0500
+++ b/.idea/misc.xml	Fri Feb 17 21:37:24 2012 -0800
@@ -6,7 +6,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build" />
   </component>
 </project>
--- a/.idea/modules.xml	Fri Feb 17 17:38:03 2012 -0500
+++ b/.idea/modules.xml	Fri Feb 17 21:37:24 2012 -0800
@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/javafx-beans-dt/javafx-beans-dt.iml" filepath="$PROJECT_DIR$/javafx-beans-dt/javafx-beans-dt.iml" group="Tools" />
       <module fileurl="file://$PROJECT_DIR$/javafx-concurrent/javafx-concurrent.iml" filepath="$PROJECT_DIR$/javafx-concurrent/javafx-concurrent.iml" group="Concurrent" />
       <module fileurl="file://$PROJECT_DIR$/javafx-designtime/javafx-designtime.iml" filepath="$PROJECT_DIR$/javafx-designtime/javafx-designtime.iml" group="Tools" />
+      <module fileurl="file://$PROJECT_DIR$/javafx-ui-common/javafx-ui-common.iml" filepath="$PROJECT_DIR$/javafx-ui-common/javafx-ui-common.iml" group="Scene Graph" />
       <module fileurl="file://$PROJECT_DIR$/javafx-ui-controls/javafx-ui-controls.iml" filepath="$PROJECT_DIR$/javafx-ui-controls/javafx-ui-controls.iml" group="Controls" />
       <module fileurl="file://$PROJECT_DIR$/test-stub-toolkit/test-stub-toolkit.iml" filepath="$PROJECT_DIR$/test-stub-toolkit/test-stub-toolkit.iml" group="Tools" />
     </modules>
--- a/javafx-beans-dt/javafx-beans-dt.iml	Fri Feb 17 17:38:03 2012 -0500
+++ b/javafx-beans-dt/javafx-beans-dt.iml	Fri Feb 17 21:37:24 2012 -0800
@@ -11,6 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="javafx-ui-common" />
     <orderEntry type="library" name="jfxrt-binary-stub" level="project" />
     <orderEntry type="library" name="junit-4.8.2" level="project" />
   </component>
--- a/javafx-concurrent/javafx-concurrent.iml	Fri Feb 17 17:38:03 2012 -0500
+++ b/javafx-concurrent/javafx-concurrent.iml	Fri Feb 17 21:37:24 2012 -0800
@@ -11,6 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="javafx-ui-common" />
     <orderEntry type="library" name="jfxrt-binary-stub" level="project" />
     <orderEntry type="library" name="junit-4.8.2" level="project" />
   </component>
--- a/javafx-designtime/javafx-designtime.iml	Fri Feb 17 17:38:03 2012 -0500
+++ b/javafx-designtime/javafx-designtime.iml	Fri Feb 17 21:37:24 2012 -0800
@@ -11,6 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="javafx-ui-common" />
     <orderEntry type="module" module-name="javafx-beans-dt" />
     <orderEntry type="library" name="jfxrt-binary-stub" level="project" />
     <orderEntry type="library" name="junit-4.8.2" level="project" />
--- a/javafx-ui-common/javafx-ui-common.iml	Fri Feb 17 17:38:03 2012 -0500
+++ b/javafx-ui-common/javafx-ui-common.iml	Fri Feb 17 21:37:24 2012 -0800
@@ -1,224 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes" />
-    <output-test url="file://$MODULE_DIR$/build/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/gensrc" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/.externalToolBuilders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test" />
-      <excludeFolder url="file://$MODULE_DIR$/dist" />
-      <excludeFolder url="file://$MODULE_DIR$/nbproject" />
-      <excludeFolder url="file://$MODULE_DIR$/src.fx" />
-      <excludeFolder url="file://$MODULE_DIR$/test.fx" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="junit4" level="project" />
-    <orderEntry type="library" name="antlr" level="project" />
-    <orderEntry type="module" module-name="javafx-anim" />
-    <orderEntry type="module" module-name="javafx-beans" />
-    <orderEntry type="module" module-name="javafx-collections" />
-    <orderEntry type="module" module-name="javafx-common" />
-    <orderEntry type="module" module-name="javafx-geom" />
-    <orderEntry type="module" module-name="javafx-logging" />
-    <orderEntry type="module" module-name="javafx-sg-common" />
-    <orderEntry type="module" module-name="decora-runtime" />
-    <orderEntry type="module" module-name="prism-common" scope="TEST" />
-    <orderEntry type="module" module-name="javafx-mx-common" />
-  </component>
-  <component name="org.twodividedbyzero.idea.findbugs">
-    <option name="_basePreferences">
-      <map>
-        <entry key="property.analysisEffortLevel" value="default" />
-        <entry key="property.analyzeAfterCompile" value="false" />
-        <entry key="property.exportAsHtml" value="true" />
-        <entry key="property.exportAsXml" value="true" />
-        <entry key="property.exportBaseDir" value="" />
-        <entry key="property.exportCreateArchiveDir" value="false" />
-        <entry key="property.exportOpenBrowser" value="true" />
-        <entry key="property.minPriorityToReport" value="Medium" />
-        <entry key="property.runAnalysisInBackground" value="false" />
-        <entry key="property.showHiddenDetectors" value="false" />
-        <entry key="property.toolWindowToFront" value="true" />
-      </map>
-    </option>
-    <option name="_detectors">
-      <map>
-        <entry key="AppendingToAnObjectOutputStream" value="true" />
-        <entry key="BCPMethodReturnCheck" value="false" />
-        <entry key="BadAppletConstructor" value="false" />
-        <entry key="BadResultSetAccess" value="true" />
-        <entry key="BadSyntaxForRegularExpression" value="true" />
-        <entry key="BadUseOfReturnValue" value="true" />
-        <entry key="BadlyOverriddenAdapter" value="true" />
-        <entry key="BooleanReturnNull" value="true" />
-        <entry key="BuildInterproceduralCallGraph" value="false" />
-        <entry key="BuildObligationPolicyDatabase" value="true" />
-        <entry key="CallToUnsupportedMethod" value="false" />
-        <entry key="CalledMethods" value="true" />
-        <entry key="CheckCalls" value="false" />
-        <entry key="CheckExpectedWarnings" value="false" />
-        <entry key="CheckImmutableAnnotation" value="true" />
-        <entry key="CheckTypeQualifiers" value="true" />
-        <entry key="CloneIdiom" value="true" />
-        <entry key="ComparatorIdiom" value="true" />
-        <entry key="ConfusedInheritance" value="true" />
-        <entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
-        <entry key="CrossSiteScripting" value="true" />
-        <entry key="DoInsideDoPrivileged" value="true" />
-        <entry key="DontCatchIllegalMonitorStateException" value="true" />
-        <entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
-        <entry key="DontUseEnum" value="true" />
-        <entry key="DroppedException" value="true" />
-        <entry key="DumbMethodInvocations" value="true" />
-        <entry key="DumbMethods" value="true" />
-        <entry key="DuplicateBranches" value="true" />
-        <entry key="EmptyZipFileEntry" value="true" />
-        <entry key="EqStringTest" value="false" />
-        <entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
-        <entry key="FieldItemSummary" value="true" />
-        <entry key="FinalizerNullsFields" value="true" />
-        <entry key="FindBadCast" value="false" />
-        <entry key="FindBadCast2" value="true" />
-        <entry key="FindBadEqualsImplementation" value="false" />
-        <entry key="FindBadForLoop" value="true" />
-        <entry key="FindBugsSummaryStats" value="true" />
-        <entry key="FindCircularDependencies" value="false" />
-        <entry key="FindDeadLocalStores" value="true" />
-        <entry key="FindDoubleCheck" value="true" />
-        <entry key="FindEmptySynchronizedBlock" value="true" />
-        <entry key="FindFieldSelfAssignment" value="true" />
-        <entry key="FindFinalizeInvocations" value="true" />
-        <entry key="FindFloatEquality" value="true" />
-        <entry key="FindFloatMath" value="false" />
-        <entry key="FindHEmismatch" value="true" />
-        <entry key="FindInconsistentSync2" value="true" />
-        <entry key="FindJSR166LockMonitorenter" value="true" />
-        <entry key="FindLocalSelfAssignment2" value="true" />
-        <entry key="FindMaskedFields" value="true" />
-        <entry key="FindMismatchedWaitOrNotify" value="true" />
-        <entry key="FindNakedNotify" value="true" />
-        <entry key="FindNonSerializableStoreIntoSession" value="true" />
-        <entry key="FindNonSerializableValuePassedToWriteObject" value="true" />
-        <entry key="FindNonShortCircuit" value="true" />
-        <entry key="FindNullDeref" value="true" />
-        <entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
-        <entry key="FindOpenStream" value="true" />
-        <entry key="FindPuzzlers" value="true" />
-        <entry key="FindRefComparison" value="true" />
-        <entry key="FindReturnRef" value="true" />
-        <entry key="FindRunInvocations" value="true" />
-        <entry key="FindSelfComparison" value="true" />
-        <entry key="FindSelfComparison2" value="true" />
-        <entry key="FindSleepWithLockHeld" value="true" />
-        <entry key="FindSpinLoop" value="true" />
-        <entry key="FindSqlInjection" value="true" />
-        <entry key="FindTwoLockWait" value="true" />
-        <entry key="FindUncalledPrivateMethods" value="true" />
-        <entry key="FindUnconditionalWait" value="true" />
-        <entry key="FindUninitializedGet" value="true" />
-        <entry key="FindUnrelatedTypesInGenericContainer" value="true" />
-        <entry key="FindUnreleasedLock" value="true" />
-        <entry key="FindUnsatisfiedObligation" value="true" />
-        <entry key="FindUnsyncGet" value="true" />
-        <entry key="FindUselessControlFlow" value="true" />
-        <entry key="FormatStringChecker" value="true" />
-        <entry key="HugeSharedStringConstants" value="true" />
-        <entry key="IDivResultCastToDouble" value="true" />
-        <entry key="IncompatMask" value="true" />
-        <entry key="InconsistentAnnotations" value="true" />
-        <entry key="InefficientMemberAccess" value="false" />
-        <entry key="InefficientToArray" value="true" />
-        <entry key="InfiniteLoop" value="true" />
-        <entry key="InfiniteRecursiveLoop" value="true" />
-        <entry key="InfiniteRecursiveLoop2" value="false" />
-        <entry key="InheritanceUnsafeGetResource" value="true" />
-        <entry key="InitializationChain" value="true" />
-        <entry key="InstantiateStaticClass" value="true" />
-        <entry key="InvalidJUnitTest" value="true" />
-        <entry key="IteratorIdioms" value="true" />
-        <entry key="LazyInit" value="true" />
-        <entry key="LoadOfKnownNullValue" value="true" />
-        <entry key="LockedFields" value="false" />
-        <entry key="LostLoggerDueToWeakReference" value="true" />
-        <entry key="MethodReturnCheck" value="true" />
-        <entry key="Methods" value="true" />
-        <entry key="MultithreadedInstanceAccess" value="true" />
-        <entry key="MutableLock" value="true" />
-        <entry key="MutableStaticFields" value="true" />
-        <entry key="Naming" value="true" />
-        <entry key="Noise" value="false" />
-        <entry key="NoiseNullDeref" value="false" />
-        <entry key="NoteAnnotationRetention" value="true" />
-        <entry key="NoteCheckReturnValue" value="true" />
-        <entry key="NoteCheckReturnValueAnnotations" value="true" />
-        <entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
-        <entry key="NoteJCIPAnnotation" value="true" />
-        <entry key="NoteNonNullAnnotations" value="true" />
-        <entry key="NoteNonnullReturnValues" value="true" />
-        <entry key="NoteSuppressedWarnings" value="true" />
-        <entry key="NoteUnconditionalParamDerefs" value="true" />
-        <entry key="NumberConstructor" value="true" />
-        <entry key="OverridingEqualsNotSymmetrical" value="true" />
-        <entry key="PreferZeroLengthArrays" value="true" />
-        <entry key="PublicSemaphores" value="false" />
-        <entry key="QuestionableBooleanAssignment" value="true" />
-        <entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
-        <entry key="ReadReturnShouldBeChecked" value="true" />
-        <entry key="RedundantInterfaces" value="true" />
-        <entry key="ReflectiveClasses" value="true" />
-        <entry key="RepeatedConditionals" value="true" />
-        <entry key="ResolveAllReferences" value="false" />
-        <entry key="RuntimeExceptionCapture" value="true" />
-        <entry key="SerializableIdiom" value="true" />
-        <entry key="StartInConstructor" value="true" />
-        <entry key="StaticCalendarDetector" value="true" />
-        <entry key="StringConcatenation" value="true" />
-        <entry key="SuperfluousInstanceOf" value="true" />
-        <entry key="SuspiciousThreadInterrupted" value="true" />
-        <entry key="SwitchFallthrough" value="true" />
-        <entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
-        <entry key="SynchronizeAndNullCheckField" value="true" />
-        <entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
-        <entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
-        <entry key="TestASM" value="false" />
-        <entry key="TestDataflowAnalysis" value="false" />
-        <entry key="TestingGround" value="false" />
-        <entry key="TrainFieldStoreTypes" value="true" />
-        <entry key="TrainNonNullAnnotations" value="true" />
-        <entry key="TrainUnconditionalDerefParams" value="true" />
-        <entry key="URLProblems" value="true" />
-        <entry key="UncallableMethodOfAnonymousClass" value="true" />
-        <entry key="UnnecessaryMath" value="true" />
-        <entry key="UnreadFields" value="true" />
-        <entry key="UseObjectEquals" value="false" />
-        <entry key="UselessSubclassMethod" value="false" />
-        <entry key="VarArgsProblems" value="true" />
-        <entry key="VolatileUsage" value="true" />
-        <entry key="WaitInLoop" value="true" />
-        <entry key="WrongMapIterator" value="true" />
-        <entry key="XMLFactoryBypass" value="true" />
-      </map>
-    </option>
-    <option name="_reportCategories">
-      <map>
-        <entry key="BAD_PRACTICE" value="true" />
-        <entry key="CORRECTNESS" value="true" />
-        <entry key="EXPERIMENTAL" value="true" />
-        <entry key="I18N" value="true" />
-        <entry key="MALICIOUS_CODE" value="true" />
-        <entry key="MT_CORRECTNESS" value="true" />
-        <entry key="NOISE" value="false" />
-        <entry key="PERFORMANCE" value="true" />
-        <entry key="SECURITY" value="true" />
-        <entry key="STYLE" value="true" />
-      </map>
-    </option>
-  </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.externalToolBuilders" />
+      <excludeFolder url="file://$MODULE_DIR$/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/nbproject" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jfxrt-binary-stub" level="project" />
+    <orderEntry type="library" name="junit-4.8.2" level="project" />
+    <orderEntry type="module" module-name="test-stub-toolkit" />
+  </component>
+</module>
+
--- a/javafx-ui-controls/javafx-ui-controls.iml	Fri Feb 17 17:38:03 2012 -0500
+++ b/javafx-ui-controls/javafx-ui-controls.iml	Fri Feb 17 21:37:24 2012 -0800
@@ -12,9 +12,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="javafx-ui-common" />
+    <orderEntry type="module" module-name="test-stub-toolkit" scope="TEST" />
     <orderEntry type="library" name="jfxrt-binary-stub" level="project" />
     <orderEntry type="library" name="junit-4.8.2" level="project" />
-    <orderEntry type="module" module-name="test-stub-toolkit" scope="TEST" />
   </component>
 </module>