changeset 8203:d41223f52503

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8u11/master/jfx/rt
author kcr
date Sat, 17 May 2014 06:12:58 -0700
parents 300e8d2c5c6a b7bd8b345482
children dbd0c9d9a82f
files .hgtags apps/experiments/3DViewer/.classpath apps/experiments/3DViewer/.idea/.name apps/experiments/3DViewer/.idea/compiler.xml apps/experiments/3DViewer/.idea/copyright/profiles_settings.xml apps/experiments/3DViewer/.idea/encodings.xml apps/experiments/3DViewer/.idea/misc.xml apps/experiments/3DViewer/.idea/modules.xml apps/experiments/3DViewer/.idea/runConfigurations/3DViewer.xml apps/experiments/3DViewer/.idea/scopes/scope_settings.xml apps/experiments/3DViewer/.idea/vcs.xml apps/experiments/3DViewer/.project apps/experiments/3DViewer/3DViewer.iml apps/experiments/3DViewer/build.gradle apps/experiments/3DViewer/build.xml apps/experiments/3DViewer/manifest.mf apps/experiments/3DViewer/nbproject/build-impl.xml apps/experiments/3DViewer/nbproject/genfiles.properties apps/experiments/3DViewer/nbproject/project.properties apps/experiments/3DViewer/nbproject/project.xml apps/experiments/3DViewer/src/main/java/com/javafx/experiments/exporters/fxml/FXMLExporter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/height2normal/Height2NormalApp.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/height2normal/Height2NormalConverter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/Importer3D.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/Optimizer.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/SmoothingGroups.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/Validator.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/dae/DaeImporter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/max/MaxAseParser.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/max/MaxAseTokenizer.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/max/MaxData.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/max/MaxLoader.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/Frame.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/Joint.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/Loader.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MAttribute.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MConnection.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MEnv.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MNode.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MNodeType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MObject.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MPath.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MayaAnimationCurveInterpolator.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MayaGroup.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/MayaImporter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/Xform.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/parser/MParser.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MArrayType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MAttributeAliasType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MBoolType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MCharacterMappingType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MComponentListType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MCompoundType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MDataType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MFloat2ArrayType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MFloat2Type.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MFloat3ArrayType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MFloat3Type.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MFloatArrayType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MFloatType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MInt3ArrayType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MIntArrayType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MIntType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MMatrixType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MNurbsCurveType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MPointerType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MPolyFaceType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/types/MStringType.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MArray.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MAttributeAlias.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MBool.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MCharacterMapping.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MComponentList.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MCompound.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MData.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MFloat.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MFloat2.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MFloat2Array.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MFloat3.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MFloat3Array.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MFloatArray.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MInt.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MInt3Array.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MIntArray.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MNurbsCurve.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MPointer.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MPolyFace.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/MString.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MArrayImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MAttributeAliasImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MBoolImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MCharacterMappingImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MComponentListImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MCompoundImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MDataImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MFloat2ArrayImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MFloat2Impl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MFloat3ArrayImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MFloat3Impl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MFloatArrayImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MFloatImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MInt3ArrayImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MIntArrayImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MIntImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MNurbsCurveImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MPointerImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MPolyFaceImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/maya/values/impl/MStringImpl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/obj/FloatArrayList.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/obj/IntegerArrayList.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/obj/MtlReader.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/obj/ObjImporter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/obj/PolyObjImporter.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/AutoScalingGroup.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/ContentModel.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/FourWayNavControl.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/Frame.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/Jfx3dViewerApp.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/MainController.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/NavigationController.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/OldTestViewer.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SessionManager.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SettingsController.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SimpleViewerApp.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/TimelineController.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/TimelineDisplay.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/Xform.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/PolygonMesh.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/PolygonMeshView.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/SkinningMesh.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/SubdivisionMesh.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/OriginalPointArray.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/SubdividedPointArray.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/SymbolicPointArray.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/SymbolicPolygonMesh.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/SymbolicSubdivisionBuilder.java apps/experiments/3DViewer/src/main/java/com/javafx/experiments/utils3d/DragSupport.java apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/blue.jpg apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/carbon.jpg apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/carbon2.jpg apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/drop-here-large-yUp.mtl apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/drop-here-large-yUp.obj apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/drop-here-large.mtl apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/drop-here-large.obj apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/drop-here.mtl apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/drop-here.obj apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/main.fxml apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/navigation.fxml apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/settings.fxml apps/experiments/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/viewer.css apps/experiments/3DViewer/src/test/java/com/javafx/experiments/exporters/javasource/JavaSourceExporterTestApp.java apps/experiments/3DViewer/src/test/java/com/javafx/experiments/importers/max/Test.java apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-cheetah3d/blob.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-cheetah3d/cube.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-cheetah3d/plane-grouped.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-cheetah3d/plane.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-maya/cube.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-maya/duke.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-maya/duke.png apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-maya/plane-camera.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/dae/test-data-maya/plane.dae apps/experiments/3DViewer/src/test/resources/com/javafx/importers/obj/cube.obj apps/experiments/3DViewer/src/test/resources/com/javafx/importers/obj/plane.obj apps/experiments/3DViewer/src/test/resources/com/javafx/importers/obj/sub-box-raw.obj apps/experiments/3DViewer/src/test/resources/com/javafx/importers/obj/sub-box.obj apps/experiments/3DViewer/src/test/resources/com/javafx/importers/obj/sub-cube.obj apps/experiments/Modena/.classpath apps/experiments/Modena/.project apps/experiments/Modena/build.gradle apps/experiments/Modena/build.xml apps/experiments/Modena/manifest.mf apps/experiments/Modena/nbproject/build-impl.xml apps/experiments/Modena/nbproject/genfiles.properties apps/experiments/Modena/nbproject/project.properties apps/experiments/Modena/nbproject/project.xml apps/experiments/Modena/src/main/java/modena/Modena.java apps/experiments/Modena/src/main/java/modena/SameHeightTestController.java apps/experiments/Modena/src/main/java/modena/SamplePage.java apps/experiments/Modena/src/main/java/modena/SamplePageChartHelper.java apps/experiments/Modena/src/main/java/modena/SamplePageHelpers.java apps/experiments/Modena/src/main/java/modena/SamplePageNavigation.java apps/experiments/Modena/src/main/java/modena/SamplePageTableHelper.java apps/experiments/Modena/src/main/java/modena/SamplePageTreeHelper.java apps/experiments/Modena/src/main/java/modena/SamplePageTreeTableHelper.java apps/experiments/Modena/src/main/java/modena/SimpleWindowPage.java apps/experiments/Modena/src/main/resources/modena/CombinationTest.fxml apps/experiments/Modena/src/main/resources/modena/SameHeightTest.fxml apps/experiments/Modena/src/main/resources/modena/ScottSelvia.fxml apps/experiments/Modena/src/main/resources/modena/TestApp.css apps/experiments/Modena/src/main/resources/modena/mac-window-frame.png apps/experiments/Modena/src/main/resources/modena/recorder-icon-48.png apps/experiments/Modena/src/main/resources/modena/reload_12x14.png apps/experiments/Modena/src/main/resources/modena/simple-window.fxml apps/experiments/Modena/src/main/resources/modena/ubuntu-window-frame.png apps/experiments/Modena/src/main/resources/modena/ui-mosaic.fxml apps/experiments/Modena/src/main/resources/modena/windows7-window-frame.png apps/experiments/Modena/src/main/resources/modena/windows8-window-frame.png apps/samples/Ensemble8/.classpath apps/samples/Ensemble8/.project apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/ProcessListener.java modules/base/src/main/java/javafx/collections/ObservableList.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleButton.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleCheckBox.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleControl.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleList.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleListItem.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleMenuButton.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleRadioButton.java modules/controls/src/main/java/com/sun/javafx/scene/control/accessible/AccessibleSlider.java modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ContextMenuBehavior.java modules/controls/src/main/java/com/sun/javafx/scene/control/skin/KeyCodeUtils.java modules/controls/src/main/java/com/sun/javafx/scene/control/skin/KeystrokeUtils.java modules/controls/src/test/java/com/sun/javafx/scene/control/skin/KeystrokeUtilsTest.java modules/fxml/src/test/java/javafx/fxml/RT_14880Controller.java modules/fxml/src/test/java/javafx/fxml/RT_14880Test.java modules/fxml/src/test/java/javafx/fxml/RT_17646Controller.java modules/fxml/src/test/java/javafx/fxml/RT_17646Test.java modules/fxml/src/test/java/javafx/fxml/RT_18680Test.java modules/fxml/src/test/java/javafx/fxml/RT_24465.java modules/fxml/src/test/resources/javafx/fxml/rt_14880.fxml modules/fxml/src/test/resources/javafx/fxml/rt_17646.fxml modules/fxml/src/test/resources/javafx/fxml/rt_18680.fxml modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Log.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/IOUtils.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/LinuxAppBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/LinuxDebBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/LinuxRPMBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/MacAppBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/MacDMGBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/RelativeFileSet.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/WinAppBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/WinExeBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/WinMsiBundler.java modules/fxpackager/src/main/java/com/sun/javafx/tools/resource/linux/LinuxResources.java modules/fxpackager/src/main/java/com/sun/javafx/tools/resource/mac/MacResources.java modules/fxpackager/src/main/java/com/sun/javafx/tools/resource/windows/WinResources.java modules/fxpackager/src/main/man/ja_JP.UTF-8/html/javafxpackager.html modules/fxpackager/src/main/native/javafxpackager/shell/javafxpackager modules/fxpackager/src/main/native/javafxpackager/win/javafxpackager.cpp modules/fxpackager/src/main/native/javafxpackager/win/javafxpackager.manifest modules/fxpackager/src/main/native/javafxpackager/win/javafxpackager.rc modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/javalogo_white_16.png modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/javalogo_white_32.png modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/javalogo_white_48.png modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/template.control modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/template.copyright modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/template.desktop modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/template.postinst modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/template.postrm modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/linux/template.spec modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/mac/DMGsetup.scpt modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/mac/GenericApp.icns modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/mac/Info.plist.template modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/mac/background.png modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/mac/lic_template.plist modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/windows/icon_inno_setup.bmp modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/windows/javalogo_white_16.ico modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/windows/javalogo_white_32.ico modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/windows/javalogo_white_48.ico modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/windows/template.iss modules/fxpackager/src/main/resources/com/sun/javafx/tools/resource/windows/template.wxs modules/fxpackager/src/main/resources/resources/web-files/dtjava.js modules/fxpackager/src/main/resources/resources/web-files/error.png modules/fxpackager/src/main/resources/resources/web-files/get_java.png modules/fxpackager/src/main/resources/resources/web-files/get_javafx.png modules/fxpackager/src/main/resources/resources/web-files/javafx-chrome.png modules/fxpackager/src/main/resources/resources/web-files/javafx-loading-100x100.gif modules/fxpackager/src/main/resources/resources/web-files/javafx-loading-25x25.gif modules/fxpackager/src/main/resources/resources/web-files/upgrade_java.png modules/fxpackager/src/main/resources/resources/web-files/upgrade_javafx.png modules/fxpackager/test/main/java/com/sun/javafx/tools/ant/FXJarTest.java modules/fxpackager/test/main/java/com/sun/javafx/tools/packager/PackagerLibTest.java modules/fxpackager/test/main/java/com/sun/javafx/tools/packager/bundlers/BundleParamsTest.java modules/fxpackager/test/main/java/com/sun/javafx/tools/packager/bundlers/WinMsiBundlerTest.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/AccessibleBasePatternProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/AccessibleBaseProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/AccessibleLogger.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/AccessibleRoot.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleAttributes.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleBasePatternProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleBaseProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleEventIds.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleRoles.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleRoot.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleSelectionItemProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleSelectionProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/mac/MacAccessibleToggleProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleBasePatternProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleBaseProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleGridItemProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleGridProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleRangeValueProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleRoot.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleSelectionItemProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleSelectionProvider.java modules/graphics/src/main/java/com/sun/glass/ui/accessible/win/WinAccessibleToggleProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/AccessibleNode.java modules/graphics/src/main/java/com/sun/javafx/accessible/AccessibleStage.java modules/graphics/src/main/java/com/sun/javafx/accessible/AccessibleText.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/Accessible.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/AccessibleProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/AccessibleStageProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/ExpandCollapseProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/GridItemProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/GridProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/InvokeProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/RangeValueProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/SelectionItemProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/SelectionProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/ToggleProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/providers/ValueProvider.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/ControlTypeIds.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/EventIds.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/ExpandCollapseState.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/NavigateDirection.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/OrientationType.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/PatternIds.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/PropertyIds.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/ProviderOptions.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/Rect.java modules/graphics/src/main/java/com/sun/javafx/accessible/utils/ToggleState.java modules/graphics/src/main/java/com/sun/javafx/css/parser/SimpleRecognizer.java modules/graphics/src/main/java/com/sun/javafx/font/freetype/PangoGlyphInfo.java modules/graphics/src/main/java/com/sun/scenario/effect/impl/state/LinearConvolvePeer.java modules/graphics/src/main/java/com/sun/scenario/effect/impl/state/LinearConvolveShadowPeer.java modules/graphics/src/main/native-glass/mac/GlassAccessibleBaseProvider.h modules/graphics/src/main/native-glass/mac/GlassAccessibleBaseProvider.m modules/graphics/src/main/native-glass/mac/GlassAccessibleRoot.h modules/graphics/src/main/native-glass/mac/GlassAccessibleRoot.m modules/graphics/src/main/native-glass/mac/GlassAccessibleSelectionItemProvider.h modules/graphics/src/main/native-glass/mac/GlassAccessibleSelectionItemProvider.m modules/graphics/src/main/native-glass/mac/GlassAccessibleSelectionProvider.h modules/graphics/src/main/native-glass/mac/GlassAccessibleSelectionProvider.m modules/graphics/src/main/native-glass/mac/GlassAccessibleToggleProvider.h modules/graphics/src/main/native-glass/mac/GlassAccessibleToggleProvider.m modules/graphics/src/main/native-glass/win/AccessibleBasePatternProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleBasePatternProvider.h modules/graphics/src/main/native-glass/win/AccessibleBaseProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleBaseProvider.h modules/graphics/src/main/native-glass/win/AccessibleGridItemProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleGridItemProvider.h modules/graphics/src/main/native-glass/win/AccessibleGridProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleGridProvider.h modules/graphics/src/main/native-glass/win/AccessibleRangeValueProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleRangeValueProvider.h modules/graphics/src/main/native-glass/win/AccessibleRoot.cpp modules/graphics/src/main/native-glass/win/AccessibleRoot.h modules/graphics/src/main/native-glass/win/AccessibleSelectionItemProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleSelectionItemProvider.h modules/graphics/src/main/native-glass/win/AccessibleSelectionProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleSelectionProvider.h modules/graphics/src/main/native-glass/win/AccessibleToggleProvider.cpp modules/graphics/src/main/native-glass/win/AccessibleToggleProvider.h modules/graphics/src/test/java/javafx/scene/RegistrationTest.java
diffstat 2291 files changed, 266666 insertions(+), 199236 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue May 13 07:59:22 2014 -0700
+++ b/.hgignore	Sat May 17 06:12:58 2014 -0700
@@ -9,6 +9,8 @@
 ^\.ant-targets.*$
 ^.idea/tasks.xml$
 ^.idea/workspace.xml$
