changeset 9733:8b8d32536583

Merge
author kcr
date Fri, 22 Apr 2016 09:32:30 -0700
parents eec7c9c1f433 258332993afd
children ff3609ace244
files
diffstat 774 files changed, 2137 insertions(+), 1145 deletions(-) [+]
line wrap: on
line diff
--- a/apps/experiments/DukePad/modules/compass/src/main/java/com/javafx/experiments/dukepad/compass/imu/Quaternion.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/experiments/DukePad/modules/compass/src/main/java/com/javafx/experiments/dukepad/compass/imu/Quaternion.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/apps/experiments/WebTerminal/src/webterminal/WebTerminal.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/experiments/WebTerminal/src/webterminal/WebTerminal.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/3DViewer/src/main/java/com/javafx/experiments/importers/obj/ObjOrPolyObjImporter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/3DViewer/src/main/java/com/javafx/experiments/importers/obj/ObjOrPolyObjImporter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/app/java/ensemble/SampleInfo.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/SampleInfo.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/SourceTab.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/SourceTab.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/interpolator/InterpolatorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/interpolator/InterpolatorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/timeline/TimelineApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/timeline/TimelineApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/timelineevents/TimelineEventsApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/timelineevents/TimelineEventsApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/fadetransition/FadeTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/fadetransition/FadeTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/filltransition/FillTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/filltransition/FillTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/paralleltransition/ParallelTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/paralleltransition/ParallelTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/pathtransition/PathTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/pathtransition/PathTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/pausetransition/PauseTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/pausetransition/PauseTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/rotatetransition/RotateTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/rotatetransition/RotateTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/scaletransition/ScaleTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/scaletransition/ScaleTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/sequentialtransition/SequentialTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/sequentialtransition/SequentialTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/stroketransition/StrokeTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/stroketransition/StrokeTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/translatetransition/TranslateTransitionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/animation/transitions/translatetransition/TranslateTransitionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/audio/AudioAreaChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/audio/AudioAreaChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/chart/AreaChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/chart/AreaChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/curvefitted/CurveFittedAreaChart.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/curvefitted/CurveFittedAreaChart.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/curvefitted/CurveFittedAreaChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/curvefitted/CurveFittedAreaChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/stacked/StackedAreaChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/area/stacked/StackedAreaChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/chart/BarChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/chart/BarChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,6 +1,6 @@
 /*
      * @param args command line arguments
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/horizontal/HorizontalBarChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/horizontal/HorizontalBarChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/image/ImageBarChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/image/ImageBarChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/stacked/StackedBarChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bar/stacked/StackedBarChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bubble/BubbleChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/bubble/BubbleChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/Candle.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/Candle.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/CandleStickChart.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/CandleStickChart.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/CandleStickChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/CandleStickChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/CandleStickExtraValues.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/CandleStickExtraValues.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/TooltipContent.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/candlestick/TooltipContent.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/line/category/CategoryLineChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/line/category/CategoryLineChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/line/chart/LineChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/line/chart/LineChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/line/stock/StockLineChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/line/stock/StockLineChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/pie/chart/PieChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/pie/chart/PieChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/pie/drilldown/DrilldownPieChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/pie/drilldown/DrilldownPieChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/scatter/animated/LiveScatterChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/scatter/animated/LiveScatterChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/scatter/chart/ScatterChartApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/charts/scatter/chart/ScatterChartApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/accordion/AccordionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/accordion/AccordionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/button/colorbutton/ColorButtonApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/button/colorbutton/ColorButtonApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/button/graphicbutton/GraphicButtonApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/button/graphicbutton/GraphicButtonApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/button/pillbutton/PillButtonApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/button/pillbutton/PillButtonApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/checkbox/CheckBoxApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/checkbox/CheckBoxApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/choicebox/ChoiceBoxApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/choicebox/ChoiceBoxApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/colorpicker/ColorPickerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/colorpicker/ColorPickerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/datepicker/DatePickerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/datepicker/DatePickerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/dialog/DialogApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/dialog/DialogApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/htmleditor/HTMLEditorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/htmleditor/HTMLEditorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/hyperlink/HyperLinkApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/hyperlink/HyperLinkApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/horizontallistview/HorizontalListViewApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/horizontallistview/HorizontalListViewApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/listviewcellfactory/ListViewCellFactoryApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/listviewcellfactory/ListViewCellFactoryApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/listviewcellfactory/MoneyFormatCell.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/listviewcellfactory/MoneyFormatCell.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
@@ -31,7 +31,7 @@
  */
 package ensemble.samples.controls.listview.listviewcellfactory;
 
-import java.text.NumberFormat;
+import java.text.DecimalFormat;
 import javafx.scene.control.ListCell;
 import javafx.scene.paint.Color;
 
@@ -49,7 +49,8 @@
         // formatting relevant to the current locale. This would format
         // 43.68 as "$43.68", and -23.67 as "($23.67)"
         double value = item.doubleValue();
