changeset 6452:49a29c9d82a9

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8.0/MASTER/jfx/rt
author kcr
date Fri, 07 Mar 2014 16:20:21 -0800
parents f89b7dc932af 77d9f9491a0e
children f00f65d8ca59
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 modules/base/src/main/java/javafx/collections/ObservableList.java modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/Bundler.java modules/fxpackager/src/main/man/ja_JP.UTF-8/html/javafxpackager.html 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/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
diffstat 1432 files changed, 201675 insertions(+), 150489 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 04 10:36:33 2014 -0800
+++ b/.hgtags	Fri Mar 07 16:20:21 2014 -0800
@@ -112,12 +112,17 @@
 0551a6164a238c98d661e1be2d9937e5116511f9 8.0-b121
 dd789066e61e601bb4e5f8cc0ec5d185d58781e4 8.0-b122
 423cf238579d6106c07601f635575e4c479f5183 8.0-b123
+399f574b5ab82d850cf9c3251caa532a2a063354 8u20-m1
 8d28332831a489bca04e6f9e2fdae2c0b69f11ad 8.0-b124
 3e1c456afa4cd4ada6baddafa8a22b67b39a8659 8.0-b125
 b26eb0be433ef84f895923d170b6aad396b4e054 8.0-b126
 ab4da0281165cd1a566e7be6a608a1aa64b6e529 8.0-b127
 9eb5b65d3caa9ceb1cecae865a15f5e038eb6a3c 8.0-b128
+37953435bd98584c5d7df9cbff204e413e3d2416 8u20-b01
 63bcbc815b29aa4b337e9e72b95bbd20a06acb63 8.0-b129
+c76228c951d0dc98fe819a51e4b716eece6cbedf 8u20-b02
+590f14cdb1af145550ac59ca7cf65f2c257b8df2 8u20-b03
+4742b5a6eb9b846154c2089d0e65a058a58a3454 8u20-b04
 b8d6295f467255c28b71962f24d8281a3a8d0f71 8.0-b130
 4ef7286b926695a1baedec535d614cd634fc8828 8.0-b131
 e2fd0ac9762bd70a6db7f4a50c0c440371546ac8 8.0-b132
--- a/.idea/3DViewer.iml	Tue Mar 04 10:36:33 2014 -0800
+++ b/.idea/3DViewer.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/Ensemble8.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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	Fri Mar 07 16:20:21 2014 -0800
@@ -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	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/GraphicsPerformance.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/Hello.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/Modena.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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	Fri Mar 07 16:20:21 2014 -0800
@@ -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	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/Shape3DToy.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/StretchyGrid.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/SystemTests.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/base.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -5,6 +5,7 @@
     <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" />
--- a/.idea/codeStyleSettings.xml	Tue Mar 04 10:36:33 2014 -0800
+++ b/.idea/codeStyleSettings.xml	Fri Mar 07 16:20:21 2014 -0800
@@ -8,6 +8,7 @@
         </XML>
       </value>
     </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
   </component>
 </project>
 
--- a/.idea/fxpackager.iml	Tue Mar 04 10:36:33 2014 -0800
+++ b/.idea/fxpackager.iml	Fri Mar 07 16:20:21 2014 -0800
@@ -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 Mar 04 10:36:33 2014 -0800
+++ b/.idea/gradle.xml	Fri Mar 07 16:20:21 2014 -0800
@@ -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" />
 
--- a/.idea/modules.xml	Tue Mar 04 10:36:33 2014 -0800
+++ b/.idea/modules.xml	Fri Mar 07 16:20:21 2014 -0800
@@ -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/vcs.xml	Tue Mar 04 10:36:33 2014 -0800
+++ b/.idea/vcs.xml	Fri Mar 07 16:20:21 2014 -0800
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="" />
-    <mapping directory="$PROJECT_DIR$/../../deploy" vcs="hg4idea" />
+    <mapping directory="$PROJECT_DIR$/../deploy" vcs="hg4idea" />
     <mapping directory="$PROJECT_DIR$" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/../../rt-closed" vcs="hg4idea" />
+    <mapping directory="$PROJECT_DIR$/../rt-closed" vcs="hg4idea" />
   </component>
 </project>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/experiments/.classpath	Fri Mar 07 16:20:21 2014 -0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <!--
