changeset 10508:51d33b49c088 jdk-9+172

Merge
author kcr
date Thu, 25 May 2017 19:03:30 -0700
parents 7b7227bc5ad9 bb6ff097ba6e
children 0f9a9a173cfe 9c95e8f07c28 9f9f6610066b
files
diffstat 36 files changed, 65 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/build.properties	Fri May 19 16:08:06 2017 -0700
+++ b/build.properties	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO 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/javafx.base/src/main/java/javafx/beans/binding/Binding.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/Binding.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/javafx.base/src/main/java/javafx/beans/binding/BooleanExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/BooleanExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 import javafx.beans.value.ObservableValue;
 
 /**
- * A {@code BooleanExpression} is a
+ * {@code BooleanExpression} is an
  * {@link javafx.beans.value.ObservableBooleanValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/DoubleExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/DoubleExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 import javafx.beans.value.ObservableValue;
 
 /**
- * A {@code DoubleExpression} is a
+ * {@code DoubleExpression} is an
  * {@link javafx.beans.value.ObservableDoubleValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/FloatExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/FloatExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 import javafx.beans.value.ObservableValue;
 
 /**
- * A {@code FloatExpression} is a
+ * {@code FloatExpression} is an
  * {@link javafx.beans.value.ObservableFloatValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/IntegerExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/IntegerExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 import javafx.beans.value.ObservableValue;
 
 /**
- * A {@code IntegerExpression} is a
+ * {@code IntegerExpression} is an
  * {@link javafx.beans.value.ObservableIntegerValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/ListExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/ListExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
 import java.util.ListIterator;
 
 /**
- * A {@code ListExpression} is a
+ * {@code ListExpression} is an
  * {@link javafx.beans.value.ObservableListValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/LongExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/LongExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 import javafx.beans.value.ObservableValue;
 
 /**
- * A {@code LongExpression} is a {@link javafx.beans.value.ObservableLongValue}
+ * {@code LongExpression} is an {@link javafx.beans.value.ObservableLongValue}
  * plus additional convenience methods to generate bindings in a fluent style.
  * <p>
  * A concrete sub-class of {@code LongExpression} has to implement the method
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/MapExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/MapExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
 import java.util.*;
 
 /**
- * A {@code MapExpression} is a
+ * {@code MapExpression} is an
  * {@link javafx.beans.value.ObservableMapValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/NumberExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/NumberExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 import javafx.beans.value.ObservableNumberValue;
 
 /**
- * A {@code NumberExpression} is a
+ * {@code NumberExpression} is an
  * {@link javafx.beans.value.ObservableNumberValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/NumberExpressionBase.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/NumberExpressionBase.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +36,7 @@
 import com.sun.javafx.binding.StringFormatter;
 
 /**
- * A {@code NumberExpressionBase} contains convenience methods to generate bindings in a fluent style,
+ * {@code NumberExpressionBase} contains convenience methods to generate bindings in a fluent style,
  * that are common to all NumberExpression subclasses.
  * <p>
  * NumberExpressionBase serves as a place for common code of specific NumberExpression subclasses for the
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/ObjectExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/ObjectExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 import java.util.Locale;
 
 /**
- * A {@code ObjectExpression} is a
+ * {@code ObjectExpression} is an
  * {@link javafx.beans.value.ObservableObjectValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/SetExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/SetExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +41,7 @@
 import java.util.NoSuchElementException;
 
 /**
- * A {@code SetExpression} is a
+ * {@code SetExpression} is an
  * {@link javafx.beans.value.ObservableSetValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/binding/StringExpression.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/binding/StringExpression.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 import com.sun.javafx.binding.StringFormatter;
 
 /**
- * A {@code StringExpression} is a
+ * {@code StringExpression} is an
  * {@link javafx.beans.value.ObservableStringValue} plus additional convenience
  * methods to generate bindings in a fluent style.
  * <p>
--- a/modules/javafx.base/src/main/java/javafx/beans/property/ListProperty.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/ListProperty.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 import javafx.collections.ObservableList;
 
 /**
- * This class provides a full implementation of a {@link Property} wrapping a
+ * This class provides a full implementation of a {@link Property} wrapping an
  * {@link javafx.collections.ObservableList}.
  *
  * The value of a {@code ListProperty} can be get and set with {@link #get()},
--- a/modules/javafx.base/src/main/java/javafx/beans/property/MapProperty.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/MapProperty.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 import javafx.collections.ObservableMap;
 
 /**
- * This class provides a full implementation of a {@link Property} wrapping a
+ * This class provides a full implementation of a {@link Property} wrapping an
  * {@link javafx.collections.ObservableMap}.
  *
  * The value of a {@code MapProperty} can be get and set with {@link #get()},
--- a/modules/javafx.base/src/main/java/javafx/beans/property/ReadOnlyListPropertyBase.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/ReadOnlyListPropertyBase.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,8 @@
 import javafx.collections.ObservableList;
 
 /**
- * Base class for all readonly properties wrapping a {@link javafx.collections.ObservableList}.
+ * Base class for all readonly properties wrapping an
+ * {@link javafx.collections.ObservableList}.
  * This class provides a default implementation to attach listener.
  *
  * @see ReadOnlyListProperty
--- a/modules/javafx.base/src/main/java/javafx/beans/property/SetProperty.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/beans/property/SetProperty.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 import javafx.collections.ObservableSet;
 
 /**
- * This class provides a full implementation of a {@link Property} wrapping a
+ * This class provides a full implementation of a {@link Property} wrapping an
  * {@link javafx.collections.ObservableSet}.
  *
  * The value of a {@code SetProperty} can be get and set with {@link #get()},
--- a/modules/javafx.base/src/main/java/javafx/collections/ObservableIntegerArray.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.base/src/main/java/javafx/collections/ObservableIntegerArray.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 package javafx.collections;
 
 /**
- * {@code ObservableIntegerArray} is a {@code int[]} array that allows listeners
+ * {@code ObservableIntegerArray} is an {@code int[]} array that allows listeners
  * to track changes when they occur. In order to track changes, the internal
  * array is encapsulated and there is no direct access available from the outside.
  * Bulk operations are supported but they always do a copy of the data range.
--- a/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.fxml/src/main/docs/javafx/fxml/doc-files/introduction_to_fxml.html	Thu May 25 19:03:30 2017 -0700
@@ -2,7 +2,7 @@
 
 <!--
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html	Thu May 25 19:03:30 2017 -0700
@@ -2,7 +2,7 @@
 
 <!--
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/javafx.graphics/src/main/java/com/sun/prism/impl/ps/CachingShapeRep.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/ps/CachingShapeRep.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/javafx.graphics/src/main/java/javafx/concurrent/Task.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java	Thu May 25 19:03:30 2017 -0700
@@ -85,7 +85,7 @@
  *     }</pre>
  * <p>
  *     Note that this code sets the daemon flag of the Thread to true. If you
- *     want a background thread to prevent the VM from existing after the last
+ *     want a background thread to prevent the VM from exiting after the last
  *     stage is closed, then you would want daemon to be false. However, if
  *     you want the background threads to simply terminate after all the
  *     stages are closed, then you must set daemon to true.
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java	Thu May 25 19:03:30 2017 -0700
@@ -5810,7 +5810,7 @@
     }
 
     /**
-     * Defines a function to be called when this @{code Scene} is a
+     * Defines a function to be called when this {@code Scene} is a
      * drag and drop gesture source after its data has
      * been dropped on a drop target. The {@code transferMode} of the
      * event shows what just happened at the drop target.
--- a/modules/javafx.graphics/src/main/java/javafx/scene/canvas/Canvas.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/canvas/Canvas.java	Thu May 25 19:03:30 2017 -0700
@@ -43,7 +43,7 @@
 
 /**
  * {@code Canvas} is an image that can be drawn on using a set of graphics
- * commands provided by a {@code GraphicsContext}.
+ * commands provided by a {@link GraphicsContext}.
  *
  * <p>
  * A {@code Canvas} node is constructed with a width and height that specifies the size
@@ -70,6 +70,7 @@
 root.getChildren().add(canvas);
  * </pre>
  *
+ * @see GraphicsContext
  * @since JavaFX 2.2
  */
 public class Canvas extends Node {
--- a/modules/javafx.graphics/src/main/java/javafx/scene/canvas/GraphicsContext.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/canvas/GraphicsContext.java	Thu May 25 19:03:30 2017 -0700
@@ -65,7 +65,7 @@
 import javafx.scene.text.FontSmoothingType;
 
 /**
- * This class is used to issue draw calls to a {@code Canvas} using a buffer.
+ * This class is used to issue draw calls to a {@link Canvas} using a buffer.
  * <p>
  * Each call pushes the necessary parameters onto the buffer
  * where they will be later rendered onto the image of the {@code Canvas} node
@@ -481,6 +481,7 @@
 root.getChildren().add(canvas);
  * </pre>
  *
+ * @see Canvas
  * @since JavaFX 2.2
  */
 public final class GraphicsContext {
--- a/modules/javafx.graphics/src/main/java/javafx/scene/image/Image.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/image/Image.java	Thu May 25 19:03:30 2017 -0700
@@ -610,7 +610,6 @@
      *
      * @param url the string representing the URL to use in fetching the pixel
      *      data
-     * @see #Image(java.lang.String, java.io.InputStream, double, double, boolean, boolean, boolean)
      * @throws NullPointerException if URL is null
      * @throws IllegalArgumentException if URL is invalid or unsupported
      */
@@ -624,7 +623,6 @@
      *
      * @param url the string representing the URL to use in fetching the pixel
      *      data
-     * @see #Image(java.lang.String, java.io.InputStream, double, double, boolean, boolean, boolean)
      * @param backgroundLoading indicates whether the image
      *      is being loaded in the background
      * @throws NullPointerException if URL is null
@@ -640,7 +638,6 @@
      *
      * @param url the string representing the URL to use in fetching the pixel
      *      data
-     * @see #Image(java.lang.String, java.io.InputStream, double, double, boolean, boolean, boolean)
      * @param requestedWidth the image's bounding box width
      * @param requestedHeight the image's bounding box height
      * @param preserveRatio indicates whether to preserve the aspect ratio of
--- a/modules/javafx.graphics/src/main/java/javafx/scene/image/PixelWriter.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/image/PixelWriter.java	Thu May 25 19:03:30 2017 -0700
@@ -103,7 +103,7 @@
      *        start of one row of data in the buffer to the start of the
      *        next row of data.
      *
-     * @throws java.lang.NullPointerException if @{code pixelformat} or {@code buffer} is {@code null}
+     * @throws java.lang.NullPointerException if {@code pixelformat} or {@code buffer} is {@code null}
      */
     public <T extends Buffer>
         void setPixels(int x, int y, int w, int h,
@@ -140,7 +140,7 @@
      *        start of one row of data in the buffer to the start of the
      *        next row of data
      *
-     * @throws java.lang.NullPointerException if @{code pixelformat} or {@code buffer} is {@code null}
+     * @throws java.lang.NullPointerException if {@code pixelformat} or {@code buffer} is {@code null}
      */
     public void setPixels(int x, int y, int w, int h,
                           PixelFormat<ByteBuffer> pixelformat,
@@ -176,7 +176,7 @@
      *        start of one row of data in the buffer to the start of the
      *        next row of data
      *
-     * @throws java.lang.NullPointerException if @{code pixelformat} or {@code buffer} is {@code null}
+     * @throws java.lang.NullPointerException if {@code pixelformat} or {@code buffer} is {@code null}
      */
     public void setPixels(int x, int y, int w, int h,
                           PixelFormat<IntBuffer> pixelformat,
@@ -209,7 +209,7 @@
      * @param srcx the X coordinate of the data to read from {@code reader}
      * @param srcy the Y coordinate of the data to read from {@code reader}
      *
-     * @throws java.lang.NullPointerException if @{code reader} is {@code null}
+     * @throws java.lang.NullPointerException if {@code reader} is {@code null}
      */
     public void setPixels(int dstx, int dsty, int w, int h,
                           PixelReader reader, int srcx, int srcy);
--- a/modules/javafx.graphics/src/main/java/javafx/scene/shape/ObservableFaceArray.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/shape/ObservableFaceArray.java	Thu May 25 19:03:30 2017 -0700
@@ -27,10 +27,11 @@
 import javafx.collections.ObservableIntegerArray;
 
 /**
- * {@code ObservableFaceArray} is a {@code int[]} array that allows listeners
+ * {@code ObservableFaceArray} is an {@code int[]} array that allows listeners
  * to track changes when they occur. In order to track changes, the internal
  * array is encapsulated and there is no direct access available from the outside.
  * Bulk operations are supported but they always do a copy of the data range.
+ * This class is used when defining the faces of a {@link TriangleMesh}.
  *
  * @see javafx.collections.ArrayChangeListener
  * @since JavaFX 8.0
--- a/modules/javafx.graphics/src/main/java/javafx/stage/Screen.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.graphics/src/main/java/javafx/stage/Screen.java	Thu May 25 19:03:30 2017 -0700
@@ -273,7 +273,7 @@
     private double dpi;
     /**
      * Gets the resolution (dots per inch) of this {@code Screen}.
-     * @return The resolution of this @{code Screen}
+     * @return The resolution of this {@code Screen}
      */
     public final double getDpi() {
         return dpi;
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/DOMTest.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/DOMTest.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/TestBase.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/jdk.packager.services/src/main/java/module-info.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/jdk.packager.services/src/main/java/module-info.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/jdk.packager/src/main/java/com/oracle/tools/packager/EnumeratedBundlerParam.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/jdk.packager/src/main/java/com/oracle/tools/packager/EnumeratedBundlerParam.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,16 @@
  * For instance the Mac has a predefined set of categories which can be applied
  * to LSApplicationCategoryType which is required for the mac app store.
  *
- * The following example illustrates a simple usage of the MAC_CATEGORY parameter
+ * The following example illustrates a simple usage of the MAC_CATEGORY parameter:
  *
+ * <pre>{@code
  *     Set<String> keys = MAC_CATEGORY.getDisplayableKeys();
  *
  *     String key = getLastValue(keys); // get last value for example
  *
  *     String value = MAC_CATEGORY.getValueForDisplayableKey(key);
  *     params.put(MAC_CATEGORY.getID(), value);
+ * }</pre>
  *
  */
 public class EnumeratedBundlerParam<T> extends BundlerParamInfo<T> {
--- a/modules/jdk.packager/src/main/java/module-info.java	Fri May 19 16:08:06 2017 -0700
+++ b/modules/jdk.packager/src/main/java/module-info.java	Thu May 25 19:03:30 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO 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/jdk.packager/src/main/native/javapackager/win/javapackager.cpp	Fri May 19 16:08:06 2017 -0700
+++ b/modules/jdk.packager/src/main/native/javapackager/win/javapackager.cpp	Thu May 25 19:03:30 2017 -0700
@@ -469,25 +469,12 @@
 
     std::wstring fxlib = javafxhome + L"\\..\\lib\\";
 
-    EnvironmentVariable java_home(L"JAVA_HOME");
     std::wstring javacmd;
     std::wstring javahome;
 
-    if (java_home.exists()) {
-        javahome = java_home.get();
-        javacmd = javahome + L"\\bin\\java.exe";
-        std::wstring javaccmd = javahome + L"\\bin\\javac.exe";
-        if (!fileExists(javacmd) || !fileExists(javaccmd)) {
-            javacmd = L"";
-            javahome = L"";
-        }
-    }
-    else {
-        std::wstring exe = GetCurrentExecutableName();
-        javacmd = ExtractFilePath(exe) + L"\\java.exe";
-    }
+    std::wstring exe = GetCurrentExecutableName();
 
-    if (javacmd.length() <= 0) {
+    if (exe.length() <= 0) {
         JavaVersion * jv2 = GetMaxVersion(HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Development Kit");
         if (jv2 != NULL) {
             javacmd = jv2->path;
@@ -496,6 +483,8 @@
         else {
             javacmd = L"java.exe";
         }
+    } else {
+        javacmd = ExtractFilePath(exe) + L"\\java.exe";
     }
 
     std::wstring cmd = L"\"" + javacmd + L"\"";