-        setText(NumberFormat.getCurrencyInstance().format(value));
+        DecimalFormat df = new DecimalFormat("\u00A4#,##0.00;(\u00A4#,##0.00)");
+        setText(df.format(value));
         setTextFill(value == 0 ?
                     Color.BLACK : value < 0 ? Color.RED : Color.GREEN);
     }
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/simplelistview/SimpleListViewApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/listview/simplelistview/SimpleListViewApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/menu/MenuApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/menu/MenuApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/pagination/PaginationApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/pagination/PaginationApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/progressbar/ProgressBarApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/progressbar/ProgressBarApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/progressindicator/ProgressIndicatorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/progressindicator/ProgressIndicatorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/scrollbar/ScrollBarApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/scrollbar/ScrollBarApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/spinner/SpinnerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/spinner/SpinnerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/splitpane/HiddenSplitPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/splitpane/HiddenSplitPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tab/TabPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tab/TabPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tablecellfactory/Person.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tablecellfactory/Person.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tablecellfactory/TableCellFactoryApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tablecellfactory/TableCellFactoryApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tableview/Person.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tableview/Person.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tableview/TableViewApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/tableview/TableViewApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/advancedlabel/AdvancedLabelApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/advancedlabel/AdvancedLabelApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/bidi/BidiApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/bidi/BidiApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/insettext/InsetTextApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/insettext/InsetTextApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/searchbox/SearchBox.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/searchbox/SearchBox.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/searchbox/SearchBoxApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/searchbox/SearchBoxApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/simplelabel/SimpleLabelApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/simplelabel/SimpleLabelApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textfield/TextFieldApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textfield/TextFieldApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textflow/TextFlowApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textflow/TextFlowApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textformatter/TextFormatterApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textformatter/TextFormatterApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/TextInputValidatorPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/TextInputValidatorPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/TextValidatorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/TextValidatorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/ValidationEvent.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/ValidationEvent.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/ValidationResult.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/ValidationResult.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/ValidatorPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/text/textvalidator/ValidatorPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/togglebutton/ToggleButtonApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/togglebutton/ToggleButtonApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/toolbar/styledtoolbar/StyledToolBarApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/toolbar/styledtoolbar/StyledToolBarApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/toolbar/toolbar/ToolBarApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/toolbar/toolbar/ToolBarApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/treetableview/Inventory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/treetableview/Inventory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/treetableview/TreeTableViewApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/treetableview/TreeTableViewApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/treeview/TreeViewApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/treeview/TreeViewApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/webview/WebViewApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/controls/webview/WebViewApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/bouncingballs/BouncingBallsApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/bouncingballs/BouncingBallsApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/brickbreaker/BrickBreakerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/brickbreaker/BrickBreakerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/calc/CalculatorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/calc/CalculatorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/canvas/FireworksApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/canvas/FireworksApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/canvas/SanFranciscoFireworks.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/canvas/SanFranciscoFireworks.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/colorfulcircles/ColorfulCirclesApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/colorfulcircles/ColorfulCirclesApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/digitalclock/DigitalClockApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/digitalclock/DigitalClockApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/displayshelf/DisplayShelf.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/displayshelf/DisplayShelf.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/displayshelf/DisplayShelfApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/displayshelf/DisplayShelfApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/dropshadow/DropShadowApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/dropshadow/DropShadowApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/gaussianblur/GaussianBlurApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/gaussianblur/GaussianBlurApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/innershadow/InnerShadowApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/innershadow/InnerShadowApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/reflection/ReflectionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/reflection/ReflectionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/sepiatone/SepiaToneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/effects/sepiatone/SepiaToneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/images/imagecreation/ImageCreationApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/images/imagecreation/ImageCreationApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/images/imageoperator/ImageOperationApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/images/imageoperator/ImageOperationApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/images/imageproperties/ImagePropertiesApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/images/imageproperties/ImagePropertiesApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/paints/color/ColorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/paints/color/ColorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/paints/lineargradient/LinearGradientApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/paints/lineargradient/LinearGradientApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/paints/radialgradient/RadialGradientApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/paints/radialgradient/RadialGradientApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/puzzle/PuzzlePiecesApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/puzzle/PuzzlePiecesApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/arc/ArcApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/arc/ArcApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/circle/CircleApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/circle/CircleApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/cubiccurve/CubicCurveApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/cubiccurve/CubicCurveApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/ellipse/EllipseApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/ellipse/EllipseApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/line/LineApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/line/LineApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/path/PathApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/path/PathApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/polygon/PolygonApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/polygon/PolygonApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/polyline/PolylineApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/polyline/PolylineApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/quadcurve/QuadCurveApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/quadcurve/QuadCurveApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/rectangle/RectangleApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/shapes/rectangle/RectangleApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/Dial.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/Dial.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/DigitalClock.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/DigitalClock.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/StopWatchApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/StopWatchApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/StopWatchButton.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/StopWatchButton.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/Watch.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics2d/stopwatch/Watch.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/cube/CubeApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/cube/CubeApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/cubesystem/Cube.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/cubesystem/Cube.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/cubesystem/SphereSystemApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/cubesystem/SphereSystemApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/simple3dbox/Simple3DBoxApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/simple3dbox/Simple3DBoxApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/sphere/Simple3DSphereApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/sphere/Simple3DSphereApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/xylophone/Xform.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/xylophone/Xform.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/xylophone/XylophoneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/graphics3d/xylophone/XylophoneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/changelistener/ChangeListenerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/changelistener/ChangeListenerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/concurrency/service/ServiceApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/concurrency/service/ServiceApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/concurrency/task/GetDailySalesTask.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/concurrency/task/GetDailySalesTask.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/concurrency/task/TaskApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/concurrency/task/TaskApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/fxml/Authenticator.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/fxml/Authenticator.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/fxml/FXMLLoginDemoApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/fxml/FXMLLoginDemoApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/fxml/LoginController.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/fxml/LoginController.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/observablelist/ObservableListApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/observablelist/ObservableListApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/stringbinding/StringBindingApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/stringbinding/StringBindingApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SampleTableModel.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SampleTableModel.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInterop.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInterop.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInteropApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInteropApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInteropService.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInteropService.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInteropTask.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/swing/SwingInteropTask.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/anchorpane/AnchorPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/anchorpane/AnchorPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/borderpane/BorderPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/borderpane/BorderPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/flowpane/FlowPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/flowpane/FlowPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/gridpane/GridPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/gridpane/GridPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/hbox/HBoxApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/hbox/HBoxApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/stackpane/StackPaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/stackpane/StackPaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/tilepane/TilePaneApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/tilepane/TilePaneApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/vbox/VBoxApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/layout/vbox/VBoxApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/advancedmedia/MediaControl.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/advancedmedia/MediaControl.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/AlphaMediaPlayerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/AlphaMediaPlayerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/PlanetaryPlayerPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/alphamediaplayer/PlanetaryPlayerPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/audioclip/AudioClipApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/audioclip/AudioClipApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/OverlayMediaPlayerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/OverlayMediaPlayerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/PlayerPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/overlaymediaplayer/PlayerPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/PlayerPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/PlayerPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/StreamingMediaPlayerApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/media/streamingmediaplayer/StreamingMediaPlayerApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/advancedstage/AdvancedStageApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/advancedstage/AdvancedStageApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/customnode/CustomNodeApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/customnode/CustomNodeApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/cursor/CursorApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/cursor/CursorApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/gestureevent/GestureEventApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/gestureevent/GestureEventApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/keyevent/KeyEventApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/keyevent/KeyEventApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/keystrokemotion/KeyStrokeMotionApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/keystrokemotion/KeyStrokeMotionApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/keystrokemotion/LettersPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/keystrokemotion/LettersPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/mouseevent/MouseEventApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/mouseevent/MouseEventApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/multitouch/MultiTouchApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/multitouch/MultiTouchApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/multitouch/MultiTouchImageView.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/multitouch/MultiTouchImageView.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/multitouch/MultiTouchPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/events/multitouch/MultiTouchPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/nodeproperties/NodePropertiesApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/nodeproperties/NodePropertiesApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
@@ -40,8 +40,7 @@
 import javafx.stage.Stage;
 
 /**
- * A sample that demonstrates some properties of nodes. Use the radio buttons
- * to send any of the rectangles to the front or back. Use the controls to
+ * A sample that demonstrates some properties of nodes. Use the controls to
  * change opacity or horizontal position.
  *
  * @sampleName Node Properties
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/stage/StageApp.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/scenegraph/stage/StageApp.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/resources/ensemble/samples/charts/bubble/BubbleChart.css	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/resources/ensemble/samples/charts/bubble/BubbleChart.css	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/samples/Ensemble8/src/samples/resources/ensemble/samples/charts/candlestick/CandleStickChart.css	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/samples/Ensemble8/src/samples/resources/ensemble/samples/charts/candlestick/CandleStickChart.css	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013 Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/metadata/util/DesignImage.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/metadata/util/DesignImage.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/effectpicker/editors/ImageControl.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/effectpicker/editors/ImageControl.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/apps/tests/Robot/src/robottest/RobotBuilder.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/tests/Robot/src/robottest/RobotBuilder.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/apps/toys/Hello/src/main/java/hello/HelloCSS.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/toys/Hello/src/main/java/hello/HelloCSS.java	Fri Apr 22 09:32:30 2016 -0700
@@ -172,8 +172,8 @@
             super(100, 100);
         }
 
-        @Override public void impl_processCSS(WritableValue<Boolean> foo) {
-            super.impl_processCSS(foo);
+        @Override public void impl_processCSS() {
+            super.impl_processCSS();
         }
         StyleablePropertyFactory<TestNode> factory = new StyleablePropertyFactory<>(Rectangle.getClassCssMetaData());
         StyleableProperty<Duration> myDuration = factory.createStyleableDurationProperty(this, "myDuration", "-my-duration", (s) -> s.myDuration, Duration.millis(1000));
--- a/apps/toys/Hello/src/main/java/hello/HelloLaunchOnNewThread.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/toys/Hello/src/main/java/hello/HelloLaunchOnNewThread.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/toys/Hello/src/main/java/hello/HelloViewOrder.java	Fri Apr 22 09:32:30 2016 -0700
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2016, 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 hello;
+
+import javafx.application.Application;
+import javafx.scene.PerspectiveCamera;
+import javafx.scene.Scene;
+import javafx.scene.SceneAntialiasing;
+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.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Circle;
+import javafx.scene.shape.Ellipse;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Stage;
+
+public class HelloViewOrder extends Application {
+
+    private boolean added = false;
+
+    @Override
+    public void start(Stage stage) throws Exception {
+        stage.setTitle("View Order Test");
+
+        final Slider slider = new Slider(-4, 0, -2);
+        slider.setDisable(true);
+
+        final Rectangle wheatRect = new Rectangle(150, 150, Color.WHEAT);
+        wheatRect.setArcHeight(10);
+        wheatRect.setArcWidth(10);
+        wheatRect.setId("Wheat");
+        wheatRect.setOnMousePressed(e -> System.out.println("Mouse Pressed: Wheat"));
+        wheatRect.relocate(50, 30);
+        final Pane rectsPane = new Pane();
+
+        final Circle redCircle = new Circle(80, Color.RED);
+        redCircle.setId("Red");
+        redCircle.setOnMousePressed(e -> System.out.println("Mouse Pressed: Red"));
+        redCircle.relocate(20, 10);
+
+        final Circle greenCircle = new Circle(80, Color.GREEN);
+        greenCircle.setId("Green");
+        greenCircle.setOnMousePressed(e -> System.out.println("Mouse Pressed: Green"));
+        greenCircle.relocate(100, 50);
+
+        final Ellipse blueEllipse = new Ellipse(100, 80);
+        blueEllipse.setFill(Color.BLUE);
+        blueEllipse.setId("Blue");
+        blueEllipse.setOnMousePressed(e -> System.out.println("Mouse Pressed: Blue"));
+        blueEllipse.relocate(60, 100);
+
+        rectsPane.getChildren().addAll(redCircle, greenCircle, blueEllipse);
+        SubScene subScene = new SubScene(rectsPane, 300, 300, true, SceneAntialiasing.DISABLED);
+        subScene.setCamera(new PerspectiveCamera());
+
+        final HBox rootPane = new HBox(10);
+
+        final CheckBox translateBtn = new CheckBox("Translate");
+        translateBtn.setOnAction((javafx.event.ActionEvent event) -> {
+            if (translateBtn.isSelected()) {
+                System.err.println("translateBtn is selected");
+                wheatRect.translateZProperty().bind(slider.valueProperty());
+                redCircle.setTranslateZ(-2);
+                greenCircle.setTranslateZ(-3);
+                blueEllipse.setTranslateZ(0);
+            } else {
+                System.err.println("translateBtn is unselected");
+                wheatRect.translateZProperty().unbind();
+                wheatRect.setTranslateZ(0);
+                redCircle.setTranslateZ(0);
+                greenCircle.setTranslateZ(0);
+                blueEllipse.setTranslateZ(0);
+            }
+        });
+
+        final CheckBox viewOrderBtn = new CheckBox("viewOrder");
+        viewOrderBtn.setOnAction((javafx.event.ActionEvent event) -> {
+            if (viewOrderBtn.isSelected()) {
+                System.err.println("viewOrderBtn is selected");
+                wheatRect.viewOrderProperty().bind(slider.valueProperty());
+                redCircle.setViewOrder(-2);
+                // Test styling
+                greenCircle.setStyle("-fx-view-order: -3;");
+                blueEllipse.setViewOrder(0);
+            } else {
+                System.err.println("viewOrderBtn is unselected");
+                wheatRect.viewOrderProperty().unbind();
+                wheatRect.setViewOrder(0);
+                redCircle.setViewOrder(0);
+                // Test styling
+                greenCircle.setStyle("-fx-view-order: 0;");
+                blueEllipse.setViewOrder(0);
+            }
+        });
+
+        final CheckBox opacityBtn = new CheckBox("0.5 opacity");
+        opacityBtn.setOnAction((javafx.event.ActionEvent event) -> {
+            if (opacityBtn.isSelected()) {
+                wheatRect.setOpacity(0.5);
+                redCircle.setOpacity(0.5);
+                greenCircle.setOpacity(0.5);
+                blueEllipse.setOpacity(0.5);
+            } else {
+                wheatRect.setOpacity(1.0);
+                redCircle.setOpacity(1.0);
+                greenCircle.setOpacity(1.0);
+                blueEllipse.setOpacity(1.0);
+            }
+        });
+
+        final Button removeBtn = new Button();
+        final Button addBtn = new Button();
+        addBtn.setText("Add");
+        addBtn.setOnAction((javafx.event.ActionEvent event) -> {
+            if (!added) {
+                rectsPane.getChildren().add(wheatRect);
+                slider.setDisable(false);
+                removeBtn.setDisable(false);
+                addBtn.setDisable(true);
+                added = true;
+            }
+        });
+
+        removeBtn.setText("Remove");
+        removeBtn.setDisable(true);
+        removeBtn.setOnAction((javafx.event.ActionEvent event) -> {
+            if (added) {
+                rectsPane.getChildren().remove(wheatRect);
+                slider.setDisable(true);
+                removeBtn.setDisable(true);
+                addBtn.setDisable(false);
+                added = false;
+            }
+        });
+
+        VBox buttonsPane = new VBox(5);
+
+        // This set of labels is to prove that viewOrder has no impact on
+        // layout and focus traversal order.
+        Label layoutLabel = new Label("Test Layout");
+        Button b1 = new Button("First");
+        b1.setViewOrder(-1);
+        Button b2 = new Button("Second");
+        b2.setViewOrder(1);
+        Button b3 = new Button("Third");
+        b3.setViewOrder(0);
+
+        VBox layoutPane = new VBox(10);
+        layoutPane.getChildren().addAll(layoutLabel, b1, b2, b3);
+
+        buttonsPane.getChildren().addAll(opacityBtn, viewOrderBtn, translateBtn,
+                addBtn, removeBtn, slider, new Separator(), layoutPane);
+        rootPane.getChildren().addAll(buttonsPane, subScene);
+        Scene scene = new Scene(rootPane);
+        rectsPane.setStyle("-fx-border-color: RED;");
+
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    public static void main(String[] args) throws Exception {
+        launch(args);
+    }
+
+}
--- a/apps/toys/Hello/src/main/java/hello/TestBuilder.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/apps/toys/Hello/src/main/java/hello/TestBuilder.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, 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
--- a/buildSrc/android.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/android.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/armv5sf.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/armv5sf.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/armv6hf.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/armv6hf.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/armv6sf.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/armv6sf.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/armv7hf.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/armv7hf.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/armv7sf.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/armv7sf.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/build.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/build.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/dalvik.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/dalvik.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/buildSrc/linux.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/linux.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/mac.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/mac.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/JavaHeaderTask.groovy	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/JavaHeaderTask.groovy	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/src/main/java/jarjar/org/gradle/process/internal/child/BootstrapSecurityManager.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/src/main/java/jarjar/org/gradle/process/internal/child/BootstrapSecurityManager.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/buildSrc/win.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/win.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/buildSrc/x86egl.gradle	Thu Apr 21 07:36:27 2016 -0700
+++ b/buildSrc/x86egl.gradle	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/dependencies/java.base/module-info.java.extra	Thu Apr 21 07:36:27 2016 -0700
+++ b/dependencies/java.base/module-info.java.extra	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -24,6 +24,7 @@
  */
 
 exports jdk.internal.misc to javafx.graphics;
+exports jdk.internal.ref to javafx.media;
 exports sun.net.www to javafx.web;
 exports sun.nio.ch to javafx.media;
 exports sun.reflect.misc to javafx.base;