+    <classpathentry kind="src" path="Chess/ChessLibrary/src/main/java"/>
+    -->
+    <classpathentry combineaccessrules="false" kind="src" path="/rt">
+      <attributes>
+        <attribute name="optional" value="true"/>
+      </attributes>
+    </classpathentry>
+    <classpathentry kind="output" path="bin"/>
+</classpath>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/experiments/.project	Fri Mar 07 16:20:21 2014 -0800
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>experiments</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/apps/experiments/3DViewer/.classpath	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/rt">
-	<attributes>
-		<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
--- a/apps/experiments/3DViewer/.idea/.name	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3DViewer
\ No newline at end of file
--- a/apps/experiments/3DViewer/.idea/compiler.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
--- a/apps/experiments/3DViewer/.idea/copyright/profiles_settings.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
-  </settings>
-</component>
\ No newline at end of file
--- a/apps/experiments/3DViewer/.idea/encodings.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
--- a/apps/experiments/3DViewer/.idea/misc.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
-
--- a/apps/experiments/3DViewer/.idea/modules.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/3DViewer.iml" filepath="$PROJECT_DIR$/3DViewer.iml" />
-    </modules>
-  </component>
-</project>
-
--- a/apps/experiments/3DViewer/.idea/runConfigurations/3DViewer.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="3DViewer" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="com.javafx.experiments.jfx3dviewer.Jfx3dViewerApp" />
-    <option name="VM_PARAMETERS" value="-Dprism.verbose=true" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="3DViewer" />
-    <envs />
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
--- a/apps/experiments/3DViewer/.idea/scopes/scope_settings.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
--- a/apps/experiments/3DViewer/.idea/vcs.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="hg4idea" />
-  </component>
-</project>
-
--- a/apps/experiments/3DViewer/.project	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>3DViewer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
--- a/apps/experiments/3DViewer/3DViewer.iml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?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/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/nbproject" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
--- a/apps/experiments/3DViewer/build.gradle	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-
-apply plugin:'application'
-
-mainClassName = "com.javafx.experiments.jfx3dviewer.Jfx3dViewerApp"
-
-jar {
-    manifest.attributes("Main-Class": mainClassName)
-}
--- a/apps/experiments/3DViewer/build.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="3DViewer" default="default" basedir=".">
-    <description>Builds, tests, and runs the project 3DViewer.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="3DViewer-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-
-    <target name="-pre-init">
-        <!-- exclude samples that are not part of the base JavaFX -->
-        <condition property="excludes" value="com/javafx/experiments/height2normal/Height2NormalApp.java">
-            <isset property="JFX_CORE_ONLY"/>
-        </condition>
-    </target>
-
-    <target name="install-to-maven-repo" depends="jar">
-        <property name="maven.home" location="${ant.home}\..\maven"/>
-        <macrodef name="maven">
-            <attribute name="options" default="" />
-            <attribute name="goal" />
-            <attribute name="basedir" />
-            <attribute name="resultproperty" default="maven.result" />
-            <element name="args" implicit="true" optional="true" />
-            <sequential>
-                <java classname="org.codehaus.classworlds.Launcher" fork="true"
-                      dir="@{basedir}" resultproperty="@{resultproperty}">
-                    <jvmarg value="-Xmx512m"/>
-                    <classpath>
-                        <fileset dir="${maven.home}/boot">
-                            <include name="*.jar" />
-                        </fileset>
-                        <fileset dir="${maven.home}/lib">
-                            <include name="*.jar" />
-                        </fileset>
-                    </classpath>
-                    <sysproperty key="classworlds.conf" value="${maven.home}/bin/m2.conf" />
-                    <sysproperty key="maven.home" value="${maven.home}" />
-                    <arg line="--batch-mode @{options} @{goal}" />
-                </java>
-            </sequential>
-        </macrodef>
-        <maven basedir="${basedir}"
-             options="-Dfile=${dist.jar} -DgroupId=com.oracle.javafx.experiments -DartifactId=3DViewer -Dversion=1.0-SNAPSHOT -Dpackaging=jar"
-             goal="install:install-file"
-             resultproperty="maven.build.result"/>
-    </target>
-</project>
--- a/apps/experiments/3DViewer/manifest.mf	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
--- a/apps/experiments/3DViewer/nbproject/build-impl.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1416 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="3DViewer-impl">
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="profile.available">
-            <and>
-                <isset property="javac.profile"/>
-                <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+profile.available">
-            <and>
-                <isset property="profile.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.java.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.java.dir}"/>
-                <available file="${src.resources.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <and>
-                <isset property="endorsed.classpath"/>
-                <not>
-                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-            <isset property="profile.available"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <property name="copylibs.rebase" value="true"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.java.dir">Must set src.java.dir</fail>
-        <fail unless="src.resources.dir">Must set src.resources.dir</fail>
-        <fail unless="test.java.dir">Must set test.java.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.java.dir}:${src.resources.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.java.dir}:${src.resources.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.java.dir}:${src.resources.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-init-test-properties">
-        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-        <property name="test.binarytestincludes" value=""/>
-        <property name="test.binaryexcludes" value=""/>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.java.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.java.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="3DViewer" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.java.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename 3DViewer -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: 3DViewer was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.java.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.java.dir}:${src.resources.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="Profile" value="${javac.profile}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-            <isset property="main.class.available"/>
-        </condition>
-        <condition else="debug" property="jar.usage.level" value="info">
-            <isset property="main.class.available"/>
-        </condition>
-        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-    </target>
-    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcal target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.java.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.resources.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.java.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                TEST COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.java.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.java.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.java.dir}" srcdir="${test.java.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                TEST EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-    <!--
-                =======================
-                TEST DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: 3DViewer was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
--- a/apps/experiments/3DViewer/nbproject/genfiles.properties	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=053bf8d6
-build.xml.script.CRC32=0419b6b5
-build.xml.stylesheet.CRC32=28e38971@1.56.1.46
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=053bf8d6
-nbproject/build-impl.xml.script.CRC32=07a39b29
-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
--- a/apps/experiments/3DViewer/nbproject/project.properties	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=3DViewer
-application.vendor=Oracle
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/3DViewer.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-jfxbuild.jfxrt.jar=
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${jfxbuild.jfxrt.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=com.javafx.experiments.jfx3dviewer.Jfx3dViewerApp
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=-Djava.ext.dirs= 
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.java.dir=src/main/java
-src.resources.dir=src/main/resources
-test.java.dir=src/test/java
--- a/apps/experiments/3DViewer/nbproject/project.xml	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>3DViewer</name>
-            <explicit-platform explicit-source-supported="true"/>
-            <source-roots>
-                <root id="src.java.dir"/>
-                <root id="src.resources.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.java.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/exporters/fxml/FXMLExporter.java	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.javafx.experiments.exporters.fxml;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.collections.ObservableArray;
-import javafx.geometry.Point3D;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.Box;
-import javafx.scene.shape.MeshView;
-import javafx.scene.shape.Shape3D;
-import javafx.scene.shape.TriangleMesh;
-import javafx.scene.transform.Affine;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-
-/** Export a 3D MeshView to FXML file. */
-public class FXMLExporter {
-
-    private PrintWriter printWriter;
-    private Set<String> imports = new TreeSet<>();
-    private Map<String, String> simpleNames = new HashMap<>();
-
-    public FXMLExporter(String filename) {
-        File file = new File(filename);
-        try {
-            printWriter = new PrintWriter(file);
-            System.out.println("Saving FMXL to " + file.getAbsolutePath());
-        } catch (FileNotFoundException ex) {
-            throw new RuntimeException("Failed to export FXML to " + file.getAbsolutePath(), ex);
-        }
-    }
-
-    public FXMLExporter(OutputStream outputStream) {
-        printWriter = new PrintWriter(outputStream);
-    }
-
-    public void export(Node node) {
-        printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-        FXML fxmlTree = exportToFXML(node);
-        for (String importString : imports) {
-            printWriter.println("<?import " + importString + ".*?>");
-        }
-        printWriter.println();
-        fxmlTree.export("");
-        printWriter.close();
-    }
-
-    private List<Property> getProperties(Class aClass) {
-        List<Property> res = new ArrayList<>();
-        try {
-            if (Point3D.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getX"), "x"));
-                res.add(new Property(aClass.getMethod("getY"), "y"));
-                res.add(new Property(aClass.getMethod("getZ"), "z"));
-            }
-            if (Translate.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getX"), "x"));
-                res.add(new Property(aClass.getMethod("getY"), "y"));
-                res.add(new Property(aClass.getMethod("getZ"), "z"));
-            }
-            if (Rotate.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getAngle"), "angle"));
-                res.add(new Property(aClass.getMethod("getAxis"), "axis"));
-            }
-            if (Affine.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getMxx"), "mxx"));
-                res.add(new Property(aClass.getMethod("getMxy"), "mxy"));
-                res.add(new Property(aClass.getMethod("getMxz"), "mxz"));
-                res.add(new Property(aClass.getMethod("getMyx"), "myx"));
-                res.add(new Property(aClass.getMethod("getMyy"), "myy"));
-                res.add(new Property(aClass.getMethod("getMyz"), "myz"));
-                res.add(new Property(aClass.getMethod("getMzx"), "mzx"));
-                res.add(new Property(aClass.getMethod("getMzy"), "mzy"));
-                res.add(new Property(aClass.getMethod("getMzz"), "mzz"));
-                res.add(new Property(aClass.getMethod("getTx"), "tx"));
-                res.add(new Property(aClass.getMethod("getTy"), "ty"));
-                res.add(new Property(aClass.getMethod("getTz"), "tz"));
-            }
-            if (PhongMaterial.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getDiffuseColor"), "diffuseColor"));
-            }
-            if (Node.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getId"), "id"));
-                res.add(new Property(aClass.getMethod("getTransforms"), "transforms"));
-            }
-            if (Parent.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getChildrenUnmodifiable"), "children"));
-            }
-            if (Shape3D.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getMaterial"), "material"));
-            }
-            if (Box.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getWidth"), "width"));
-                res.add(new Property(aClass.getMethod("getHeight"), "height"));
-                res.add(new Property(aClass.getMethod("getDepth"), "depth"));
-            }
-            if (MeshView.class.equals(aClass)) {
-                res.add(new Property(aClass.getMethod("getMesh"), "mesh"));
-            }
-            if (TriangleMesh.class.isAssignableFrom(aClass)) {
-                res.add(new Property(aClass.getMethod("getPoints"), "points"));
-                res.add(new Property(aClass.getMethod("getTexCoords"), "texCoords"));
-                res.add(new Property(aClass.getMethod("getFaces"), "faces"));
-                res.add(new Property(aClass.getMethod("getFaceSmoothingGroups"), "faceSmoothingGroups"));
-            }
-        } catch (NoSuchMethodException | SecurityException ex) {
-            Logger.getLogger(FXMLExporter.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return res;
-    }
-
-    private Map<Class, List<Property>> propertiesCache = new HashMap<>();
-
-    private class Property {
-        Method getter;
-        String name;
-
-        public Property(String name) {
-            this.name = name;
-        }
-
-        public Property(Method getter, String name) {
-            this.getter = getter;
-            this.name = name;
-        }
-    }
-
-    private FXML exportToFXML(Object object) {
-        if (object instanceof Transform && ((Transform) object).isIdentity()) {
-            return null;
-        }
-
-        FXML fxml = new FXML(object.getClass());
-
-        List<Property> properties = propertiesCache.get(object.getClass());
-        if (properties == null) {
-            properties = getProperties(object.getClass());
-            propertiesCache.put(object.getClass(), properties);
-        }
-
-        for (Property property : properties) {
-            try {
-                Object[] parameters = new Object[property.getter.getParameterTypes().length];
-                Object value = property.getter.invoke(object, parameters);
-                if (value != null) {
-                    if (value instanceof Collection) {
-                        Collection collection = (Collection) value;
-                        if (!collection.isEmpty()) {
-                            FXML container = fxml.addContainer(property.name);
-                            for (Object item : collection) {
-                                container.addChild(exportToFXML(item));
-                            }
-                        }
-                    } else if (value instanceof ObservableArray) {
-                        int length = ((ObservableArray) value).size();
-                        if (length > 0) {
-                            FXML container = fxml.addContainer(property.name);
-                            container.setValue(value);
-                        }
-                    } else if (property.getter.getReturnType().isPrimitive()
-                            || String.class.equals(value.getClass())
-                            || Color.class.equals(value.getClass())) {
-                        fxml.addProperty(property.name, String.valueOf(value));
-                    } else {
-                        FXML container = fxml.addContainer(property.name);
-                        container.addChild(exportToFXML(value));
-                    }
-                }
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
-                Logger.getLogger(FXMLExporter.class.getName()).
-                        log(Level.SEVERE, null, ex);
-            }
-        }
-
-        return fxml;
-    }
-
-    private class FXML {
-        private String tagName;
-        List<Entry> properties;
-        List<FXML> nested;
-        Object value;
-
-        private FXML addContainer(String containerTag) {
-            if (nested != null) {
-                for (FXML n : nested) {
-                    if (n.tagName.equals(containerTag)) {
-                        return n;
-                    }
-                }
-            }
-            FXML fxml = new FXML(containerTag);
-            addChild(fxml);
-            return fxml;
-        }
-
-        public FXML(String tagName) {
-            this.tagName = tagName;
-        }
-
-        public FXML(Class cls) {
-            String fullName = simpleNames.get(cls.getSimpleName());
-            if (fullName == null) {
-
-                // this short name is not used, so adding it to imports and
-                // to shortNames map
-                fullName = cls.getName();
-                imports.add(cls.getPackage().getName());
-                simpleNames.put(cls.getSimpleName(), fullName);
-                tagName = cls.getSimpleName();
-            } else if (!fullName.equals(cls.getName())) {
-
-                // short name is already used for some other class so we have
-                // to use full name
-                tagName = cls.getName();
-            } else {
-
-                // short name matches this class
-                tagName = cls.getSimpleName();
-            }
-        }
-
-        private class Entry {
-            String key;
-            String value;
-
-            public Entry(String key, String value) {
-                this.key = key;
-                this.value = value;
-            }
-        }
-
-        void setValue(Object value) {
-            this.value = value;
-        }
-
-        void addProperty(String key, String value) {
-            if (properties == null) {
-                properties = new ArrayList<>();
-            }
-            properties.add(new Entry(key, value));
-        }
-
-        void export(String indent) {
-            printWriter.append(indent).append('<').append(tagName);
-            if (properties != null) {
-                for (Entry entry : properties) {
-                    printWriter.append(' ').append(entry.key).append("=\"")
-                               .append(entry.value).append("\"");
-                }
-            }
-            if (nested != null || value != null) {
-                printWriter.append(">\n");
-                String indent1 = indent + "  ";
-                if (nested != null) {
-                    for (FXML fxml : nested) {
-                        fxml.export(indent1);
-                    }
-                }
-                if (value != null) {
-                    String toString;
-                    if (value instanceof ObservableArray) {
-                        toString = value.toString();
-                    } else {
-                        throw new UnsupportedOperationException("Only ObservableArrays are currently supported");
-                    }
-                    printWriter.append(indent1).append(toString.substring(1, toString.length() - 1)).append("\n");
-                }
-                printWriter.append(indent).append("</").append(tagName).append(">\n");
-            } else {
-                printWriter.append("/>\n");
-            }
-        }
-
-        private void addChild(FXML fxml) {
-            if (fxml == null) {
-                return;
-            }
-            if (nested == null) {
-                nested = new ArrayList<>();
-            }
-            nested.add(fxml);
-        }
-    }
-
-}
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,489 +0,0 @@
-/*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.javafx.experiments.exporters.javasource;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.value.WritableValue;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.image.Image;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.MeshView;
-import javafx.scene.shape.TriangleMesh;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Scale;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-import javafx.util.Duration;
-import com.javafx.experiments.importers.Optimizer;
-import com.javafx.experiments.importers.maya.MayaImporter;
-import com.sun.javafx.animation.TickCalculation;
-import com.sun.scenario.animation.NumberTangentInterpolator;
-import com.sun.scenario.animation.SplineInterpolator;
-
-/**
- * A exporter for 3D Models and animations that creates a Java Source file.
- */
-public class JavaSourceExporter {
-    private int nodeCount = 0;
-    private int materialCount = 0;
-    private int meshCount = 0;
-    private int meshViewCount = 0;
-    private int methodCount = 1;
-    private int translateCount = 0;
-    private int rotateCount = 0;
-    private int scaleCount = 0;
-    private Map<WritableValue,String> writableVarMap = new HashMap<>();
-    private StringBuilder nodeCode = new StringBuilder();
-    private StringBuilder timelineCode = new StringBuilder();
-    private final boolean hasTimeline;
-    private final String baseUrl;
-    private final String className;
-    private final String packageName;
-    private final File outputFile;
-
-    public JavaSourceExporter(String baseUrl, Node rootNode, Timeline timeline, File outputFile) {
-        this(baseUrl, rootNode, timeline,computePackageName(baseUrl), outputFile);
-    }
-
-    public JavaSourceExporter(String baseUrl, Node rootNode, Timeline timeline, String packageName, File outputFile) {
-        this.baseUrl =
-                (baseUrl.charAt(baseUrl.length()-1) == '/') ?
-                        baseUrl.replaceAll("/+","/") :
-                        baseUrl.replaceAll("/+","/") + '/';
-        this.hasTimeline = timeline != null;
-        this.className = outputFile.getName().substring(0,outputFile.getName().lastIndexOf('.'));
-        this.packageName = packageName;
-        this.outputFile = outputFile;
-        process("        ",rootNode);
-        if (hasTimeline) process("        ",timeline);
-    }
-
-    private static String computePackageName(String baseUrl) {
-        // remove protocol from baseUrl
-        System.out.println("JavaSourceExporter.computePackageName   baseUrl = " + baseUrl);
-        baseUrl = baseUrl.replaceAll("^[a-z]+:/+","/");
-        System.out.println("baseUrl = " + baseUrl);
-        // try and work out package name from file
-        StringBuilder packageName = new StringBuilder();
-        String[] pathSegments = baseUrl.split(File.separatorChar == '\\'?"\\\\":"/");
-        System.out.println("pathSegments = " + Arrays.toString(pathSegments));
-        loop: for (int i = pathSegments.length-1; i >= 0; i -- ) {
-            switch (pathSegments[i]){
-                case "com":
-                case "org":
-                case "net":
-                    packageName.insert(0,pathSegments[i]);
-                    break loop;
-                case "src":
-                    packageName.deleteCharAt(0);
-                    break loop;
-                case "main":
-                    if ("src".equals(pathSegments[i-1])) {
-                        packageName.deleteCharAt(0);
-                        break loop;
-                    }
-                default:
-                    packageName.insert(0,'.'+pathSegments[i]);
-                    break;
-            }
-            // if we get all way to root of file system then we have failed
-            if (i==0) packageName = null;
-        }
-        System.out.println(" packageName = " + packageName);
-        return packageName==null?null:packageName.toString();
-    }
-
-    public void export() {
-        try {
-            BufferedWriter out = new BufferedWriter(new FileWriter(outputFile));
-//            BufferedWriter out = new BufferedWriter(new OutputStreamWriter(System.out));
-            StringBuilder nodeVars = new StringBuilder();
-            nodeVars.append("    private static Node ");
-            for (int i=0; i<nodeCount; i++) {
-                if (i!=0) nodeVars.append(',');
-                nodeVars.append("NODE_"+i);
-            }
-            nodeVars.append(";\n");
-            nodeVars.append("    private static TriangleMesh ");
-            for (int i=0; i<meshCount; i++) {
-                if (i!=0) nodeVars.append(',');
-                nodeVars.append("MESH_"+i);
-            }
-            nodeVars.append(";\n");
-            if (translateCount > 0) {
-                nodeVars.append("    private static Translate ");
-                for (int i=0; i<translateCount; i++) {
-                    if (i!=0) nodeVars.append(',');
-                    nodeVars.append("TRANS_"+i);
-                }
-                nodeVars.append(";\n");
-            }
-            if (rotateCount > 0) {
-                nodeVars.append("    private static Rotate ");
-                for (int i=0; i<rotateCount; i++) {
-                    if (i!=0) nodeVars.append(',');
-                    nodeVars.append("ROT_"+i);
-                }
-                nodeVars.append(";\n");
-            }
-            if (scaleCount > 0) {
-                nodeVars.append("    private static Scale ");
-                for (int i=0; i<scaleCount; i++) {
-                    if (i!=0) nodeVars.append(',');
-                    nodeVars.append("SCALE_"+i);
-                }
-                nodeVars.append(";\n");
-            }
-            nodeVars.append("    public static final MeshView[] MESHVIEWS = new MeshView[]{ ");
-            for (int i=0; i<meshViewCount; i++) {
-                if (i!=0) nodeVars.append(',');
-                nodeVars.append("new MeshView()");
-            }
-            nodeVars.append("};\n");
-//            nodeVars.append("    public static final MeshView ");
-//            for (int i=0; i<meshViewCount; i++) {
-//                if (i!=0) nodeVars.append(',');
-//                nodeVars.append("MESHVIEW_"+i+" = new MeshView()");
-//            }
-//            nodeVars.append(";\n");
-
-            nodeVars.append("    public static final Node ROOT;\n");
-            nodeVars.append("    public static final Map<String,MeshView> MESHVIEW_MAP;\n");
-            if (hasTimeline) {
-                nodeVars.append("    public static final Timeline TIMELINE = new Timeline();\n");
-            }
-            StringBuilder methodCode = new StringBuilder();
-            for (int m=0; m< methodCount;m++) {
-                methodCode.append("        method"+m+"();\n");
-            }
-
-            if (packageName != null) out.write(
-                    "package "+packageName+";\n\n");
-            out.write(
-                    "import java.util.*;\n" +
-                    "import javafx.util.Duration;\n" +
-                    "import javafx.animation.*;\n" +
-                    "import javafx.scene.*;\n" +
-                    "import javafx.scene.paint.*;\n" +
-                    "import javafx.scene.image.*;\n" +
-                    "import javafx.scene.shape.*;\n" +
-                    "import javafx.scene.transform.*;\n\n" +
-                    "public class "+className+" {\n" +
-                    nodeVars +
-                    "    // ======== NODE CODE ===============\n" +
-                    "    private static void method0(){\n" +
-                    nodeCode +
-                    "    }\n" +
-                    "    static {\n" +
-                    methodCode +
-                    "        // ======== TIMELINE CODE ===============\n" +
-                    timelineCode +
-                    "        // ======== SET PUBLIC VARS ===============\n" +
-                    "        Map<String,MeshView> meshViewMap = new HashMap<String,MeshView>();\n" +
-                    "        for (MeshView meshView: MESHVIEWS) meshViewMap.put(meshView.getId(),meshView);\n" +
-                    "        MESHVIEW_MAP = Collections.unmodifiableMap(meshViewMap);\n" +
-                    "        ROOT = NODE_0;\n" +
-                    "    }\n" +
-                    "}\n");
-
-            out.flush();
-            out.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private int process(String indent, Node node) {
-        if (node instanceof MeshView) {
-            return process(indent,(MeshView)node);
-        } else if (node instanceof Group) {
-            return process(indent,(Group)node);
-        } else {
-            throw new UnsupportedOperationException("Found unknown node type: "+node.getClass().getName());
-        }
-    }
-
-    private int process(String indent, MeshView node) {
-        final int index = nodeCount ++;
-        final String varName = "NODE_"+index;
-        final int meshViewIndex = meshViewCount ++;
-        final String meshViewVarName = "MESHVIEWS["+meshViewIndex+"]";
-//        nodeCode.append(indent+meshViewVarName+" = new MeshView();\n");
-        nodeCode.append(indent+varName+" = "+meshViewVarName+";\n");
-        if (node.getId() != null) nodeCode.append(indent+meshViewVarName+".setId(\""+node.getId()+"\");\n");
-        nodeCode.append(indent+meshViewVarName+".setCullFace(CullFace."+node.getCullFace().name()+");\n");
-        processNodeTransforms(indent,meshViewVarName,node);
-        process(indent,meshViewVarName,(PhongMaterial)node.getMaterial());
-        process(indent,meshViewVarName,(TriangleMesh)node.getMesh());
-        return index;
-    }
-
-    private void processNodeTransforms(String indent, String varName, Node node) {
-        if (node.getTranslateX() != 0) nodeCode.append(indent+varName+".setTranslateX("+node.getTranslateX()+");\n");
-        if (node.getTranslateY() != 0) nodeCode.append(indent+varName+".setTranslateY("+node.getTranslateY()+");\n");
-        if (node.getTranslateZ() != 0) nodeCode.append(indent+varName+".setTranslateZ("+node.getTranslateZ()+");\n");
-        if (node.getRotate() != 0) nodeCode.append(indent+varName+".setRotate("+node.getRotate()+");\n");
-        if (!node.getTransforms().isEmpty()) {
-            nodeCode.append(indent+varName+".getTransforms().addAll(\n");
-            for (int i=0; i< node.getTransforms().size(); i++) {
-                if (i!=0) nodeCode.append(",\n");
-                Transform transform = node.getTransforms().get(i);
-                if (transform instanceof Translate) {
-                    Translate t = (Translate)transform;
-                    nodeCode.append(indent+"    "+storeTransform(t)+" = new Translate("+t.getX()+","+t.getY()+","+t.getZ()+")");
-                } else if (transform instanceof Scale) {
-                    Scale s = (Scale)transform;
-                    nodeCode.append(indent+"    "+storeTransform(s)+" = new Scale("+s.getX()+","+s.getY()+","+s.getZ()+","+s.getPivotX()+","+s.getPivotY()+","+s.getPivotZ()+")");
-                } else if (transform instanceof Rotate) {
-                    Rotate r = (Rotate)transform;
-                    nodeCode.append(indent+"    "+storeTransform(r)+" = new Rotate("+r.getAngle()+","+r.getPivotX()+","+r.getPivotY()+","+r.getPivotZ()+",");
-                    if (r.getAxis() == Rotate.X_AXIS) {
-                        nodeCode.append("Rotate.X_AXIS");
-                    } else if (r.getAxis() == Rotate.Y_AXIS) {
-                        nodeCode.append("Rotate.Y_AXIS");
-                    } else if (r.getAxis() == Rotate.Z_AXIS) {
-                        nodeCode.append("Rotate.Z_AXIS");
-                    }
-                    nodeCode.append(")");
-                } else {
-                    throw new UnsupportedOperationException("Unknown Transform Type: "+transform.getClass());
-                }
-
-            }
-            nodeCode.append("\n"+indent+");\n");
-        }
-    }
-
-    private String storeTransform(Transform transform) {
-        String varName;
-        if (transform instanceof Translate) {
-            final int index = translateCount ++;
-            varName = "TRANS_"+index;
-            Translate t = (Translate)transform;
-            writableVarMap.put(t.xProperty(),varName+".xProperty()");
-            writableVarMap.put(t.yProperty(),varName+".yProperty()");
-            writableVarMap.put(t.zProperty(),varName+".zProperty()");
-        } else if (transform instanceof Scale) {
-            final int index = scaleCount ++;
-            varName = "SCALE_"+index;
-            Scale s = (Scale)transform;
-            writableVarMap.put(s.xProperty(),varName+".xProperty()");
-            writableVarMap.put(s.yProperty(),varName+".yProperty()");
-            writableVarMap.put(s.zProperty(),varName+".zProperty()");
-            writableVarMap.put(s.pivotXProperty(),varName+".pivotXProperty()");
-            writableVarMap.put(s.pivotYProperty(),varName+".pivotYProperty()");
-            writableVarMap.put(s.pivotZProperty(),varName+".pivotZProperty()");
-        } else if (transform instanceof Rotate) {
-            final int index = rotateCount ++;
-            varName = "ROT_"+index;
-            Rotate r = (Rotate)transform;
-            writableVarMap.put(r.angleProperty(),varName+".angleProperty()");
-        } else {
-            throw new UnsupportedOperationException("Unknown Transform Type: "+transform.getClass());
-        }
-        return varName;
-    }
-
-    private int process(String indent, Group node) {
-        final int index = nodeCount ++;
-        final String varName = "NODE_"+index;
-        List<Integer> childIndex = new ArrayList<>();
-        for (int i = 0; i < node.getChildren().size(); i++) {
-            Node child = node.getChildren().get(i);
-            childIndex.add(
-                    process(indent,child));
-        }
-        nodeCode.append(indent+varName+" = new Group(");
-        for (int i = 0; i < childIndex.size(); i++) {
-            if (i!=0) nodeCode.append(',');
-            nodeCode.append("NODE_"+childIndex.get(i));
-        }
-        nodeCode.append(");\n");
-        processNodeTransforms(indent, varName, node);
-        nodeCode.append("    }\n    private static void method" + (methodCount++) + "(){\n");
-        return index;
-    }
-
-    private void process(String indent, String varName, TriangleMesh mesh) {
-        final int index = meshCount ++;
-        final String meshName = "MESH_"+index;
-
-        nodeCode.append(indent+meshName+" = new TriangleMesh();\n");
-        nodeCode.append(indent+varName+".setMesh("+meshName+");\n");
-
-        nodeCode.append(indent+meshName+".getPoints().ensureCapacity("+mesh.getPoints().size()+");\n");
-        nodeCode.append(indent + meshName + ".getPoints().addAll(");
-        for (int i = 0; i < mesh.getPoints().size(); i++) {
-            if (i!=0) nodeCode.append(',');
-            nodeCode.append(mesh.getPoints().get(i)+"f");
-        }
-        nodeCode.append(");\n");
-        nodeCode.append("    }\n    private static void method" + (methodCount++) + "(){\n");
-        nodeCode.append(indent+meshName+".getTexCoords().ensureCapacity("+mesh.getTexCoords().size()+");\n");
-        nodeCode.append(indent + meshName + ".getTexCoords().addAll(");
-        for (int i = 0; i < mesh.getTexCoords().size(); i++) {
-            if (i!=0) nodeCode.append(',');
-            nodeCode.append(mesh.getTexCoords().get(i)+"f");
-        }
-        nodeCode.append(");\n");
-        nodeCode.append("    }\n    private static void method" + (methodCount++) + "(){\n");
-        nodeCode.append(indent+meshName+".getFaces().ensureCapacity("+mesh.getFaces().size()+");\n");
-        nodeCode.append(indent + meshName + ".getFaces().addAll(");
-        for (int i = 0; i < mesh.getFaces().size(); i++) {
-            if ((i%5000) == 0 && i > 0) {
-                nodeCode.append(");\n");
-                nodeCode.append("    }\n    private static void method" + (methodCount++) + "(){\n");
-                nodeCode.append(indent+meshName+".getFaces().addAll(");
-            } else if (i!=0) {
-                nodeCode.append(',');
-            }
-            nodeCode.append(mesh.getFaces().get(i));
-        }
-        nodeCode.append(");\n");
-        nodeCode.append("    }\n    private static void method" + (methodCount++) + "(){\n");
-        nodeCode.append(indent+meshName+".getFaceSmoothingGroups().ensureCapacity("+mesh.getFaceSmoothingGroups().size()+");\n");
-        nodeCode.append(indent+meshName+".getFaceSmoothingGroups().addAll(");
-        for (int i = 0; i < mesh.getFaceSmoothingGroups().size(); i++) {
-            if (i!=0) nodeCode.append(',');
-            nodeCode.append(mesh.getFaceSmoothingGroups().get(i));
-        }
-        nodeCode.append(");\n");
-
-//        nodeCode.append(indent+varName+".setMesh("+process((TriangleMesh)node.getMesh())+");\n");
-    }
-
-    private void process(String indent, String varName, PhongMaterial material) {
-        final int index = materialCount ++;
-        final String materialName = "MATERIAL_"+index;
-
-        nodeCode.append(indent + "PhongMaterial " + materialName + " = new PhongMaterial();\n");
-        nodeCode.append(indent + materialName + ".setDiffuseColor(" + toCode(material.getDiffuseColor()) + ");\n");
-        String specColor = toCode(material.getSpecularColor());
-        if (specColor!=null) nodeCode.append(indent + materialName + ".setSpecularColor(" + specColor + ");\n");
-        nodeCode.append(indent + materialName + ".setSpecularPower("+material.getSpecularPower()+");\n");
-        if (material.getDiffuseMap() != null) {
-            nodeCode.append(indent + "try {\n");
-            nodeCode.append(indent + "    " + materialName + ".setDiffuseMap("+toString(material.getDiffuseMap())+");\n");
-            nodeCode.append(indent + "} catch (NullPointerException npe) {\n");
-            nodeCode.append(indent + "    System.err.println(\"Could not load texture resource ["+material.getDiffuseMap().impl_getUrl()+"]\");\n");
-            nodeCode.append(indent + "}\n");
-        }
-        if (material.getBumpMap() != null) {
-            nodeCode.append(indent + materialName + ".setBumpMap("+toString(material.getBumpMap())+");\n");
-        }
-        if (material.getSpecularMap() != null) {
-            nodeCode.append(indent + materialName + ".setSpecularMap()("+toString(material.getSpecularMap())+");\n");
-        }
-        if (material.getSelfIlluminationMap() != null) {
-            nodeCode.append(indent + materialName + ".setSelfIlluminationMap()("+toString(material.getSelfIlluminationMap())+");\n");
-        }
-        nodeCode.append(indent+varName+".setMaterial("+materialName+");\n");
-    }
-
-    private String toString(Image image) {
-        String url = image.impl_getUrl();
-        if (url.startsWith(baseUrl)) {
-            return  "new Image("+className+".class.getResource(\""+url.substring(baseUrl.length())+"\").toExternalForm())";
-        } else {
-            return "new Image(\""+url+"\")";
-        }
-    }
-
-    private void process(String indent, Timeline timeline) {
-        int count = 0;
-        for (KeyFrame keyFrame: timeline.getKeyFrames()) {
-            if (keyFrame.getValues().isEmpty()) continue;
-            nodeCode.append(indent+"TIMELINE.getKeyFrames().add(new KeyFrame(Duration.millis("+keyFrame.getTime().toMillis()+"d),\n");
-            boolean firstKeyValue = true;
-            for (KeyValue keyValue: keyFrame.getValues()) {
-                if (firstKeyValue) {
-                    firstKeyValue = false;
-                } else {
-                    nodeCode.append(",\n");
-                }
-                String var = writableVarMap.get(keyValue.getTarget());
-                if (var == null) System.err.println("Failed to find writable value in map for : "+keyValue.getTarget());
-                nodeCode.append(indent+"    new KeyValue("+var+","+keyValue.getEndValue()+","+toString(keyValue.getInterpolator())+")");
-            }
-            nodeCode.append("\n"+indent+"));\n");
-
-            if (count > 0 && ((count % 10) == 0)) {
-                nodeCode.append("    }\n    private static void method" + (methodCount++) + "(){\n");
-            }
-            count ++;
-        }
-    }
-
-    private String toString(Interpolator interpolator) {
-//        if (interpolator == Interpolator.DISCRETE || true) {
-        if (interpolator == Interpolator.DISCRETE) {
-            return "Interpolator.DISCRETE";
-        } else if (interpolator == Interpolator.EASE_BOTH) {
-            return "Interpolator.EASE_BOTH";
-        } else if (interpolator == Interpolator.EASE_IN) {
-            return "Interpolator.EASE_IN";
-        } else if (interpolator == Interpolator.EASE_OUT) {
-            return "Interpolator.EASE_OUT";
-        } else if (interpolator == Interpolator.LINEAR) {
-            return "Interpolator.LINEAR";
-        } else if (interpolator instanceof SplineInterpolator) {
-            SplineInterpolator si = (SplineInterpolator)interpolator;
-            return "Interpolator.SPLINE("+si.getX1()+"d,"+si.getY1()+"d,"+si.getX2()+"d,"+si.getY2()+"d)";
-        } else if (interpolator instanceof NumberTangentInterpolator) {
-            NumberTangentInterpolator ti = (NumberTangentInterpolator)interpolator;
-            return "Interpolator.TANGENT(Duration.millis("+ TickCalculation.toMillis((long)ti.getInTicks())+"d),"+ti.getInValue()
-                    +"d,Duration.millis("+TickCalculation.toMillis((long)ti.getInTicks())+"d),"+ti.getOutValue()+"d)";
-        } else {
-            throw new UnsupportedOperationException("Unknown Interpolator type: "+interpolator.getClass());
-        }
-    }
-
-    private String toCode(Color color) {
-        return color == null ? null : "new Color("+color.getRed()+","+color.getGreen()+","+color.getBlue()+","+color.getOpacity()+")";
-    }
-}
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/height2normal/Height2NormalApp.java	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.javafx.experiments.height2normal;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import javax.imageio.ImageIO;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.application.Application;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.embed.swing.SwingFXUtils;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.scene.Group;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.Scene;
-import javafx.scene.SubScene;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.Separator;
-import javafx.scene.control.Slider;
-import javafx.scene.control.ToolBar;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.Box;
-import javafx.scene.transform.Rotate;
-import javafx.scene.transform.Translate;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-import javafx.util.Duration;
-import com.javafx.experiments.jfx3dviewer.AutoScalingGroup;
-
-/**
- * Gui Util App for converting Heights 2 Normals
- */
-public class Height2NormalApp  extends Application {
-    private Image testImage;
-    private SimpleObjectProperty<Image> heightImage = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Image> normalImage = new SimpleObjectProperty<>();
-    private File heightFile;
-    private Stage stage;
-
-    @Override public void start(Stage stage) throws Exception {
-        this.stage = stage;
-
-        // load test image
-        // testImage = new Image(Height2NormalApp.class.getResource("javafx-heightmap.jpg").toExternalForm());
-        testImage = new Image(Height2NormalApp.class.getResource("/com/javafx/experiments/jfx3dviewer/blue.jpg").toExternalForm());
-        heightImage.set(testImage);
-
-        // create toolbar
-        ToolBar toolBar = new ToolBar();
-        Button openButton = new Button("Open...");
-        openButton.setOnAction(new EventHandler<ActionEvent>() {
-            @Override public void handle(ActionEvent event) {
-                open();
-            }
-        });
-        Button saveButton = new Button("Save...");
-        saveButton.setOnAction(new EventHandler<ActionEvent>() {
-            @Override public void handle(ActionEvent event) {
-                save();
-            }
-        });
-        final CheckBox invertCheckBox = new CheckBox("invert");
-        final Slider scaleSlider = new Slider(1,50,2);
-        toolBar.getItems().addAll(openButton,saveButton,
-                                  new Separator(),
-                                  invertCheckBox,
-                                  new Separator(),
-                                  new Label("Scale:"),scaleSlider);
-
-        // bind creation of normal image
-        normalImage.bind(
-                new ObjectBinding<Image>() {
-                    { bind(heightImage, invertCheckBox.selectedProperty(), scaleSlider.valueProperty()); }
-                    @Override protected Image computeValue() {
-                        return Height2NormalConverter.convertToNormals(heightImage.get(), invertCheckBox.isSelected(), scaleSlider.getValue());
-                    }
-                });
-
-        // build stage
-        VBox root = new VBox();
-        HBox views = new HBox();
-        VBox.setVgrow(views, Priority.ALWAYS);
-        root.getChildren().addAll(toolBar, views);
-
-        ImageView srcImageView = new ImageView();
-        srcImageView.setFitWidth(512);
-        srcImageView.setFitHeight(512);
-        srcImageView.imageProperty().bind(heightImage);
-        ImageView dstImageView = new ImageView();
-        dstImageView.setFitWidth(512);
-        dstImageView.setFitHeight(512);
-        dstImageView.imageProperty().bind(normalImage);
-        views.getChildren().addAll(srcImageView,dstImageView,new View3D().create());
-
-        Scene scene = new Scene(root);
-        stage.setScene(scene);
-        stage.show();
-    }
-
-    public void open() {
-        FileChooser fileChooser = new FileChooser();
-        heightFile = fileChooser.showOpenDialog(stage);
-        if (heightFile != null) {
-            try {
-                heightImage.set(new Image(heightFile.toURI().toURL().toExternalForm()));
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        } else {
-            heightImage.set(testImage);
-        }
-    }
-
-    public void save() {
-        FileChooser fileChooser = new FileChooser();
-        if (heightFile != null) {
-            String filePath = heightFile.getName();
-            fileChooser.setInitialFileName(filePath.substring(0,filePath.lastIndexOf('.'))+"-normal-map.png");
-        } else {
-            fileChooser.setInitialFileName("normal-map.png");
-        }
-        File normalFile = fileChooser.showSaveDialog(stage);
-        if (normalFile != null) {
-            try {
-                ImageIO.write(SwingFXUtils.fromFXImage(normalImage.get(),null),"png",normalFile);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static void main(String[] args) {
-        launch(args);
-    }
-
-    private class View3D {
-        private final Group root3D = new Group();
-        private final PerspectiveCamera camera = new PerspectiveCamera(true);
-        private final Rotate cameraXRotate = new Rotate(-40,0,0,0,Rotate.X_AXIS);
-        private final Rotate cameraYRotate = new Rotate(-20,0,0,0,Rotate.Y_AXIS);
-        private final Rotate cameraLookXRotate = new Rotate(0,0,0,0,Rotate.X_AXIS);
-        private final Rotate cameraLookZRotate = new Rotate(0,0,0,0,Rotate.Z_AXIS);
-        private final Translate cameraPosition = new Translate(0,0,-7);
-        private AutoScalingGroup autoScalingGroup = new AutoScalingGroup(2);
-
-        public SubScene create() {
-            SubScene scene = new SubScene(root3D,512,512,true,null);
-            scene.setFill(Color.ALICEBLUE);
-
-            // CAMERA
-            camera.getTransforms().addAll(
-                    cameraXRotate,
-                    cameraYRotate,
-                    cameraPosition,
-                    cameraLookXRotate,
-                    cameraLookZRotate);
-            camera.setNearClip(0.1);
-            camera.setFarClip(100);
-            scene.setCamera(camera);
-            root3D.getChildren().addAll(camera, autoScalingGroup);
-
-            Box box = new Box(10,0.11,10);
-
-            PhongMaterial material = new PhongMaterial(Color.DODGERBLUE);
-            material.bumpMapProperty().bind(normalImage);
-            box.setMaterial(material);
-
-            autoScalingGroup.getChildren().add(box);
-
-            Timeline timeline = new Timeline(
-                    new KeyFrame(Duration.ZERO, new KeyValue(cameraYRotate.angleProperty(),0)),
-                    new KeyFrame(Duration.seconds(10), new KeyValue(cameraYRotate.angleProperty(),360))
-            );
-            timeline.setCycleCount(Timeline.INDEFINITE);
-            timeline.play();
-
-            return scene;
-        }
-    }
-}
-
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/height2normal/Height2NormalConverter.java	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.javafx.experiments.height2normal;
-
-import javafx.geometry.Point3D;
-import javafx.scene.image.Image;
-import javafx.scene.image.PixelFormat;
-import javafx.scene.image.PixelReader;
-import javafx.scene.image.WritableImage;
-
-/**
- * Util class to convert height maps into normal maps
- */
-public class Height2NormalConverter {
-    public static Image convertToNormals(Image heightMap, boolean invert, double scale) {
-        final int w = (int)heightMap.getWidth();
-        final int h = (int)heightMap.getHeight();
-        final byte[] heightPixels = new byte[w*h*4];
-        final byte[] normalPixels = new byte[w*h*4];
-        // get pixels
-        final PixelReader reader = heightMap.getPixelReader();
-        reader.getPixels(0, 0, w, h, PixelFormat.getByteBgraInstance(),heightPixels,0,w*4);
-        if (invert) {
-            for (int y=0; y<h; y++) {
-                for (int x=0; x<w; x++) {
-                    final int pixelIndex = (y*w*4) + (x*4);
-                    heightPixels[pixelIndex] = (byte)(255-Byte.toUnsignedInt(heightPixels[pixelIndex]));
-                    heightPixels[pixelIndex+1] = (byte)(255-Byte.toUnsignedInt(heightPixels[pixelIndex+1]));
-                    heightPixels[pixelIndex+2] = (byte)(255-Byte.toUnsignedInt(heightPixels[pixelIndex+2]));
-                    heightPixels[pixelIndex+3] = heightPixels[pixelIndex+3];
-                }
-            }
-        }
-        // generate normal map
-        for (int y=0; y<h; y++) {
-            for (int x=0; x<w; x++) {
-                final int yAbove = Math.max(0,y-1);
-                final int yBelow = Math.min(h - 1, y + 1);
-                final int xLeft = Math.max(0, x - 1);
-                final int xRight = Math.min(w - 1, x + 1);
-                final int pixelIndex = (y*w*4) + (x*4);
-                final int pixelAboveIndex = (yAbove*w*4) + (x*4);
-                final int pixelBelowIndex = (yBelow*w*4) + (x*4);
-                final int pixelLeftIndex = (y*w*4) + (xLeft*4);
-                final int pixelRightIndex = (y*w*4) + (xRight*4);
-                final int pixelAboveHeight = Byte.toUnsignedInt(heightPixels[pixelAboveIndex]);
-                final int pixelBelowHeight = Byte.toUnsignedInt(heightPixels[pixelBelowIndex]);
-                final int pixelLeftHeight = Byte.toUnsignedInt(heightPixels[pixelLeftIndex]);
-                final int pixelRightHeight = Byte.toUnsignedInt(heightPixels[pixelRightIndex]);
-
-                Point3D pixelAbove = new Point3D(x,yAbove,pixelAboveHeight);
-                Point3D pixelBelow = new Point3D(x,yBelow,pixelBelowHeight);
-                Point3D pixelLeft = new Point3D(xLeft,y,pixelLeftHeight);
-                Point3D pixelRight = new Point3D(xRight,y,pixelRightHeight);
-                Point3D H = pixelLeft.subtract(pixelRight);
-                Point3D V = pixelAbove.subtract(pixelBelow);
-                Point3D normal = H.crossProduct(V);
-                // normalize normal
-                normal = new Point3D(
-                        normal.getX()/w,
-                        normal.getY()/h,
-                        normal.getZ()
-                );
-                // it seems there is lots of ways to calculate the Z element of normal map, 3 options here
-//                normalPixels[pixelIndex] = (byte)((normal.getZ()*128)+128); // Option 1
-                normalPixels[pixelIndex] = (byte)(255-(normal.getZ() * scale)); // Option 2
-//                normalPixels[pixelIndex] = (byte)255; // Option 3
-                normalPixels[pixelIndex+1] = (byte)((normal.getY()*128)+128);
-                normalPixels[pixelIndex+2] = (byte)((normal.getX()*128)+128);
-                normalPixels[pixelIndex+3] = (byte)255;
-            }
-        }
-        // create output image
-        final WritableImage outImage = new WritableImage(w,h);
-        outImage.getPixelWriter().setPixels(0,0,w,h,PixelFormat.getByteBgraInstance(),normalPixels,0,w*4);
-        return outImage;
-    }
-}
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/Importer3D.java	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.javafx.experiments.importers;
-
-import java.io.IOException;
-import java.net.URL;
-import javafx.animation.Timeline;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.shape.MeshView;
-import javafx.scene.shape.TriangleMesh;
-import javafx.util.Pair;
-import com.javafx.experiments.importers.dae.DaeImporter;
-import com.javafx.experiments.importers.max.MaxLoader;
-import com.javafx.experiments.importers.maya.MayaGroup;
-import com.javafx.experiments.importers.maya.MayaImporter;
-import com.javafx.experiments.importers.obj.ObjImporter;
-import com.javafx.experiments.importers.obj.PolyObjImporter;
-
-/**
- * Base Importer for all supported 3D file formats
- */
-public final class Importer3D {
-
-    /**
-     * Get array of extension filters for supported file formats.
-     *
-     * @return array of extension filters for supported file formats.
-     */
-    public static String[] getSupportedFormatExtensionFilters() {
-        return new String[]{"*.ma", "*.ase", "*.obj", "*.fxml", "*.dae"};
-    }
-
-    /**
-     * Load a 3D file, always loaded as TriangleMesh.
-     *
-     * @param fileUrl The url of the 3D file to load
-     * @return The loaded Node which could be a MeshView or a Group
-     * @throws IOException if issue loading file
-     */
-    public static Node load(String fileUrl) throws IOException {
-        return load(fileUrl,false);
-    }
-
-    /**
-     * Load a 3D file.
-     *
-     * @param fileUrl The url of the 3D file to load
-     * @param asPolygonMesh When true load as a PolygonMesh if the loader supports
-     * @return The loaded Node which could be a MeshView or a Group
-     * @throws IOException if issue loading file
-     */
-    public static Node load(String fileUrl, boolean asPolygonMesh) throws IOException {
-        return loadIncludingAnimation(fileUrl,asPolygonMesh).getKey();
-    }
-
-    /**
-     * Load a 3D file.
-     *
-     * @param fileUrl The url of the 3D file to load
-     * @param asPolygonMesh When true load as a PolygonMesh if the loader supports
-     * @return The loaded Node which could be a MeshView or a Group and the Timeline animation
-     * @throws IOException if issue loading file
-     */
-    public static Pair<Node,Timeline> loadIncludingAnimation(String fileUrl, boolean asPolygonMesh) throws IOException {
-        // get extension
-        final int dot = fileUrl.lastIndexOf('.');
-        if (dot <= 0) {
-            throw new IOException("Unknown 3D file format, url missing extension ["+fileUrl+"]");
-        }
-        final String extension = fileUrl.substring(dot + 1, fileUrl.length()).toLowerCase();
-        switch (extension) {
-            case "ma":
-                final MayaImporter mayaImporter = new MayaImporter();
-                mayaImporter.load(fileUrl, asPolygonMesh);
-                final Timeline timeline = mayaImporter.getTimeline();
-                return new Pair<Node, Timeline>(mayaImporter.getRoot(),timeline);
-            case "ase":
-                return new Pair<Node, Timeline>(new MaxLoader().loadMaxUrl(fileUrl),null);
-            case "obj":
-                final Group res = new Group();
-                if (asPolygonMesh) {
-                    PolyObjImporter reader = new PolyObjImporter(fileUrl);
-                    for (String key : reader.getMeshes()) {
-                        res.getChildren().add(reader.buildPolygonMeshView(key));
-                    }
-                } else {
-                    ObjImporter reader = new ObjImporter(fileUrl);
-                    for (String key : reader.getMeshes()) {
-                        res.getChildren().add(reader.buildMeshView(key));
-                    }
-                }
-                return new Pair<Node, Timeline>(res,null);
-            case "fxml":
-                final Object fxmlRoot = FXMLLoader.load(new URL(fileUrl));
-                if (fxmlRoot instanceof Node) {
-                    return new Pair<Node, Timeline>((Node)fxmlRoot,null);
-                } else if (fxmlRoot instanceof TriangleMesh) {
-                    return new Pair<Node, Timeline>(new MeshView((TriangleMesh)fxmlRoot),null);
-                }
-                throw new IOException("Unknown object in FXML file ["+fxmlRoot.getClass().getName()+"]");
-            case "dae":
-                final DaeImporter daeImporter = new DaeImporter(fileUrl, true);
-                return new Pair<Node, Timeline>(
-                        daeImporter.getRootNode(),
-                        null);
-            default:
-                throw new IOException("Unknown 3D file format ["+extension+"]");
-        }
-    }
-}
--- a/apps/experiments/3DViewer/src/main/java/com/javafx/experiments/importers/Optimizer.java	Tue Mar 04 10:36:33 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,559 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.javafx.experiments.importers;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.property.Property;
-import javafx.beans.value.WritableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableFloatArray;
-import javafx.collections.ObservableIntegerArray;
-import javafx.collections.ObservableList;
-import javafx.collections.transformation.SortedList;
-import javafx.geometry.Point2D;
-import javafx.geometry.Point3D;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.shape.MeshView;
-import javafx.scene.shape.TriangleMesh;
-import javafx.scene.transform.Transform;
-import javafx.util.Duration;
-
-/**
- * Optimizer to take 3D model and timeline loaded by one of the importers and do as much optimization on
- * the scene graph that was create as we can while still being able to play the given animation.
- */
-public class Optimizer {
-
-    private Timeline timeline;
-    private Node root;
-    private Set<Transform> bound = new HashSet<>();
-    private List<Parent> emptyParents = new ArrayList<>();
-    private List<MeshView> meshViews = new ArrayList<>();
-    private boolean convertToDiscrete = true;
-
-    public Optimizer(Timeline timeline, Node root) {
-        this(timeline, root, false);
-    }
-
-    public Optimizer(Timeline timeline, Node root, boolean convertToDiscrete) {
-        this.timeline = timeline;
-        this.root = root;
-        this.convertToDiscrete = convertToDiscrete;
-    }
-
-    private int trRemoved, trTotal, groupsTotal, trCandidate, trEmpty;
-
-    public void optimize() {
-        trRemoved = 0;
-        trTotal = 0;
-        trCandidate = 0;
-        trEmpty = 0;
-        groupsTotal = 0;
-        emptyParents.clear();
-
-        parseTimeline();
-        optimize(root);
-        removeEmptyGroups();