+^.idea/inspectionProfiles/*
+^.idea/copyright/profile_settings.xml$
 ^\.gradle/
 ^buildSrc/\.gradle/
 ^.idea/out/
--- a/.hgtags	Tue May 13 07:59:22 2014 -0700
+++ b/.hgtags	Sat May 17 06:12:58 2014 -0700
@@ -115,6 +115,7 @@
 dd789066e61e601bb4e5f8cc0ec5d185d58781e4 8.0-b122
 ba5830260631a6812461767d1ace2b252c0f20f3 8u5-b03
 423cf238579d6106c07601f635575e4c479f5183 8.0-b123
+399f574b5ab82d850cf9c3251caa532a2a063354 8u20-m1
 33ba3a542f629d03d15fbe866f391959b67c6dbc 8u5-b04
 5fe28c321c0982b4afd53208531368ef84fe1998 8u5-b05
 016050dbe49b99dc19cf8f92cfb1625f80835e6e 8u5-b06
@@ -123,14 +124,21 @@
 b26eb0be433ef84f895923d170b6aad396b4e054 8.0-b126
 ab4da0281165cd1a566e7be6a608a1aa64b6e529 8.0-b127
 9eb5b65d3caa9ceb1cecae865a15f5e038eb6a3c 8.0-b128
+37953435bd98584c5d7df9cbff204e413e3d2416 8u20-b01
 f965060d0af2852df8815a06e19e4a52b671b890 8u5-b07
 63bcbc815b29aa4b337e9e72b95bbd20a06acb63 8.0-b129
+c76228c951d0dc98fe819a51e4b716eece6cbedf 8u20-b02
+590f14cdb1af145550ac59ca7cf65f2c257b8df2 8u20-b03
+4742b5a6eb9b846154c2089d0e65a058a58a3454 8u20-b04
 96e9ffc57e1783903fa9eb90f9fb913031f97d6b 8u5-b08
 4cf678003f657d2780966ffc6b448145131d1880 8u5-b09
 c3e31d597cf5aefceb2f088bc4e9fcd295ceb001 8u5-b10
 b8d6295f467255c28b71962f24d8281a3a8d0f71 8.0-b130
 4ef7286b926695a1baedec535d614cd634fc8828 8.0-b131
 e2fd0ac9762bd70a6db7f4a50c0c440371546ac8 8.0-b132
+f00f65d8ca59d796eaa6b796fe4b948437e6516b 8u20-b05
+c7f043d40430549d9cc4ae5d4f3da42fccb14649 8u20-b06
+eee373287ad87a5604f4310fa2c714cf04909399 8u20-b07
 322eef9ee91216cf6904d9ef13b857b5770db5f0 8u5-b11
 32bf1d506829f6cf080c1b26208e08e76e553292 8u5-b12
 619edda5595cc54b5dd1f40131abe123ba180b04 8u5-b13
@@ -138,7 +146,13 @@
 9b4e7bf75dcf8e85ef7193d49d324859f3105fca 8u11-b02
 0c7886b87d6a0210d399a70bcb4d318f90b035ba 8u11-b03
 c5a09fa0a5fa99338ade1c1823919a577f29f1d0 8u11-b04
+d7e80f499365af8cca1ec29443fc9adb5aad598f 8u20-b08
+4e6e6ad7ad1dc350d9590ba8c0f9ab90aa6c73e0 8u20-b09
+3438cbe3ac87e05ac434f521dec1031145b1edfd 8u20-b10
+685555d888600419d4ed90a49c5f53dd0fd51f31 8u20-b11
 4ea3d1288e0758d55f9df08963fc44399f42d714 8u11-b05
+38c1ea45f8be2fc62b9eaefc4e37a21bb394a002 8u20-b12
 3a4c5c6fe2f19404f36d3c49dcdecf365623408d 8u11-b06
+abc855ae09c05e73558e37174ae6b9c74bcb10d8 8u20-b13
 ede0ed1b9adc5cddd817e2a8589c665646069a8d 8u11-b07
 fad363ad75526effb93ac79e64f6d7d7d89b1593 8u11-b08
--- a/.idea/3DViewer.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/3DViewer.iml	Sat May 17 06:12:58 2014 -0700
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/apps/experiments/3DViewer/build/libs/3DViewer.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/apps/samples/3DViewer/build/libs/3DViewer.jar!/" />
     <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/apps/experiments/3DViewer/src/main/java" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/apps/experiments/3DViewer/src/test/java" expected_position="1" />
-      <src_folder value="file://$MODULE_DIR$/apps/experiments/3DViewer/src/main/resources" expected_position="2" />
-      <src_folder value="file://$MODULE_DIR$/apps/experiments/3DViewer/src/test/resources" expected_position="3" />
+      <src_folder value="file://$MODULE_DIR$/apps/samples/3DViewer/src/main/java" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/apps/samples/3DViewer/src/test/java" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/apps/samples/3DViewer/src/main/resources" expected_position="2" />
+      <src_folder value="file://$MODULE_DIR$/apps/samples/3DViewer/src/test/resources" expected_position="3" />
     </src_description>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/apps/experiments/3DViewer">
-      <sourceFolder url="file://$MODULE_DIR$/apps/experiments/3DViewer/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/experiments/3DViewer/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/experiments/3DViewer/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/experiments/3DViewer/src/test/resources" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/apps/experiments/3DViewer/build" />
+    <content url="file://$MODULE_DIR$/apps/samples/3DViewer">
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/3DViewer/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/3DViewer/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/3DViewer/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/3DViewer/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/apps/samples/3DViewer/build" />
+      <excludeFolder url="file://$MODULE_DIR$/apps/samples/3DViewer/nbproject" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="3DViewer.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/apps/experiments/3DViewer/build/libs/3DViewer.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="builders" />
   </component>
 </module>
 
--- a/.idea/Ensemble8.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/Ensemble8.iml	Sat May 17 06:12:58 2014 -0700
@@ -24,8 +24,19 @@
       <sourceFolder url="file://$MODULE_DIR$/apps/samples/Ensemble8/src/generated/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/apps/samples/Ensemble8/src/generated/resources" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/apps/samples/Ensemble8/build" />
+      <excludeFolder url="file://$MODULE_DIR$/apps/samples/Ensemble8/nbproject" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="rt" />
+    <orderEntry type="module-library">
+      <library name="lucene-grouping-3.2.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/apps/samples/Ensemble8/lib/lucene-grouping-3.2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library name="lucene-core-3.2.0.jar">
         <CLASSES>
@@ -36,18 +47,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="lucene-grouping-3.2.0.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/apps/samples/Ensemble8/lib/lucene-grouping-3.2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="rt" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="builders" />
-    <orderEntry type="module-library">
       <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../caches/sdk/rt/lib/ext/jfxrt.jar!/" />
@@ -56,6 +55,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="inheritedJdk" />
   </component>
 </module>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/FX8-3DFeatures.iml	Sat May 17 06:12:58 2014 -0700
@@ -0,0 +1,13 @@
+<?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$/apps/toys/FX8-3DFeatures">
+      <sourceFolder url="file://$MODULE_DIR$/apps/toys/FX8-3DFeatures/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="rt" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/FXSlideShow.iml	Sat May 17 06:12:58 2014 -0700
@@ -0,0 +1,14 @@
+<?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$/apps/toys/FXSlideShow">
+      <sourceFolder url="file://$MODULE_DIR$/apps/toys/FXSlideShow/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/apps/toys/FXSlideShow/nbproject" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="rt" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+
--- a/.idea/GraphicsPerformance.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/GraphicsPerformance.iml	Sat May 17 06:12:58 2014 -0700
@@ -7,11 +7,6 @@
       <sourceFolder url="file://$MODULE_DIR$/apps/performance/GraphicsPerformance/src/main/resources" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="controls" />
-    <orderEntry type="module" module-name="fxml" />
-    <orderEntry type="module" module-name="fxpackager" />
-    <orderEntry type="module" module-name="graphics" />
     <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
   </component>
--- a/.idea/Hello.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/Hello.iml	Sat May 17 06:12:58 2014 -0700
@@ -6,14 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/apps/toys/Hello/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="controls" />
-    <orderEntry type="module" module-name="fxml" />
-    <orderEntry type="module" module-name="graphics" />
-    <orderEntry type="module" module-name="media" />
-    <orderEntry type="module" module-name="swing" />
-    <orderEntry type="module" module-name="swt" />
-    <orderEntry type="module" module-name="web" />
+    <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/MandelbrotSet.iml	Sat May 17 06:12:58 2014 -0700
@@ -0,0 +1,14 @@
+<?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$/apps/samples/MandelbrotSet">
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/MandelbrotSet/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/apps/samples/MandelbrotSet/nbproject" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="rt" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+
--- a/.idea/Modena.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/Modena.iml	Sat May 17 06:12:58 2014 -0700
@@ -2,10 +2,10 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/apps/experiments/Modena">
-      <sourceFolder url="file://$MODULE_DIR$/apps/experiments/Modena/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/experiments/Modena/src/main/resources" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/apps/experiments/Modena/build" />
+    <content url="file://$MODULE_DIR$/apps/samples/Modena">
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/Modena/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/apps/samples/Modena/src/main/resources" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/apps/samples/Modena/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="rt" />
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/SceneBuilderApp.iml	Sat May 17 06:12:58 2014 -0700
@@ -0,0 +1,14 @@
+<?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$/apps/scenebuilder/SceneBuilderApp">
+      <sourceFolder url="file://$MODULE_DIR$/apps/scenebuilder/SceneBuilderApp/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="rt" />
+    <orderEntry type="module" module-name="SceneBuilderKit" />
+  </component>
+</module>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/SceneBuilderKit.iml	Sat May 17 06:12:58 2014 -0700
@@ -0,0 +1,13 @@
+<?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$/apps/scenebuilder/SceneBuilderKit">
+      <sourceFolder url="file://$MODULE_DIR$/apps/scenebuilder/SceneBuilderKit/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="rt" />
+  </component>
+</module>
+
--- a/.idea/Shape3DToy.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/Shape3DToy.iml	Sat May 17 06:12:58 2014 -0700
@@ -7,14 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/apps/toys/Shape3DToy/src/main/resources" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="controls" />
-    <orderEntry type="module" module-name="fxml" />
-    <orderEntry type="module" module-name="graphics" />
-    <orderEntry type="module" module-name="media" />
-    <orderEntry type="module" module-name="swing" />
-    <orderEntry type="module" module-name="swt" />
-    <orderEntry type="module" module-name="web" />
+    <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
--- a/.idea/StretchyGrid.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/StretchyGrid.iml	Sat May 17 06:12:58 2014 -0700
@@ -6,8 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/apps/toys/StretchyGrid/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="graphics" />
+    <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
--- a/.idea/SystemTests.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/SystemTests.iml	Sat May 17 06:12:58 2014 -0700
@@ -5,17 +5,10 @@
     <content url="file://$MODULE_DIR$/tests/system">
       <sourceFolder url="file://$MODULE_DIR$/tests/system/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests/system/src/test/resources" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/tests/system/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="buildSrc" />
-    <orderEntry type="module" module-name="controls" />
-    <orderEntry type="module" module-name="fxml" />
-    <orderEntry type="module" module-name="graphics" />
-    <orderEntry type="module" module-name="media" />
-    <orderEntry type="module" module-name="swing" />
-    <orderEntry type="module" module-name="swt" />
-    <orderEntry type="module" module-name="web" />
+    <orderEntry type="module" module-name="rt" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
--- a/.idea/base.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/base.iml	Sat May 17 06:12:58 2014 -0700
@@ -5,9 +5,11 @@
     <content url="file://$MODULE_DIR$/modules/base">
       <sourceFolder url="file://$MODULE_DIR$/modules/base/build/generated-src/version-info" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/base/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/base/src/main/java8" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/base/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/base/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/base/src/test/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/base/src/main/java-jfr" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/modules/base/build/classes" />
       <excludeFolder url="file://$MODULE_DIR$/modules/base/build/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/modules/base/build/libs" />
--- a/.idea/buildSrc.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/buildSrc.iml	Sat May 17 06:12:58 2014 -0700
@@ -83,6 +83,16 @@
       </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>
   </component>
 </module>
 
--- a/.idea/codeStyleSettings.xml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/codeStyleSettings.xml	Sat May 17 06:12:58 2014 -0700
@@ -8,6 +8,7 @@
         </XML>
       </value>
     </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
   </component>
 </project>
 
--- a/.idea/controls.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/controls.iml	Sat May 17 06:12:58 2014 -0700
@@ -7,7 +7,11 @@
       <sourceFolder url="file://$MODULE_DIR$/modules/controls/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/modules/controls/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/modules/controls/src/test/resources" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/modules/controls/build" />
+      <sourceFolder url="file://$MODULE_DIR$/modules/controls/build/resources/main" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/controls/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/controls/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/controls/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/modules/controls/build/reports" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="base" exported="" />
--- a/.idea/deploy.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/deploy.iml	Sat May 17 06:12:58 2014 -0700
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/../deploy/cache/plugin_exports.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../deploy/cache/plugin.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../deploy/cache/deploy.jar!/" />
     <src_description expected_position="0">
       <src_folder value="file://$MODULE_DIR$/../deploy/lib" expected_position="0" />
       <src_folder value="file://$MODULE_DIR$/../deploy/javafx-deploy/src" expected_position="1" />
@@ -16,29 +17,29 @@
       <sourceFolder url="file://$MODULE_DIR$/../deploy/javafx-deploy/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../deploy/javafx-deploy-samples/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../deploy/javafx-launcher-demoapp/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/../deploy/javafx-deploy-samples/src/helloworld" />
+      <sourceFolder url="file://$MODULE_DIR$/../deploy/javafx-deploy/test" isTestSource="true" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library name="plugin_exports.jar">
+    <orderEntry type="module" module-name="rt" />
+    <orderEntry type="module-library">
+      <library name="plugin.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../deploy/cache/plugin_exports.jar!/" />
+          <root url="jar://$MODULE_DIR$/../deploy/cache/plugin.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="rt" exported="" />
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="module-library">
-      <library>
+      <library name="deploy.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../caches/sdk/rt/lib/ext/jfxrt.jar!/" />
+          <root url="jar://$MODULE_DIR$/../deploy/cache/deploy.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="inheritedJdk" />
   </component>
 </module>
 
--- a/.idea/fxpackager.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/fxpackager.iml	Sat May 17 06:12:58 2014 -0700
@@ -5,6 +5,8 @@
     <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" />
       <excludeFolder url="file://$MODULE_DIR$/modules/fxpackager/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
--- a/.idea/gradle.xml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/gradle.xml	Sat May 17 06:12:58 2014 -0700
@@ -1,9 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedProjectPath" value="" />
-    <option name="preferLocalInstallationToWrapper" value="true" />
-    <option name="useAutoImport" value="false" />
-  </component>
-</project>
+<project version="4" />
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/hamcrest_core_1_3.xml	Sat May 17 06:12:58 2014 -0700
@@ -0,0 +1,10 @@
+<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/modules.xml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/modules.xml	Sat May 17 06:12:58 2014 -0700
@@ -4,9 +4,14 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/3DViewer.iml" filepath="$PROJECT_DIR$/.idea/3DViewer.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/Ensemble8.iml" filepath="$PROJECT_DIR$/.idea/Ensemble8.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/FX8-3DFeatures.iml" filepath="$PROJECT_DIR$/.idea/FX8-3DFeatures.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/FXSlideShow.iml" filepath="$PROJECT_DIR$/.idea/FXSlideShow.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/GraphicsPerformance.iml" filepath="$PROJECT_DIR$/.idea/GraphicsPerformance.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/Hello.iml" filepath="$PROJECT_DIR$/.idea/Hello.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/MandelbrotSet.iml" filepath="$PROJECT_DIR$/.idea/MandelbrotSet.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/Modena.iml" filepath="$PROJECT_DIR$/.idea/Modena.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/SceneBuilderApp.iml" filepath="$PROJECT_DIR$/.idea/SceneBuilderApp.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/SceneBuilderKit.iml" filepath="$PROJECT_DIR$/.idea/SceneBuilderKit.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/Shape3DToy.iml" filepath="$PROJECT_DIR$/.idea/Shape3DToy.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/StretchyGrid.iml" filepath="$PROJECT_DIR$/.idea/StretchyGrid.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/SystemTests.iml" filepath="$PROJECT_DIR$/.idea/SystemTests.iml" />
--- a/.idea/rt-closed.iml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/rt-closed.iml	Sat May 17 06:12:58 2014 -0700
@@ -1,81 +1,140 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/../caches/sdk/build/lib/desktop/jfxmedia.jar!/" />
-    <libelement value="file://../caches/sdk/build/lib/desktop/deploy.jar" />
-    <libelement value="jar://$MODULE_DIR$/../import/swt-3.7.1/swt-debug.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../import/benchmarks-2.1.1/benchmarks-2.1.1.jar!/" />
     <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/benchmark/VMPerformance/src" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/glass/glass-test/test" expected_position="1" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/glass/UseCases/src" expected_position="2" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-android/webnode/src" expected_position="3" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-font-t2k/src" expected_position="4" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-ios/src" expected_position="5" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-mx-common/src" expected_position="6" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-mx-impl/src" expected_position="7" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-mx-impl/test/unit" expected_position="8" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-ui-desktop/src" expected_position="9" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/porting/src" expected_position="10" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/prism-bench/src" expected_position="11" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/ES2NativeTest/test" expected_position="12" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/GetWindowsTest/test" expected_position="13" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/LoaderDisposeTest/test" expected_position="14" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/src" expected_position="15" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/test" expected_position="16" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/BlendTest/src" expected_position="17" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/CameraTests/src" expected_position="18" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/CanvasTest/src" expected_position="19" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/ColorCube/src" expected_position="20" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/CursorFXTest/src" expected_position="21" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DirectoryBrowser/src" expected_position="22" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DragDropColor/src" expected_position="23" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DragDropText/src" expected_position="24" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DragDropWithControls/src" expected_position="25" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/EarthCubeFX2/src" expected_position="26" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/EmbeddedSwing/src" expected_position="27" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/FX8-3DAPI/src" expected_position="28" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/GlassRobotTest/src" expected_position="29" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/Gradients/src" expected_position="30" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/GridExamples/src" expected_position="31" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/HelloFXCanvas/src" expected_position="32" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/HelloWorld/src" expected_position="33" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/LinuxInputTest/src" expected_position="34" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/LinuxInputTest/test" expected_position="35" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/NodeBlendTests/src" expected_position="36" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/PickTest3D/src" expected_position="37" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SceneLeak/src" expected_position="38" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/ShapeT3DTest/src" expected_position="39" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SwingBalls/src" expected_position="40" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SwingBalls/css" expected_position="41" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SwingNodeMark/src" expected_position="42" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/TextTest/src" expected_position="43" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/TouchSuite/src" expected_position="44" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/VideoCube/src" expected_position="45" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/Visual3DTest/src" expected_position="46" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/WebLauncher/src" expected_position="47" />
-      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/ZBufferTest/src" expected_position="48" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/glass/glass-test/test" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/glass/UseCases/src" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/javafx-font-t2k/src" expected_position="2" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/BenchShapes/src" expected_position="3" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/Charts/src" expected_position="4" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/ColorfulShapes/src" expected_position="5" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/Controls/src" expected_position="6" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/DirtyArea/src" expected_position="7" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/embedded/ui-performance/src" expected_position="8" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/Fire/src" expected_position="9" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/FXBenchmark/src" expected_position="10" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/FXTester/src" expected_position="11" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/GUIMark2/src" expected_position="12" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/GUIMark2-SE/src" expected_position="13" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/GUIMark3/src" expected_position="14" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/LayoutTest/src" expected_position="15" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/ListView/src" expected_position="16" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/MediaSystemTest/src" expected_position="17" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/MouseResponseTest/src" expected_position="18" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/NodeMemory/src" expected_position="19" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/SDKSizeAnalyzer/src" expected_position="20" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/SpiralText/src" expected_position="21" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/Surface/src" expected_position="22" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/performance/WebNodeTestSuite/src" expected_position="23" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/porting/src" expected_position="24" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/prism-bench/src" expected_position="25" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/prism-bench/options" expected_position="26" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/DragOverTest/src" expected_position="27" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/ES2NativeTest/test" expected_position="28" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/EvilFXApplet/src" expected_position="29" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/FullScreen/FullScreenHelper/src" expected_position="30" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/FullScreen/FullScreenRunner/src" expected_position="31" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/FullScreen/FullScreenTest/src" expected_position="32" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/FXMLDefaultClassLoader/test" expected_position="33" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/GetWindowsTest/test" expected_position="34" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/LoaderDisposeTest/test" expected_position="35" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/src" expected_position="36" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/test" expected_position="37" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/mediafiles" expected_position="38" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/NativeHandleTest/test" expected_position="39" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/PulseCallbackHelper/src" expected_position="40" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/PulseCallbackTest/test" expected_position="41" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/SandboxedClipboardTest/test" expected_position="42" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/ServiceHelper/src" expected_position="43" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/ServiceTest/test" expected_position="44" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/TestUtils/src" expected_position="45" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/tests/security/TransparentWindowsTest/test" expected_position="46" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/a11y/src" expected_position="47" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/BlendTest/src" expected_position="48" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/CameraTests/src" expected_position="49" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/CanvasTest/src" expected_position="50" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/ColorCube/src" expected_position="51" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/CursorFXTest/src" expected_position="52" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DirectoryBrowser/src" expected_position="53" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DragDropColor/src" expected_position="54" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DragDropText/src" expected_position="55" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/DragDropWithControls/src" expected_position="56" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/EarthCubeFX2/src" expected_position="57" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/EmbeddedSwing/src" expected_position="58" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/FX8-3DAPI/src" expected_position="59" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/GlassRobotTest/src" expected_position="60" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/Gradients/src" expected_position="61" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/GridExamples/src" expected_position="62" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/HelloBenchmark/perf" expected_position="63" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/HelloFXCanvas/src" expected_position="64" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/HelloWorld/src" expected_position="65" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/NodeBlendTests/src" expected_position="66" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/PickTest3D/src" expected_position="67" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SceneLeak/src" expected_position="68" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/ShapeT3DTest/src" expected_position="69" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SwingBalls/src" expected_position="70" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SwingBalls/css" expected_position="71" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/SwingNodeMark/src" expected_position="72" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/TextTest/src" expected_position="73" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/TouchSuite/src" expected_position="74" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/VideoCube/src" expected_position="75" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/Visual3DTest/src" expected_position="76" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/WebLauncher/src" expected_position="77" />
+      <src_folder value="file://$MODULE_DIR$/../rt-closed/toys/ZBufferTest/src" expected_position="78" />
     </src_description>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <output url="file://$MODULE_DIR$/../rt-closed/bin" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../rt-closed">
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/benchmark/VMPerformance/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/glass/glass-test/test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/glass/UseCases/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-android/webnode/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-font-t2k/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-ios/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-mx-common/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-mx-impl/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-mx-impl/test/unit" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/javafx-ui-desktop/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/BenchShapes/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/Charts/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/ColorfulShapes/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/Controls/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/DirtyArea/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/embedded/ui-performance/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/Fire/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/FXBenchmark/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/FXTester/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/GUIMark2/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/GUIMark2-SE/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/GUIMark3/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/LayoutTest/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/ListView/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/MediaSystemTest/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/MouseResponseTest/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/NodeMemory/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/SDKSizeAnalyzer/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/SpiralText/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/Surface/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/performance/WebNodeTestSuite/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/porting/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/prism-bench/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/prism-bench/options" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/DragOverTest/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/ES2NativeTest/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/EvilFXApplet/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/FullScreen/FullScreenHelper/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/FullScreen/FullScreenRunner/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/FullScreen/FullScreenTest/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/FXMLDefaultClassLoader/test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/GetWindowsTest/test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/LoaderDisposeTest/test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/MediaFuzzing/mediafiles" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/NativeHandleTest/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/PulseCallbackHelper/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/PulseCallbackTest/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/SandboxedClipboardTest/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/ServiceHelper/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/ServiceTest/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/TestUtils/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/tests/security/TransparentWindowsTest/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/a11y/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/BlendTest/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/CameraTests/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/CanvasTest/src" isTestSource="false" />
@@ -91,10 +150,9 @@
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/GlassRobotTest/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/Gradients/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/GridExamples/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/HelloBenchmark/perf" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/HelloFXCanvas/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/HelloWorld/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/LinuxInputTest/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/LinuxInputTest/test" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/NodeBlendTests/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/PickTest3D/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/SceneLeak/src" isTestSource="false" />
@@ -108,12 +166,29 @@
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/Visual3DTest/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/WebLauncher/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../rt-closed/toys/ZBufferTest/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/../rt-closed/javafx-android" />
+      <sourceFolder url="file://$MODULE_DIR$/../rt-closed/glass/glass-test/test" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="deploy" exported="" />
     <orderEntry type="module" module-name="rt" exported="" />
+    <orderEntry type="module-library">
+      <library name="benchmarks-2.1.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../import/benchmarks-2.1.1/benchmarks-2.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </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>
   </component>
 </module>
 
--- a/.idea/vcs.xml	Tue May 13 07:59:22 2014 -0700
+++ b/.idea/vcs.xml	Sat May 17 06:12:58 2014 -0700
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="VcsDirectoryMappings">