--- a/dependencies/java.desktop/module-info.java.extra	Thu Apr 21 07:36:27 2016 -0700
+++ b/dependencies/java.desktop/module-info.java.extra	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/dependencies/jdk.jdeps/module-info.java.extra	Thu Apr 21 07:36:27 2016 -0700
+++ b/dependencies/jdk.jdeps/module-info.java.extra	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/gradle.properties.template	Thu Apr 21 07:36:27 2016 -0700
+++ b/gradle.properties.template	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, 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
--- a/modules/base/make/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/make/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- a/modules/base/src/main/java/com/sun/javafx/binding/BidirectionalBinding.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/main/java/com/sun/javafx/binding/BidirectionalBinding.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/base/src/main/java/com/sun/javafx/binding/MapExpressionHelper.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/main/java/com/sun/javafx/binding/MapExpressionHelper.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/base/src/main/java/com/sun/javafx/collections/SortHelper.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/main/java/com/sun/javafx/collections/SortHelper.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/base/src/main/java/javafx/collections/FXCollections.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/main/java/javafx/collections/FXCollections.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/base/src/main/java/javafx/collections/ListChangeBuilder.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/main/java/javafx/collections/ListChangeBuilder.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/base/src/main/module-info/module-info.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/main/module-info/module-info.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/test/java/test/com/sun/javafx/binding/ErrorLoggingUtiltity.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/base/src/test/java/test/javafx/binding/BindingsArrayTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/test/java/test/javafx/binding/BindingsArrayTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/base/src/test/java/test/javafx/binding/BindingsListTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/test/java/test/javafx/binding/BindingsListTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/base/src/test/java/test/javafx/binding/expression/ListExpressionTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/base/src/test/java/test/javafx/binding/expression/ListExpressionTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/make/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/make/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -1557,7 +1557,7 @@
                     // Accessibility might need to see the menu node before the window
                     // is visible (i.e. before the skin is applied).
                     if (submenu.getSkin() == null) {
-                        submenu.getStyleableNode().impl_processCSS(true);
+                        submenu.getStyleableNode().applyCss();
                     }
                     ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
                     return cmContent.itemsContainer;
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/ReadOnlyUnbackedObservableList.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/ReadOnlyUnbackedObservableList.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -36,43 +36,65 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableListBase;
 
 import java.util.Collections;
 
+import static com.sun.javafx.collections.ListListenerHelper.fireValueChangedEvent;
+
 /**
  * A read-only and unbacked ObservableList - the data is retrieved on demand by
  * subclasses via the get method. A combination of ObservableList, ObservableListWrapper
  * and GenericObservableList.
  *
  */
-public abstract class ReadOnlyUnbackedObservableList<E> implements ObservableList<E> {
-
-    private ListListenerHelper<E> listenerHelper;
-
+public abstract class ReadOnlyUnbackedObservableList<E> extends ObservableListBase<E> {
 
     @Override public abstract E get(int i);
 
     @Override public abstract int size();
 
-
-    @Override public void addListener(InvalidationListener listener) {
-        listenerHelper = ListListenerHelper.addListener(listenerHelper, listener);
+    public void _beginChange() {
+        beginChange();
     }
 
-    @Override public void removeListener(InvalidationListener listener) {
-        listenerHelper = ListListenerHelper.removeListener(listenerHelper, listener);
+    public void _endChange() {
+        endChange();
     }
 
-    @Override public void addListener(ListChangeListener<? super E> obs) {
-        listenerHelper = ListListenerHelper.addListener(listenerHelper, obs);
+    public final void _nextUpdate(int pos) {
+        nextUpdate(pos);
     }
 
-    @Override public void removeListener(ListChangeListener<? super E> obs) {
-        listenerHelper = ListListenerHelper.removeListener(listenerHelper, obs);
+    public final void _nextSet(int idx, E old) {
+        nextSet(idx, old);
     }
 
+    public final void _nextReplace(int from, int to, List<? extends E> removed) {
+        nextReplace(from, to, removed);
+    }
+
+    public final void _nextRemove(int idx, List<? extends E> removed) {
+        nextRemove(idx, removed);
+    }
+
+    public final void _nextRemove(int idx, E removed) {
+        nextRemove(idx, removed);
+    }
+
+    public final void _nextPermutation(int from, int to, int[] perm) {
+        nextPermutation(from, to, perm);
+    }
+
+    public final void _nextAdd(int from, int to) {
+        nextAdd(from, to);
+    }
+
+
+
+
     public void callObservers(Change<E> c) {
-        ListListenerHelper.fireValueChangedEvent(listenerHelper, c);
+        fireChange(c);
     }
 
     @Override public int indexOf(Object o) {
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/CellBehaviorBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/CellBehaviorBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DateCellBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DateCellBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SpinnerBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SpinnerBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TabPaneBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TabPaneBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/inputmap/InputMap.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/inputmap/InputMap.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVK.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVK.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/chart/CategoryAxis.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/chart/CategoryAxis.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/chart/Chart.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/chart/Chart.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Accordion.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Accordion.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ButtonBar.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ButtonBar.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Cell.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Cell.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ChoiceBox.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ChoiceBox.java	Fri Apr 22 09:32:30 2016 -0700
@@ -569,17 +569,42 @@
          */
         @Override public void select(int index) {
             // this does not sound right, we should let the superclass handle it.
-            final T value = getModelItem(index);
-            if (value instanceof Separator) {
-                select(++index);
-            } else {
-                super.select(index);
-            }
+            super.select(index);
 
             if (choiceBox.isShowing()) {
                 choiceBox.hide();
             }
         }
+
+        /** {@inheritDoc} */
+        @Override public void selectPrevious() {
+            // overridden to properly handle Separators
+            int index = getSelectedIndex() - 1;
+            while (index >= 0) {
+                final T value = getModelItem(index);
+                if (value instanceof Separator) {
+                    index--;
+                } else {
+                    select(index);
+                    break;
+                }
+            }
+        }
+
+        /** {@inheritDoc} */
+        @Override public void selectNext() {
+            // overridden to properly handle Separators
+            int index = getSelectedIndex() + 1;
+            while (index < getItemCount()) {
+                final T value = getModelItem(index);
+                if (value instanceof Separator) {
+                    index++;
+                } else {
+                    select(index);
+                    break;
+                }
+            }
+        }
     }
 
     /***************************************************************************
--- a/modules/controls/src/main/java/javafx/scene/control/ComboBoxBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ComboBoxBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -218,7 +218,7 @@
      * shown when a combo box is non-editable (that is, prompt text is only shown
      * when user input is allowed via text input).
      */
-    private StringProperty promptText = new SimpleStringProperty(this, "promptText", "") {
+    private StringProperty promptText = new SimpleStringProperty(this, "promptText", null) {
         @Override protected void invalidated() {
             // Strip out newlines
             String txt = get();
--- a/modules/controls/src/main/java/javafx/scene/control/Control.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Control.java	Fri Apr 22 09:32:30 2016 -0700
@@ -867,16 +867,16 @@
      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
      */
     @Deprecated
-    @Override protected void impl_processCSS(WritableValue<Boolean> unused) {
+    @Override protected void impl_processCSS() {
 
-        super.impl_processCSS(unused);
+        super.impl_processCSS();
 
         if (getSkin() == null) {
             // try to create default skin
             final Skin<?> defaultSkin = createDefaultSkin();
             if (defaultSkin != null) {
                 skinProperty().set(defaultSkin);
-                super.impl_processCSS(unused);
+                super.impl_processCSS();
             } else {
                 final String msg = "The -fx-skin property has not been defined in CSS for " + this +
                                    " and createDefaultSkin() returned null.";
--- a/modules/controls/src/main/java/javafx/scene/control/Dialog.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Dialog.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/HeavyweightDialog.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/HeavyweightDialog.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Hyperlink.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Hyperlink.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Label.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Label.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Labeled.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Labeled.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ListCell.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ListCell.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ListView.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ListView.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -1108,6 +1108,7 @@
     public static class EditEvent<T> extends Event {
         private final T newValue;
         private final int editIndex;
+        private final ListView<T> source;
 
         private static final long serialVersionUID = 20130724L;
 
@@ -1127,6 +1128,7 @@
                          T newValue,
                          int editIndex) {
             super(source, Event.NULL_SOURCE_TARGET, eventType);
+            this.source = source;
             this.editIndex = editIndex;
             this.newValue = newValue;
         }
@@ -1135,7 +1137,7 @@
          * Returns the ListView upon which the edit took place.
          */
         @Override public ListView<T> getSource() {
-            return (ListView<T>) super.getSource();
+            return source;
         }
 
         /**
@@ -1216,6 +1218,8 @@
             @Override public void onChanged(Change<? extends T> c) {
                 updateItemCount();
 
+                boolean doSelectionUpdate = true;
+
                 while (c.next()) {
                     final T selectedItem = getSelectedItem();
                     final int selectedIndex = getSelectedIndex();
@@ -1228,6 +1232,7 @@
                         int newIndex = listView.getItems().indexOf(selectedItem);
                         if (newIndex != -1) {
                             setSelectedIndex(newIndex);
+                            doSelectionUpdate = false;
                         }
                     } else if (c.wasRemoved() &&
                             c.getRemovedSize() == 1 &&
@@ -1248,7 +1253,9 @@
                     }
                 }
 
-                updateSelection(c);
+                if (doSelectionUpdate) {
+                    updateSelection(c);
+                }
             }
         };
 
--- a/modules/controls/src/main/java/javafx/scene/control/MenuBar.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/MenuBar.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/MenuItem.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/MenuItem.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/MultipleSelectionModelBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/MultipleSelectionModelBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/PopupControl.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/PopupControl.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -1165,15 +1165,15 @@
          * @deprecated This is an internal API that is not intended for use and will be removed in the next version
          */
         @Deprecated
-        @Override protected void impl_processCSS(WritableValue<Boolean> unused) {
-            super.impl_processCSS(unused);
+        @Override protected void impl_processCSS() {
+            super.impl_processCSS();
 
             if (getSkin() == null) {
                 // try to create default skin
                 final Skin<?> defaultSkin = createDefaultSkin();
                 if (defaultSkin != null) {
                     skinProperty().set(defaultSkin);
-                    super.impl_processCSS(unused);
+                    super.impl_processCSS();
                 } else {
                     final String msg = "The -fx-skin property has not been defined in CSS for " + this +
                             " and createDefaultSkin() returned null.";
--- a/modules/controls/src/main/java/javafx/scene/control/ProgressBar.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ProgressBar.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/RadioButton.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/RadioButton.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ScrollBar.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ScrollBar.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ScrollPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ScrollPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Separator.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Separator.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/SkinBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/SkinBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -200,8 +200,9 @@
 
 
     /**
-     * Subclasses can invoke this method to register that we want to listen to
-     * property change events for the given property.
+     * Subclasses can invoke this method to register that they want to listen to
+     * property change events for the given property. Registered {@link Consumer} instances
+     * will be executed in the order in which they are registered.
      */
     protected final void registerChangeListener(ObservableValue<?> property, Consumer<ObservableValue<?>> consumer) {
         if (lambdaChangeListenerHandler == null) {
--- a/modules/controls/src/main/java/javafx/scene/control/Spinner.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Spinner.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/SpinnerValueFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/SpinnerValueFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/SplitPane.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/SplitPane.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TableCell.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TableCell.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TableColumn.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TableColumn.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TableSelectionModel.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TableSelectionModel.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TableView.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TableView.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.WeakHashMap;
+import java.util.stream.Collectors;
 
 import com.sun.javafx.scene.control.Logging;
 import com.sun.javafx.scene.control.Properties;
@@ -57,7 +58,6 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
-import javafx.collections.ObservableListBase;
 import javafx.collections.WeakListChangeListener;
 import javafx.collections.transformation.SortedList;
 import javafx.css.CssMetaData;
@@ -2111,6 +2111,7 @@
             updateItemCount();
 
             List<S> items1 = getTableModel();
+            boolean doSelectionUpdate = true;
 
             while (c.next()) {
                 if (c.wasReplaced() || c.getAddedSize() == getItemCount()) {
@@ -2129,6 +2130,7 @@
                     int newIndex = items1.indexOf(getSelectedItem());
                     if (newIndex != -1) {
                         setSelectedIndex(newIndex);
+                        doSelectionUpdate = false;
                     }
                 } else if (c.wasRemoved() &&
                         c.getRemovedSize() == 1 &&
@@ -2146,7 +2148,9 @@
                 }
             }
 
-            updateSelection(c);
+            if (doSelectionUpdate) {
+                updateSelection(c);
+            }
         };
 
         final WeakListChangeListener<S> weakItemsContentListener
@@ -2989,47 +2993,50 @@
             // }
             //
             // A more efficient solution:
-            final List<Integer> newlySelectedRows = new ArrayList<>();
-            final List<Integer> newlyUnselectedRows = new ArrayList<>();
+
+            final boolean isAtomic = isAtomic();
+
+            if (!isAtomic) {
+                selectedIndicesSeq._beginChange();
+            }
 
             while (c.next()) {
-                if (c.wasRemoved()) {
-                    List<? extends TablePosition<S,?>> removed = c.getRemoved();
-                    for (int i = 0; i < removed.size(); i++) {
-                        final TablePosition<S,?> tp = removed.get(i);
-                        final int row = tp.getRow();
-
-                        if (selectedIndices.get(row)) {
-                            selectedIndices.clear(row);
-                            newlyUnselectedRows.add(row);
-                        }
-                    }
+                // it may look like all we are doing here is collecting the removed elements (and
+                // counting the added elements), but the call to 'peek' is also crucial - it is
+                // ensuring that the selectedIndices bitset is correctly updated.
+                final List<Integer> removed = c.getRemoved().stream()
+                        .map(TablePosition::getRow)
+                        .distinct()
+                        .peek(selectedIndices::clear)
+                        .collect(Collectors.toList());
+
+                final int addedSize = (int)c.getAddedSubList().stream()
+                        .map(TablePosition::getRow)
+                        .distinct()
+                        .peek(selectedIndices::set)
+                        .count();
+
+                final int to = c.getFrom() + addedSize;
+
+                if (isAtomic) {
+                    continue;
                 }
-                if (c.wasAdded()) {
-                    List<? extends TablePosition<S,?>> added = c.getAddedSubList();
-                    for (int i = 0; i < added.size(); i++) {
-                        final TablePosition<S,?> tp = added.get(i);
-                        final int row = tp.getRow();
-
-                        if (! selectedIndices.get(row)) {
-                            selectedIndices.set(row);
-                            newlySelectedRows.add(row);
-                        }
-                    }
+
+                if (c.wasReplaced()) {
+                    selectedIndicesSeq._nextReplace(c.getFrom(), to, removed);
+                } else if (c.wasRemoved()) {
+                    selectedIndicesSeq._nextRemove(c.getFrom(), removed);
+                } else if (c.wasAdded()) {
+                    selectedIndicesSeq._nextAdd(c.getFrom(), to);
                 }
             }
             c.reset();
-
             selectedIndicesSeq.reset();
 
-            if (isAtomic()) {
+            if (isAtomic) {
                 return;
             }
 
-            // when the selectedCells observableArrayList changes, we manually call
-            // the observers of the selectedItems, selectedIndices and
-            // selectedCells lists.
-
             // Fix for RT-31577 - the selectedItems list was going to
             // empty, but the selectedItem property was staying non-null.
             // There is a unit test for this, so if a more elegant solution
@@ -3040,23 +3047,7 @@
                 setSelectedItem(null);
             }
 
-            final ReadOnlyUnbackedObservableList<Integer> selectedIndicesSeq =
-                    (ReadOnlyUnbackedObservableList<Integer>)getSelectedIndices();
-
-            if (! newlySelectedRows.isEmpty() && newlyUnselectedRows.isEmpty()) {
-                // need to come up with ranges based on the actualSelectedRows, and
-                // then fire the appropriate number of changes. We also need to
-                // translate from a desired row to select to where that row is
-                // represented in the selectedIndices list. For example,
-                // we may have requested to select row 5, and the selectedIndices
-                // list may therefore have the following: [1,4,5], meaning row 5
-                // is in position 2 of the selectedIndices list
-                ListChangeListener.Change<Integer> change = createRangeChange(selectedIndicesSeq, newlySelectedRows, false);
-                selectedIndicesSeq.callObservers(change);
-            } else {
-                selectedIndicesSeq.callObservers(new MappingChange<>(c, cellToIndicesMap, selectedIndicesSeq));
-                c.reset();
-            }
+            selectedIndicesSeq._endChange();
 
             selectedCellsSeq.callObservers(new MappingChange<>(c, MappingChange.NOOP_MAP, selectedCellsSeq));
             c.reset();
--- a/modules/controls/src/main/java/javafx/scene/control/ToggleButton.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ToggleButton.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/ToolBar.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/ToolBar.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/Tooltip.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/Tooltip.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableColumn.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableColumn.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -62,6 +62,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
+import java.util.stream.Collectors;
 
 import javafx.application.Platform;
 import javafx.beans.DefaultProperty;
@@ -2113,6 +2114,7 @@
          */
         public static final EventType<?> ANY = EDIT_ANY_EVENT;
 
+        private final TreeTableView<S> source;
         private final S oldValue;
         private final S newValue;
         private transient final TreeItem<S> treeItem;
@@ -2126,6 +2128,7 @@
                          EventType<? extends TreeTableView.EditEvent> eventType,
                          TreeItem<S> treeItem, S oldValue, S newValue) {
             super(source, Event.NULL_SOURCE_TARGET, eventType);
+            this.source = source;
             this.oldValue = oldValue;
             this.newValue = newValue;
             this.treeItem = treeItem;
@@ -2135,7 +2138,7 @@
          * Returns the TreeTableView upon which the edit took place.
          */
         @Override public TreeTableView<S> getSource() {
-            return (TreeTableView<S>) super.getSource();
+            return source;
         }
 
         /**
@@ -3228,53 +3231,56 @@
             //
             // selectedIndicesBitSet.clear();
             // for (int i = 0; i < selectedCells.size(); i++) {
-            //     final TreeTablePosition<S,?> tp = selectedCells.get(i);
+            //     final TablePosition<S,?> tp = selectedCells.get(i);
             //     final int row = tp.getRow();
             //     selectedIndicesBitSet.set(row);
             // }
             //
             // A more efficient solution:
-            final List<Integer> newlySelectedRows = new ArrayList<>();
-            final List<Integer> newlyUnselectedRows = new ArrayList<>();
+
+            final boolean isAtomic = isAtomic();
+
+            if (!isAtomic) {
+                selectedIndicesSeq._beginChange();
+            }
 
             while (c.next()) {
-                if (c.wasRemoved()) {
-                    List<? extends TreeTablePosition<S,?>> removed = c.getRemoved();
-                    for (int i = 0; i < removed.size(); i++) {
-                        final TreeTablePosition<S,?> tp = removed.get(i);
-                        final int row = tp.getRow();
-
-                        if (selectedIndices.get(row)) {
-                            selectedIndices.clear(row);
-                            newlyUnselectedRows.add(row);
-                        }
-                    }
+                // it may look like all we are doing here is collecting the removed elements (and
+                // counting the added elements), but the call to 'peek' is also crucial - it is
+                // ensuring that the selectedIndices bitset is correctly updated.
+                final List<Integer> removed = c.getRemoved().stream()
+                        .map(TreeTablePosition::getRow)
+                        .distinct()
+                        .peek(selectedIndices::clear)
+                        .collect(Collectors.toList());
+
+                final int addedSize = (int)c.getAddedSubList().stream()
+                        .map(TreeTablePosition::getRow)
+                        .distinct()
+                        .peek(selectedIndices::set)
+                        .count();
+
+                final int to = c.getFrom() + addedSize;
+
+                if (isAtomic) {
+                    continue;
                 }
-                if (c.wasAdded()) {
-                    List<? extends TreeTablePosition<S,?>> added = c.getAddedSubList();
-                    for (int i = 0; i < added.size(); i++) {
-                        final TreeTablePosition<S,?> tp = added.get(i);
-                        final int row = tp.getRow();
-
-                        if (! selectedIndices.get(row)) {
-                            selectedIndices.set(row);
-                            newlySelectedRows.add(row);
-                        }
-                    }
+
+                if (c.wasReplaced()) {
+                    selectedIndicesSeq._nextReplace(c.getFrom(), to, removed);
+                } else if (c.wasRemoved()) {
+                    selectedIndicesSeq._nextRemove(c.getFrom(), removed);
+                } else if (c.wasAdded()) {
+                    selectedIndicesSeq._nextAdd(c.getFrom(), to);
                 }
             }
             c.reset();
-
             selectedIndicesSeq.reset();
 
-            if (isAtomic()) {
+            if (isAtomic) {
                 return;
             }
 
-            // when the selectedCells observableArrayList changes, we manually call
-            // the observers of the selectedItems, selectedIndices and
-            // selectedCells lists.
-
             // Fix for RT-31577 - the selectedItems list was going to
             // empty, but the selectedItem property was staying non-null.
             // There is a unit test for this, so if a more elegant solution
@@ -3285,23 +3291,7 @@
                 setSelectedItem(null);
             }
 
-            final ReadOnlyUnbackedObservableList<Integer> selectedIndicesSeq =
-                    (ReadOnlyUnbackedObservableList<Integer>)getSelectedIndices();
-
-            if (! newlySelectedRows.isEmpty() && newlyUnselectedRows.isEmpty()) {
-                // need to come up with ranges based on the actualSelectedRows, and
-                // then fire the appropriate number of changes. We also need to
-                // translate from a desired row to select to where that row is
-                // represented in the selectedIndices list. For example,
-                // we may have requested to select row 5, and the selectedIndices
-                // list may therefore have the following: [1,4,5], meaning row 5
-                // is in position 2 of the selectedIndices list
-                ListChangeListener.Change<Integer> change = createRangeChange(selectedIndicesSeq, newlySelectedRows, false);
-                selectedIndicesSeq.callObservers(change);
-            } else {
-                selectedIndicesSeq.callObservers(new MappingChange<>(c, cellToIndicesMap, selectedIndicesSeq));
-                c.reset();
-            }
+            selectedIndicesSeq._endChange();
 
             selectedCellsSeq.callObservers(new MappingChange<>(c, MappingChange.NOOP_MAP, selectedCellsSeq));
             c.reset();
--- a/modules/controls/src/main/java/javafx/scene/control/TreeView.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeView.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1171,6 +1171,7 @@
          */
         public static final EventType<?> ANY = EDIT_ANY_EVENT;
 
+        private final TreeView<T> source;
         private final T oldValue;
         private final T newValue;
         private transient final TreeItem<T> treeItem;
@@ -1184,6 +1185,7 @@
                          EventType<? extends EditEvent> eventType,
                          TreeItem<T> treeItem, T oldValue, T newValue) {
             super(source, Event.NULL_SOURCE_TARGET, eventType);
+            this.source = source;
             this.oldValue = oldValue;
             this.newValue = newValue;
             this.treeItem = treeItem;
@@ -1193,7 +1195,7 @@
          * Returns the TreeView upon which the edit took place.
          */
         @Override public TreeView<T> getSource() {
-            return (TreeView<T>) super.getSource();
+            return source;
         }
 
         /**
--- a/modules/controls/src/main/java/javafx/scene/control/cell/CellUtils.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/cell/CellUtils.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ButtonBarSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ButtonBarSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ChoiceBoxSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ChoiceBoxSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxBaseSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxBaseSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -85,6 +85,8 @@
         // Call the super method with the ComboBox we were just given in the constructor
         super(control);
 
+        getChildren().clear();
+
         // open button / arrow
         arrow = new Region();
         arrow.setFocusTraversable(false);
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxListViewSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxListViewSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -443,8 +443,10 @@
             return newNode == null;
         } else {
             // run item through StringConverter if it isn't null
-            StringConverter<T> c = comboBox.getConverter();
-            String s = item == null ? comboBox.getPromptText() : (c == null ? item.toString() : c.toString(item));
+            final StringConverter<T> c = comboBox.getConverter();
+            final String promptText = comboBox.getPromptText();
+            String s = item == null && promptText != null ? promptText :
+                       c == null ? (item == null ? null : item.toString()) : c.toString(item);
             cell.setText(s);
             cell.setGraphic(null);
             return s == null || s.isEmpty();
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxMode.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxMode.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/MenuButtonSkinBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/MenuButtonSkinBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/PaginationSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/PaginationSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ProgressIndicatorSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ProgressIndicatorSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/SliderSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/SliderSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/SpinnerSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/SpinnerSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -447,12 +447,13 @@
         if (n instanceof ImageView) {
             ImageView iv = (ImageView) n;
             ImageView imageview = new ImageView();
-            imageview.setImage(iv.getImage());
+            imageview.imageProperty().bind(iv.imageProperty());
             return imageview;
         }
         if (n instanceof Label) {
             Label l = (Label)n;
             Label label = new Label(l.getText(), clone(l.getGraphic()));
+            label.textProperty().bind(l.textProperty());
             return label;
         }
         return null;
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkinBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkinBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableRowSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableRowSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableRowSkinBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableRowSkinBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableViewSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableViewSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TitledPaneSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TitledPaneSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/ToolBarSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/ToolBarSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableCellSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableCellSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableRowSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableRowSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableViewSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableViewSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/VirtualContainerBase.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/VirtualContainerBase.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/main/module-info/module-info.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/module-info/module-info.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/whiteOnBlack.css	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/whiteOnBlack.css	Fri Apr 22 09:32:30 2016 -0700
@@ -442,6 +442,14 @@
     -fx-table-cell-border-color: derive(-fx-hover-base,-30%);
 }
 /*******************************************************************************
+*                                                                              *
+* TextField                                                                    *
+*                                                                              *
+*******************************************************************************/
+.text-field {
+    -fx-prompt-text-fill: derive(-fx-hover-base,-30%);
+}
+/*******************************************************************************
  *                                                                             *
  * Tooltip                                                                     *
  *                                                                             *
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css	Fri Apr 22 09:32:30 2016 -0700
@@ -503,6 +503,14 @@
 }
 /*******************************************************************************
 *                                                                              *
+* TextField                                                                    *
+*                                                                              *
+*******************************************************************************/
+.text-field {
+    -fx-prompt-text-fill: derive(-fx-hover-base,-30%);
+}
+/*******************************************************************************
+*                                                                              *
 * List, Tree, Table COMMON                                                     *
 *                                                                              *
 *******************************************************************************/
--- a/modules/controls/src/test/java/test/com/sun/javafx/scene/control/LabeledTextTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/com/sun/javafx/scene/control/LabeledTextTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -64,7 +64,7 @@
         stage = new Stage();
         stage.setScene(scene = new Scene(label));
         scene.getStylesheets().add(LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm());
-        label.impl_processCSS(true);
+        label.applyCss();
         labeledText = LabelSkinBaseShim.getText(label);
     }
 
@@ -72,7 +72,7 @@
     public void testLabeledTextAlignmentStyleAffectsLabeledText() {
 
         label.setStyle("-fx-text-alignment: right;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(TextAlignment.RIGHT, label.getTextAlignment());
         assertEquals(TextAlignment.RIGHT, labeledText.getTextAlignment());
 
@@ -92,7 +92,7 @@
     public void testLabeledFontStyleAffectsLabeledText() {
 
         label.setStyle("-fx-font: 10px Amble;");
-        label.impl_processCSS(true);
+        label.applyCss();
         Font expected = Font.font("Amble", 10);
         assertEquals(expected, label.getFont());
         assertEquals(expected, labeledText.getFont());
@@ -113,7 +113,7 @@
     public void testLabeledTextFillStyleAffectsLabeledText() {
 
         label.setStyle("-fx-text-fill: rgb(255,0,0);");
-        label.impl_processCSS(true);
+        label.applyCss();
         Color expected = Color.rgb(255, 0, 0);
         assertEquals(expected, label.getTextFill());
         assertEquals(expected, labeledText.getFill());
@@ -134,7 +134,7 @@
     public void testLabeledUnderlineStyleAffectsLabeledText() {
 
         label.setStyle("-fx-underline: true;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assert(label.isUnderline() == true);
         assert(labeledText.isUnderline() == true);
 
@@ -143,7 +143,7 @@
     @Test
     public void testLabeledBlendModeStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-blend-mode: color-burn;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(BlendMode.COLOR_BURN,label.getBlendMode());
         assertFalse(BlendMode.COLOR_BURN.equals(labeledText.getBlendMode()));
     }
@@ -151,7 +151,7 @@
     @Test
     public void testLabeledCursorStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-cursor: crosshair;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(Cursor.CROSSHAIR,label.getCursor());
         assertFalse(Cursor.CROSSHAIR.equals(labeledText.getCursor()));
     }
@@ -159,7 +159,7 @@
     @Test
     public void testLabeledEffectStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-effect: dropshadow(one-pass-box, red, 64, .5, 2, 3);");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertNotNull(label.getEffect());
         assertNull(labeledText.getEffect());
     }
@@ -167,7 +167,7 @@
     @Test
     public void testLabeledFocusTraversableStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-focus-traversable: true;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assert(label.focusTraversableProperty().get() == true);
         assert(labeledText.focusTraversableProperty().get() == false);
     }
@@ -175,7 +175,7 @@
     @Test
     public void testLabeledOpacityStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-opacity: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getOpacity(), .5, .0000001);
         assertEquals(labeledText.getOpacity(), 1, .0000001);
     }
@@ -183,7 +183,7 @@
     @Test
     public void testLabeledRotateStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-rotate: 180;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getRotate(), 180, .0000001);
         assertEquals(labeledText.getRotate(), 0, .0000001);
     }
@@ -191,7 +191,7 @@
     @Test
     public void testLabeledScaleXStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-scale-x: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getScaleX(), .5, .0000001);
         assertEquals(labeledText.getScaleX(), 1, .0000001);
     }
@@ -199,7 +199,7 @@
     @Test
     public void testLabeledScaleYStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-scale-y: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getScaleY(), .5, .0000001);
         assertEquals(labeledText.getScaleY(), 1, .0000001);
     }
@@ -207,7 +207,7 @@
     @Test
     public void testLabeledScaleZStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-scale-z: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getScaleZ(), .5, .0000001);
         assertEquals(labeledText.getScaleZ(), 1, .0000001);
     }
@@ -215,7 +215,7 @@
     @Test
     public void testLabeledTranslateXStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-translate-x: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getTranslateX(), .5, .0000001);
         assertEquals(labeledText.getTranslateX(), 0, .0000001);
     }
@@ -223,7 +223,7 @@
     @Test
     public void testLabeledTranslateYStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-translate-y: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getTranslateY(), .5, .0000001);
         assertEquals(labeledText.getTranslateY(), 0, .0000001);
     }
@@ -231,7 +231,7 @@
     @Test
     public void testLabeledTranslateZStyleDoesNotAffectLabeledText() {
         label.setStyle("-fx-translate-z: .5;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assertEquals(label.getTranslateZ(), .5, .0000001);
         assertEquals(labeledText.getTranslateZ(), 0, .0000001);
     }
@@ -239,7 +239,7 @@
     @Test
     public void testLabeledVisibilityStyleDoesNotAffectLabeledText() {
         label.setStyle("visibility: false;");
-        label.impl_processCSS(true);
+        label.applyCss();
         assert(label.visibleProperty().get() == false);
         assert(labeledText.visibleProperty().get() == true);
     }
@@ -314,7 +314,7 @@
         label.setTextFill(Color.YELLOW);
         stage.setScene(scene = new Scene(label));
         stage.show();
-//        label.impl_processCSS(true);
+//        label.applyCss();
         labeledText = LabelSkinBaseShim.getText(label);
         assertEquals(Color.YELLOW, labeledText.getFill());
     }
@@ -332,7 +332,7 @@
         label.setFont(font);
         stage.setScene(scene = new Scene(label));
         stage.show();
-//        label.impl_processCSS(true);
+//        label.applyCss();
         labeledText = LabelSkinBaseShim.getText(label);
         assertEquals(font, labeledText.getFont());
     }
@@ -349,7 +349,7 @@
         label.setTextAlignment(TextAlignment.JUSTIFY);
         stage.setScene(scene = new Scene(label));
         stage.show();
-//        label.impl_processCSS(true);
+//        label.applyCss();
         labeledText = LabelSkinBaseShim.getText(label);
         assertEquals(TextAlignment.JUSTIFY, labeledText.getTextAlignment());
     }
@@ -366,7 +366,7 @@
         label.setUnderline(true);
         stage.setScene(scene = new Scene(label));
         stage.show();
-//        label.impl_processCSS(true);
+//        label.applyCss();
         labeledText = LabelSkinBaseShim.getText(label);
         assertTrue(labeledText.isUnderline());
     }
--- a/modules/controls/src/test/java/test/javafx/scene/control/ChoiceBoxTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/ChoiceBoxTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -25,6 +25,7 @@
 
 package test.javafx.scene.control;
 
+import javafx.scene.control.Separator;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 
@@ -504,4 +505,30 @@
         box.setSelectionModel(model);
         assertEquals("box value must be same as selected item", items.get(index), box.getValue());
     }
+
+    @Test public void test_jdk_8988261_selectNext() {
+        ChoiceBox box = new ChoiceBox();
+        box.getItems().setAll("apples", "oranges", new Separator(), "trucks", "diggers");
+
+        SingleSelectionModel sm = box.getSelectionModel();
+        sm.select(1);
+        assertEquals("oranges", sm.getSelectedItem());
+
+        sm.selectNext();
+        assertEquals("selecting next must move over separator", 3, sm.getSelectedIndex());
+        assertEquals("trucks", sm.getSelectedItem());
+    }
+
+    @Test public void test_jdk_8988261_selectPrevious() {
+        ChoiceBox box = new ChoiceBox();
+        box.getItems().setAll("apples", "oranges", new Separator(), "trucks", "diggers");
+
+        SingleSelectionModel sm = box.getSelectionModel();
+        sm.select(3);
+        assertEquals("trucks", sm.getSelectedItem());
+
+        sm.selectPrevious();
+        assertEquals("selecting previous must move over separator", 1, sm.getSelectedIndex());
+        assertEquals("oranges", sm.getSelectedItem());
+    }
 }
--- a/modules/controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/ComboBoxTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -149,7 +149,7 @@
     }
 
     @Test public void noArgConstructor_promptTextIsEmptyString() {
-        assertEquals("", comboBox.getPromptText());
+        assertNull(comboBox.getPromptText());
     }
 
     @Test public void noArgConstructor_placeholderIsNull() {
@@ -220,7 +220,7 @@
 
     @Test public void singleArgConstructor_promptTextIsEmptyString() {
         final ComboBox<String> b2 = new ComboBox<String>(FXCollections.observableArrayList("Hi"));
-        assertEquals("", b2.getPromptText());
+        assertNull(b2.getPromptText());
     }
 
     @Test public void singleArgConstructor_placeholderIsNull() {
@@ -724,6 +724,7 @@
     }
 
     @Test public void ensureCanSetPromptTextToNull() {
+        comboBox.setPromptText("");
         assertEquals("", comboBox.getPromptText());
         comboBox.setPromptText(null);
         assertEquals(null, comboBox.getPromptText());
@@ -837,7 +838,7 @@
         Stage stage = new Stage();
         Scene scene = new Scene(comboBox);
         stage.setScene(scene);
-        comboBox.impl_processCSS(true);
+        comboBox.applyCss();
         comboBox.show();
 
         comboBox.setVisibleRowCount(5);
@@ -885,7 +886,7 @@
         Stage stage = new Stage();
         Scene scene = new Scene(comboBox);
         stage.setScene(scene);
-        comboBox.impl_processCSS(true);
+        comboBox.applyCss();
         comboBox.show();
 
         comboBox.setConverter(new StringConverter() {
@@ -905,7 +906,7 @@
         assertEquals("2", comboBox.getValue());
 
         ListView listView = getListView();
-//        listView.impl_processCSS(true);
+//        listView.applyCss();
 
         assertEquals("2", listView.getSelectionModel().getSelectedItem());
 
@@ -926,7 +927,7 @@
         Stage stage = new Stage();
         Scene scene = new Scene(comboBox);
         stage.setScene(scene);
-        comboBox.impl_processCSS(true);
+        comboBox.applyCss();
         comboBox.show();
 
         SelectionModel sm = getListView().getSelectionModel();
@@ -955,7 +956,7 @@
         Stage stage = new Stage();
         Scene scene = new Scene(comboBox);
         stage.setScene(scene);
-        comboBox.impl_processCSS(true);
+        comboBox.applyCss();
         comboBox.show();
         ListCell<String> buttonCell = (ListCell<String>) getDisplayNode();
 
@@ -968,7 +969,7 @@
         sm.clearSelection();
         assertNull(sm.getSelectedItem());
         assertNull(comboBox.getValue());
-        assertEquals("", buttonCell.getText());
+        assertNull(buttonCell.getText());
         assertEquals(-1, sm.getSelectedIndex());
 
         sm.select(2);
@@ -984,7 +985,7 @@
         Stage stage = new Stage();
         Scene scene = new Scene(comboBox);
         stage.setScene(scene);
-        comboBox.impl_processCSS(true);
+        comboBox.applyCss();
         comboBox.show();
         ListCell<String> buttonCell = (ListCell<String>) getDisplayNode();
 
@@ -999,7 +1000,7 @@
         sm.clearSelection();
         assertNull(sm.getSelectedItem());
         assertNull(comboBox.getValue());
-        assertEquals("", buttonCell.getText());
+        assertNull(buttonCell.getText());
         assertEquals(-1, sm.getSelectedIndex());
 
         sm.select("2");
@@ -1128,7 +1129,7 @@
         assertEquals(1, comboBox.getButtonCell().getIndex());
 
         comboBox.setItems(FXCollections.observableArrayList("1","2","3","4"));
-        assertTrue(comboBox.getButtonCell().getText().isEmpty());
+        assertNull(comboBox.getButtonCell().getText());
         assertEquals(-1, comboBox.getButtonCell().getIndex());
 
         sl.dispose();
@@ -1158,7 +1159,7 @@
 
         comboBox.setValue(null);
         Toolkit.getToolkit().firePulse();
-        assertTrue(comboBox.getButtonCell().getText().isEmpty());
+        assertNull(comboBox.getButtonCell().getText());
         assertEquals(-1, comboBox.getButtonCell().getIndex());
         assertTrue(customCell.getPseudoClassStates().contains(empty));
 
--- a/modules/controls/src/test/java/test/javafx/scene/control/DatePickerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/DatePickerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -111,8 +111,8 @@
         assertFalse(datePicker.isShowing());
     }
 
-    @Test public void noArgConstructor_promptTextIsEmptyString() {
-        assertEquals("", datePicker.getPromptText());
+    @Test public void noArgConstructor_promptTextIsNull() {
+        assertNull(datePicker.getPromptText());
     }
 
     @Test public void noArgConstructor_armedIsFalse() {
@@ -151,9 +151,9 @@
         assertFalse(b2.isShowing());
     }
 
-    @Test public void singleArgConstructor_promptTextIsEmptyString() {
+    @Test public void singleArgConstructor_promptTextIsNull() {
         final DatePicker b2 = new DatePicker(today);
-        assertEquals("", b2.getPromptText());
+        assertNull(b2.getPromptText());
     }
 
     @Test public void singleArgConstructor_armedIsFalse() {
@@ -323,6 +323,7 @@
     }
 
     @Test public void ensureCanSetPromptTextToNull() {
+        datePicker.setPromptText("");
         assertEquals("", datePicker.getPromptText());
         datePicker.setPromptText(null);
         assertEquals(null, datePicker.getPromptText());
--- a/modules/controls/src/test/java/test/javafx/scene/control/ListViewMouseInputTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/ListViewMouseInputTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/ListViewTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/ListViewTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/MultipleSelectionModelImplTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/MultipleSelectionModelImplTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -1193,4 +1193,37 @@
 
         sl.dispose();
     }
+
+    @Test public void test_jdk_8088752() {
+        // FIXME for now this test does not cover TreeView / TreeTableView
+        if (isTree()) {
+            return;
+        }
+
+        Object uncontained = isTree() ? new TreeItem<>("uncontained") : "uncontained";
+
+        model.selectRange(3, 5);
+        model.select(uncontained);
+
+        assertEquals("sanity: having uncontained selectedItem", uncontained, model.getSelectedItem());
+        assertEquals("sanity: selected index removed ", -1, model.getSelectedIndex());
+
+        // insert uncontained to items
+        int insertIndex = 3;
+        addItem(insertIndex, uncontained);
+        assertEquals("selectedItem unchanged", uncontained, model.getSelectedItem());
+        assertEquals("selectedIndex updated", insertIndex, model.getSelectedIndex());
+    }
+
+    private void addItem(int index, Object item) {
+        if (currentControl instanceof ListView) {
+            ((ListView) currentControl).getItems().add(index, item);
+        } else if (currentControl instanceof TableView) {
+            ((TableView) currentControl).getItems().add(index, item);
+        } else if (currentControl instanceof TreeView || currentControl instanceof TreeTableView) {
+            root.getChildren().add(index, (TreeItem)item);
+        } else {
+            throw new RuntimeException("Unsupported control type");
+        }
+    }
 }
--- a/modules/controls/src/test/java/test/javafx/scene/control/PopupControlTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/PopupControlTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -446,7 +446,7 @@
         Tooltip tooltip = new Tooltip("Hello");
         TooltipSkin skin = new TooltipSkin(tooltip);
         popup.setSkin(skin);
-        popup.getScene().getRoot().impl_processCSS(true);
+        popup.getScene().getRoot().applyCss();
 
         popup.setMinWidth(PopupControl.USE_COMPUTED_SIZE);
         assertEquals(popup.getSkin().getNode().minWidth(anyNum), popup.minWidth(anyNum), 0.0D);
@@ -485,7 +485,7 @@
         Tooltip tooltip = new Tooltip("Hello");
         TooltipSkin skin = new TooltipSkin(tooltip);
         popup.setSkin(skin);
-        popup.getScene().getRoot().impl_processCSS(true);
+        popup.getScene().getRoot().applyCss();
 
         popup.setMinHeight(PopupControl.USE_COMPUTED_SIZE);
         assertEquals(popup.getSkin().getNode().minHeight(anyNum), popup.minHeight(anyNum), 0.0D);
@@ -524,7 +524,7 @@
         Tooltip tooltip = new Tooltip("Hello");
         TooltipSkin skin = new TooltipSkin(tooltip);
         popup.setSkin(skin);
-        popup.getScene().getRoot().impl_processCSS(true);
+        popup.getScene().getRoot().applyCss();
 
         popup.setPrefWidth(PopupControl.USE_COMPUTED_SIZE);
         assertEquals(popup.getSkin().getNode().prefWidth(anyNum), popup.prefWidth(anyNum), 0.0D);
@@ -563,7 +563,7 @@
         Tooltip tooltip = new Tooltip("Hello");
         TooltipSkin skin = new TooltipSkin(tooltip);
         popup.setSkin(skin);
-        popup.getScene().getRoot().impl_processCSS(true);
+        popup.getScene().getRoot().applyCss();
 
         popup.setPrefHeight(PopupControl.USE_COMPUTED_SIZE);
         assertEquals(popup.getSkin().getNode().prefHeight(anyNum), popup.prefHeight(anyNum), 0.0D);
@@ -602,7 +602,7 @@
         Tooltip tooltip = new Tooltip("Hello");
         TooltipSkin skin = new TooltipSkin(tooltip);
         popup.setSkin(skin);
-        popup.getScene().getRoot().impl_processCSS(true);
+        popup.getScene().getRoot().applyCss();
 
         popup.setMaxWidth(PopupControl.USE_COMPUTED_SIZE);
         assertEquals(popup.getSkin().getNode().maxWidth(anyNum), popup.maxWidth(anyNum), 0.0D);
@@ -641,7 +641,7 @@
         Tooltip tooltip = new Tooltip("Hello");
         TooltipSkin skin = new TooltipSkin(tooltip);
         popup.setSkin(skin);
-        popup.getScene().getRoot().impl_processCSS(true);
+        popup.getScene().getRoot().applyCss();
 
         popup.setMaxHeight(PopupControl.USE_COMPUTED_SIZE);
         assertEquals(popup.getSkin().getNode().maxHeight(anyNum), popup.maxHeight(anyNum), 0.0D);
--- a/modules/controls/src/test/java/test/javafx/scene/control/SliderTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/SliderTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/SpinnerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/SpinnerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TableViewMouseInputTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TableViewMouseInputTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TableViewSelectionModelImplTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TableViewSelectionModelImplTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TableViewTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TableViewTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TextAreaTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TextAreaTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -147,21 +147,21 @@
     @Test public void wrapTextSetFromCSS() {
         txtArea.setStyle("-fx-wrap-text: true");
         Scene s = new Scene(txtArea);
-        txtArea.impl_processCSS(true);
+        txtArea.applyCss();
         assertTrue(txtArea.isWrapText());
     }
 
     @Test public void prefColumnCountSetFromCSS() {
         txtArea.setStyle("-fx-pref-column-count: 100");
         Scene s = new Scene(txtArea);
-        txtArea.impl_processCSS(true);
+        txtArea.applyCss();
         assertEquals(100, txtArea.getPrefColumnCount());
     }
 
     @Test public void prefRowCountSetFromCSS() {
         txtArea.setStyle("-fx-pref-row-count: 100");
         Scene s = new Scene(txtArea);
-        txtArea.impl_processCSS(true);
+        txtArea.applyCss();
         assertEquals(100, txtArea.getPrefRowCount());
     }
 
--- a/modules/controls/src/test/java/test/javafx/scene/control/TextFieldTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TextFieldTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -138,13 +138,13 @@
     @Test public void prefColumnCountSetFromCSS() {
         txtField.setStyle("-fx-pref-column-count: 100");
         Scene s = new Scene(txtField);
-        txtField.impl_processCSS(true);
+        txtField.applyCss();
         assertEquals(100.0, txtField.getPrefColumnCount(), 0);
     }
 
     @Test public void pseudoClassState_isReadOnly() {
         StageLoader sl = new StageLoader(txtField);
-        txtField.impl_processCSS(true);
+        txtField.applyCss();
 
         txtField.setEditable(false);
         ObservableSet<PseudoClass> pcSet = txtField.getPseudoClassStates();
@@ -160,7 +160,7 @@
 
     @Test public void pseudoClassState_isNotReadOnly() {
         StageLoader sl = new StageLoader(txtField);
-        txtField.impl_processCSS(true);
+        txtField.applyCss();
 
         txtField.setEditable(true);
         ObservableSet<PseudoClass> pcSet = txtField.getPseudoClassStates();
--- a/modules/controls/src/test/java/test/javafx/scene/control/TextInputControlTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TextInputControlTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -127,7 +127,7 @@
     @Test public void fontSetFromCSS() {
         textInput.setStyle("-fx-font: 24 Helvetica");
         Scene s = new Scene(textInput);
-        textInput.impl_processCSS(true);
+        textInput.applyCss();
         assertEquals(Font.font("Helvetica", 24), textInput.getFont());
     }
 
--- a/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewKeyInputTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewKeyInputTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewMouseInputTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewMouseInputTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewSelectionModelImplTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewSelectionModelImplTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TreeViewMouseInputTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TreeViewMouseInputTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/TreeViewTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/TreeViewTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/skin/ArrayLinkedListTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/skin/ArrayLinkedListTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/skin/ButtonSkinTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/skin/ButtonSkinTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/skin/SeparatorSkinTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/controls/src/test/java/test/javafx/scene/control/skin/VirtualFlowTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/fxml/make/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/make/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- a/modules/fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/URLBuilder.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/main/java/com/sun/javafx/fxml/builder/URLBuilder.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/fxml/src/main/java/javafx/fxml/JavaFXBuilderFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/main/java/javafx/fxml/JavaFXBuilderFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/fxml/src/main/module-info/module-info.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/main/module-info/module-info.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/fxml/src/test/java/test/com/sun/javafx/fxml/builder/ProxyBuilderTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxml/src/test/java/test/com/sun/javafx/fxml/builder/ProxyBuilderTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/fxpackager/make/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/make/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- a/modules/fxpackager/src/main/java/com/javafx/main/Main.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/javafx/main/Main.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractImageBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractImageBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/BasicBundlers.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/BasicBundlers.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/BundlerParamInfo.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/BundlerParamInfo.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/Bundlers.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/Bundlers.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/IOUtils.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/IOUtils.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/jnlp/JNLPBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/jnlp/JNLPBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppStoreBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppStoreBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacBaseInstallerBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacBaseInstallerBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacDaemonBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacDaemonBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinAppBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinAppBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinServiceBundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinServiceBundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/FileAssociation.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/FileAssociation.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/SecondaryLauncher.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/SecondaryLauncher.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/CreateJarParams.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/CreateJarParams.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/Bundler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/Bundler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/fxpackager/src/main/module-info/module-info.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/module-info/module-info.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/fxpackager/src/main/native/javapackager/win/javapackager.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/javapackager/win/javapackager.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/fxpackager/src/main/native/library/common/GenericPlatform.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/GenericPlatform.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Helpers.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Helpers.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Helpers.h	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Helpers.h	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/IniFile.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/IniFile.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/JavaVirtualMachine.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/JavaVirtualMachine.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/JavaVirtualMachine.h	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/JavaVirtualMachine.h	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Package.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Package.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Package.h	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Package.h	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Platform.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Platform.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Platform.h	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Platform.h	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.h	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.h	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/WindowsPlatform.cpp	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/WindowsPlatform.cpp	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/WindowsPlatform.h	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/main/native/library/common/WindowsPlatform.h	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppStoreBundlerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppStoreBundlerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDaemonBundlerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDaemonBundlerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDmgBundlerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacDmgBundlerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacPkgBundlerTest.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacPkgBundlerTest.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackager/src/test/java/hello/SimpleBundle.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/hello/SimpleBundle.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/fxpackager/src/test/java/hello/TestPackager.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackager/src/test/java/hello/TestPackager.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackagerservices/make/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackagerservices/make/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- a/modules/fxpackagerservices/src/main/java/jdk/packager/services/UserJvmOptionsService.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackagerservices/src/main/java/jdk/packager/services/UserJvmOptionsService.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackagerservices/src/main/java/jdk/packager/services/userjvmoptions/LauncherUserJvmOptions.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackagerservices/src/main/java/jdk/packager/services/userjvmoptions/LauncherUserJvmOptions.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackagerservices/src/main/java/jdk/packager/services/userjvmoptions/PreferencesUserJvmOptions.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackagerservices/src/main/java/jdk/packager/services/userjvmoptions/PreferencesUserJvmOptions.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/fxpackagerservices/src/main/module-info/module-info.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/fxpackagerservices/src/main/module-info/module-info.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- a/modules/graphics/make/build.properties	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/make/build.properties	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- a/modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Fri Apr 22 09:32:30 2016 -0700
@@ -1969,6 +1969,16 @@
           See <a href="#controls">Controls</a> for details.</td>
         </tr>
         <tr>
+            <td class="propertyname">-fx-view-order</td>
+            <td class="value"><a href="#typenumber" class="typelink">&lt;number&gt;</a></td>
+            <td class="default">0</td>
+            <td class="range">&nbsp;</td>
+            <td>This property is used to alter the rendering and picking order of
+                a node within its parent without reordering the parent's children list.
+                The parent traverses its children in decreasing viewOrder order.
+            </td>
+        </tr>
+        <tr>
           <td class="propertyname">-fx-opacity</td>
           <td class="value"><a href="#typenumber" class="typelink">&lt;number&gt;</a></td>
           <td class="default">1</td>
--- a/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Window.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Window.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -1613,6 +1613,9 @@
     // reuse key to avoid creation of numerous small objects
     private Key key = null;
 
+    // Stores weak references to regions which return non-null user agent stylesheets
+    private final WeakHashMap<Region, String> weakRegionUserAgentStylesheetMap = new WeakHashMap<>();
+
     /**
      * Finds matching styles for this Node.
      */
@@ -1659,11 +1662,15 @@
             // is this node in a region that has its own stylesheet?
             Node region = node;
             while (region != null) {
-                regionUserAgentStylesheet = (region instanceof Region) ? ((Region) region).getUserAgentStylesheet() : null;
-                if (regionUserAgentStylesheet != null) {
-                    // We want 'region' to be the node that has the user agent stylesheet.
-                    // 'region' is used below - look for if (hasRegionUserAgentStylesheet) block
-                    break;
+                if (region instanceof Region) {
+                    regionUserAgentStylesheet = weakRegionUserAgentStylesheetMap.computeIfAbsent(
+                            (Region)region, Region::getUserAgentStylesheet);
+
+                    if (regionUserAgentStylesheet != null) {
+                        // We want 'region' to be the node that has the user agent stylesheet.
+                        // 'region' is used below - look for if (hasRegionUserAgentStylesheet) block
+                        break;
+                    }
                 }
                 region = region.getParent();
             }
--- a/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/font/FontConfigManager.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/geom/transform/TransformHelper.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/geom/transform/TransformHelper.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/jmx/HighlightRegion.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/jmx/HighlightRegion.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/scene/DirtyBits.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/scene/DirtyBits.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -41,6 +41,7 @@
     NODE_BLENDMODE,
     NODE_CSS,
     NODE_FORCE_SYNC,
+    NODE_VIEW_ORDER,
 
     // Dirty bits for various subclasses of Node
     NODE_GEOMETRY,  // Used by ImageView, MediaView, and subclasses of Shape and Shape3D
@@ -52,6 +53,7 @@
 
     // Dirty bits for the Parent class
     PARENT_CHILDREN,  // children removed, added or permuted
+    PARENT_CHILDREN_VIEW_ORDER,
 
     // Dirty bits for the Shape class
     SHAPE_FILL,
--- a/modules/graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/graphics/src/main/java/com/sun/javafx/scene/ParentHelper.java	Fri Apr 22 09:32:30 2016 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016, 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.sun.javafx.scene;
+
+import com.sun.javafx.geom.PickRay;
+import com.sun.javafx.scene.input.PickResultChooser;
+import javafx.scene.Parent;
+
+/**
+ * Used to access internal methods of Parent.
+ */
+public class ParentHelper {
+
+    private static ParentAccessor parentAccessor;
+
+    static {
+        forceInit(Parent.class);
+    }
+
+    private ParentHelper() {
+    }
+
+    public static boolean pickChildrenNode(Parent parent, PickRay pickRay,
+            PickResultChooser result) {
+        return parentAccessor.pickChildrenNode(parent, pickRay, result);
+    }
+
+    public static void setParentAccessor(final ParentAccessor newAccessor) {
+        if (parentAccessor != null) {
+            throw new IllegalStateException();
+        }
+
+        parentAccessor = newAccessor;
+    }
+
+    public interface ParentAccessor {
+        boolean pickChildrenNode(Parent parent, PickRay pickRay, PickResultChooser result);
+    }
+
+    private static void forceInit(final Class<?> classToInit) {
+        try {
+            Class.forName(classToInit.getName(), true,
+                    classToInit.getClassLoader());
+        } catch (final ClassNotFoundException e) {
+            throw new AssertionError(e);  // Can't happen
+        }
+    }
+}
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGGroup.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGGroup.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -40,6 +40,7 @@
 import com.sun.scenario.effect.ImageData;
 import com.sun.scenario.effect.impl.prism.PrDrawable;
 import com.sun.scenario.effect.impl.prism.PrEffectHelper;
+import javafx.scene.Node;
 
 /**
  */
@@ -58,6 +59,15 @@
     private List<NGNode> removed;
 
     /**
+     * The viewOrderChildren is a list children sorted in decreasing viewOrder
+     * order if it is not empty. Its size should always be equal to
+     * children.size(). If viewOrderChildren is empty it implies that the
+     * rendering order of the children is the same as the order in the children
+     * list.
+     */
+    private final List<NGNode> viewOrderChildren = new ArrayList<>(1);
+
+    /**
      * This mask has all bits that mark that a region intersects this group.
      * Which means it looks like this: 00010101010101010101010101010101 (first bit for sign)
      */
@@ -172,6 +182,28 @@
         markTreeDirtyNoIncrement();
     }
 
+    // Call this method if children view order is needed for rendering.
+    // The returned list should be treated as read only.
+    private List<NGNode> getOrderedChildren() {
+        if (!viewOrderChildren.isEmpty()) {
+            return viewOrderChildren;
+        }
+        return children;
+    }
+
+    // NOTE: This method is called on the FX application thread with the
+    // RenderLock held.
+    public void setViewOrderChildren(List<Node> sortedChildren) {
+        viewOrderChildren.clear();
+        for (Node child : sortedChildren) {
+            NGNode childPeer = child.impl_getPeer();
+            viewOrderChildren.add(childPeer);
+        }
+
+        // Mark visual dirty
+        visualsChanged();
+    }
+
     /**
      * Set by the FX scene graph.
      * @param blendMode cannot be null
@@ -191,17 +223,19 @@
 
     @Override
     public void renderForcedContent(Graphics gOptional) {
-        if (children == null) {
+        List<NGNode> orderedChildren = getOrderedChildren();
+        if (orderedChildren == null) {
             return;
         }
-        for (int i = 0; i < children.size(); i++) {
-            children.get(i).renderForcedContent(gOptional);
+        for (int i = 0; i < orderedChildren.size(); i++) {
+            orderedChildren.get(i).renderForcedContent(gOptional);
         }
     }
 
     @Override
     protected void renderContent(Graphics g) {
-        if (children == null) {
+        List<NGNode> orderedChildren = getOrderedChildren();
+        if (orderedChildren == null) {
             return;
         }
 
@@ -210,10 +244,10 @@
         if (renderRoot != null) {
             if (renderRoot.hasNext()) {
                 renderRoot.next();
-                startPos = children.indexOf(renderRoot.getCurrentNode());
+                startPos = orderedChildren.indexOf(renderRoot.getCurrentNode());
 
                 for (int i = 0; i < startPos; ++i) {
-                    children.get(i).clearDirtyTree();
+                    orderedChildren.get(i).clearDirtyTree();
                 }
             } else {
                 g.setRenderRoot(null);
@@ -221,12 +255,12 @@
         }
 
         if (blendMode == Blend.Mode.SRC_OVER ||
-                children.size() < 2) {  // Blend modes only work "between" siblings
+                orderedChildren.size() < 2) {  // Blend modes only work "between" siblings
 
-            for (int i = startPos; i < children.size(); i++) {
+            for (int i = startPos; i < orderedChildren.size(); i++) {
                 NGNode child;
                 try {
-                    child = children.get(i);
+                    child = orderedChildren.get(i);
                 } catch (Exception e) {
                     child = null;
                 }
@@ -251,8 +285,8 @@
                 bot = null;
             }
             Rectangle rclip = PrEffectHelper.getGraphicsClipNoClone(g);
-            for (int i = startPos; i < children.size(); i++) {
-                NGNode child = children.get(i);
+            for (int i = startPos; i < orderedChildren.size(); i++) {
+                NGNode child = orderedChildren.get(i);
                 ImageData top = NodeEffectInput.
                     getImageDataForNode(fctx, child, false, transform, rclip);
                 if (bot == null) {
@@ -285,9 +319,10 @@
             // All other modes are flattened so there are no overlapping issues
             return false;
         }
-        int n = (children == null ? 0 : children.size());
+        List<NGNode> orderedChildren = getOrderedChildren();
+        int n = (orderedChildren == null ? 0 : orderedChildren.size());
         if (n == 1) {
-            return children.get(0).hasOverlappingContents();
+            return orderedChildren.get(0).hasOverlappingContents();
         }
         return (n != 0);
     }
@@ -375,9 +410,10 @@
         // True if every child _after_ the the found render root is clean
         boolean followingChildrenClean = true;
         // Iterate over all children, looking for a render root.
-        for (int resultIdx=children.size()-1; resultIdx>=0; resultIdx--) {
+        List<NGNode> orderedChildren = getOrderedChildren();
+        for (int resultIdx = orderedChildren.size() - 1; resultIdx >= 0; resultIdx--) {
             // Get the render root result from the child
-            final NGNode child = children.get(resultIdx);
+            final NGNode child = orderedChildren.get(resultIdx);
             result = child.computeRenderRoot(path, dirtyRegion, cullingIndex, chTx, pvTx);
             // Update this flag, which if true means that this child and all subsequent children
             // of this group are all clean.
@@ -437,8 +473,9 @@
             BaseTransform chTx = tx.deriveWithConcatenation(getTransform());
 
             NGNode child;
-            for (int chldIdx = 0; chldIdx < children.size(); chldIdx++) {
-                child = children.get(chldIdx);
+            List<NGNode> orderedChildren = getOrderedChildren();
+            for (int chldIdx = 0; chldIdx < orderedChildren.size(); chldIdx++) {
+                child = orderedChildren.get(chldIdx);
                 child.markCullRegions(
                         drc,
                         cullingBits,
@@ -458,8 +495,9 @@
         // that the source transform (tx) is not modified.
         BaseTransform clone = tx.copy();
         clone = clone.deriveWithConcatenation(getTransform());
-        for (int childIndex = 0; childIndex < children.size(); childIndex++) {
-            final NGNode child = children.get(childIndex);
+        List<NGNode> orderedChildren = getOrderedChildren();
+        for (int childIndex = 0; childIndex < orderedChildren.size(); childIndex++) {
+            final NGNode child = orderedChildren.get(childIndex);
             child.drawDirtyOpts(clone, pvTx, clipBounds, countBuffer, dirtyRegionIndex);
         }
     }
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGNode.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGNode.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -189,6 +189,11 @@
     private float opacity = 1f;
 
     /**
+     * The view order of this node.
+     */
+    private double viewOrder = 0;
+
+    /**
      * The blend mode that controls how the pixels of this node blend into
      * the rest of the scene behind it.
      */
@@ -437,6 +442,22 @@
     }
 
     /**
+     * Called by the FX scene graph whenever the view order for the node
+     * changes.
+     *
+     * @param viewOrder A value between the range of negative Double.MAX_VALUE
+     * and positive Double.MAX_VALUE.
+     */
+    public void setViewOrder(double viewOrder) {
+        // If the viewOrder value has changed, react.
+        if (viewOrder != this.viewOrder) {
+            this.viewOrder = viewOrder;
+            // Mark this node dirty and invalidate its cache.
+            visualsChanged();
+        }
+    }
+
+    /**
      * Set by the FX scene graph.
      * @param blendMode may be null to indicate "default"
      */
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGRegion.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGRegion.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/openpisces/Renderer.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/openpisces/Renderer.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/Graphics.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/Graphics.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/Presentable.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/Presentable.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/PresentableState.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/ResourceFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/ResourceFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/es2/ES2ResourceFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/es2/GLContext.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/es2/GLContext.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/impl/BaseContext.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/BaseContext.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/impl/VertexBuffer.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/VertexBuffer.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderContext.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/ps/BaseShaderContext.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/j2d/J2DResourceFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/j2d/J2DResourceFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/null3d/DummyContext.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/null3d/DummyContext.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/null3d/DummyResourceFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/null3d/NULL3DPipeline.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/null3d/NULL3DPipeline.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/com/sun/prism/sw/SWResourceFactory.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/sw/SWResourceFactory.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/FadeTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/FadeTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/FillTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/FillTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/PathTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/PathTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/PauseTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/PauseTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/RotateTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/RotateTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/ScaleTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/ScaleTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/StrokeTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/StrokeTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/javafx/animation/TranslateTransition.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/animation/TranslateTransition.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
--- a/modules/graphics/src/main/java/javafx/css/SizeUnits.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/css/SizeUnits.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/javafx/css/Styleable.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/css/Styleable.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/javafx/css/converter/URLConverter.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/css/converter/URLConverter.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
--- a/modules/graphics/src/main/java/javafx/geometry/BoundingBox.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/geometry/BoundingBox.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/javafx/geometry/Dimension2D.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/geometry/Dimension2D.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/javafx/geometry/Rectangle2D.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/geometry/Rectangle2D.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
--- a/modules/graphics/src/main/java/javafx/scene/Node.java	Thu Apr 21 07:36:27 2016 -0700
+++ b/modules/graphics/src/main/java/javafx/scene/Node.java	Fri Apr 22 09:32:30 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -599,6 +599,10 @@
             peer.setTransformMatrix(localToParentTx);
         }
 
+        if (impl_isDirty(DirtyBits.NODE_VIEW_ORDER)) {
+            peer.setViewOrder(getViewOrder());
+        }
+
         if (impl_isDirty(DirtyBits.NODE_BOUNDS)) {
             peer.setContentBounds(_geomBounds);
         }
@@ -1776,7 +1780,7 @@
      */
     public void toBack() {
         if (getParent() != null) {
-            getParent().impl_toBack(this);
+            getParent().toBack(this);
         }
     }
 
@@ -1788,7 +1792,7 @@
      */
     public void toFront() {
         if (getParent() != null) {
-            getParent().impl_toFront(this);
+            getParent().toFront(this);
         }
     }
 
@@ -3000,7 +3004,7 @@
      * @since JavaFX 8.0
      */
     public double computeAreaInScreen() {
-        return impl_computeAreaInScreen();
+        return doComputeAreaInScreen();
     }
 
     /*
@@ -3017,7 +3021,7 @@
      *
      * Returns 0 for those fall outside viewing frustrum.
      */
-    private double impl_computeAreaInScreen() {
+    private double doComputeAreaInScreen() {
         Scene tmpScene = getScene();
         if (tmpScene != null) {
             Bounds bounds = getBoundsInLocal();
@@ -3907,7 +3911,7 @@
      */
     @Deprecated
     protected boolean containsBounds(double localX, double localY) {
-          final TempState tempState = TempState.getInstance();
+        final TempState tempState = TempState.getInstance();
         BaseBounds tempBounds = tempState.bounds;
 
         // first, we do a quick test to see if the point is contained in
@@ -5219,6 +5223,54 @@
     static boolean almostZero(double a) {
         return ((a < EPSILON_ABSOLUTE) && (a > -EPSILON_ABSOLUTE));
     }
+
+    /***************************************************************************
+     *                                                                         *
+     *                      viewOrder property handling                        *
+     *                                                                         *
+     **************************************************************************/
+    public final void setViewOrder(double value) {
+        viewOrderProperty().set(value);
+    }
+
+    public final double getViewOrder() {
+        return (miscProperties == null) ? DEFAULT_VIEW_ORDER
+                : miscProperties.getViewOrder();
+    }
+
+    /**
+     * Defines the rendering and picking order of this {@code Node} within its
+     * parent.
+     * <p>
+     * This property is used to alter the rendering and picking order of a node
+     * within its parent without reordering the parent's {@code children} list.
+     * For example, this can be used as a more efficient way to implement
+     * transparency sorting. To do this, an application can assign the viewOrder
+     * value of each node to the computed distance between that node and the
+     * viewer.
+     * </p>
+     * <p>
+     * The parent will traverse its {@code children} in decreasing
+     * {@code viewOrder} order. This means that a child with a lower
+     * {@code viewOrder} will be in front of a child with a higher
+     * {@code viewOrder}. If two children have the same {@code viewOrder}, the
+     * parent will traverse them in the order they appear in the parent's
+     * {@code children} list.
+     * </p>
+     * <p>
+     * However, {@code viewOrder} does not alter the layout and focus traversal
+     * order of this Node within its parent. A parent always traverses its
+     * {@code children} list in order when doing layout or focus traversal.
+     * </p>
+     *
+     * @defaultValue 0.0
+     *
+     * @since 9
+     */
+    public final DoubleProperty viewOrderProperty() {
+        return getMiscProperties().viewOrderProperty();
+    }
+
     /***************************************************************************
      *                                                                         *
      *                             Transformations                             *
@@ -6418,6 +6470,7 @@
         return miscProperties;
     }
 
+    private static final double DEFAULT_VIEW_ORDER = 0;
     private static final boolean DEFAULT_CACHE = false;
     private static final CacheHint DEFAULT_CACHE_HINT = CacheHint.DEFAULT;
     private static final Node DEFAULT_CLIP = null;
@@ -6441,6 +6494,43 @@
         private ObjectProperty<Effect> effect;
         private ObjectProperty<InputMethodRequests> inputMethodRequests;
         private BooleanProperty mouseTransparent;
+        private DoubleProperty viewOrder;
+
+        public double getViewOrder() {
+            return (viewOrder == null) ? DEFAULT_VIEW_ORDER : viewOrder.get();
+        }