changeset 11198:d915992a1af9

Merge
author kcr
date Fri, 15 Feb 2019 10:21:28 -0800
parents b9d58e42f9f5 5bc59c85d44c
children ac08d071e238
files .hgtags
diffstat 18 files changed, 49 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 12 07:51:16 2019 -0800
+++ b/.hgtags	Fri Feb 15 10:21:28 2019 -0800
@@ -524,3 +524,4 @@
 b5c27572ab56e5a8df14f4252f90c84532c471dd 13+0
 c8bb215eb1a56a2b71133b5a25f758057f255407 12+11
 d1c7e1786e8793ccbbc5514e19636b6badfaac2c 12+12
+653d5bdbfa2a7f21e81bb3c5ce6eb4b2087ce91b 12+13
--- a/modules/javafx.base/src/main/java/javafx/util/Duration.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.base/src/main/java/javafx/util/Duration.java	Fri Feb 15 10:21:28 2019 -0800
@@ -32,7 +32,7 @@
  * <p>
  *     A class that defines a duration of time. Duration instances are immutable,
  *     and are therefore replaced rather than modified, similar to {@link java.math.BigDecimal}.
- *     Duration's can be created using the constructor, or one of the static construction
+ *     Durations can be created using the constructor, or one of the static construction
  *     methods such as {@link #seconds} or {@link #minutes}.
  * </p>
  * @since JavaFX 2.0
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/ChoiceBox.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/ChoiceBox.java	Fri Feb 15 10:21:28 2019 -0800
@@ -58,15 +58,13 @@
  * Although the ChoiceBox will only allow a user to select from the predefined
  * list, it is possible for the developer to specify the selected item to be
  * something other than what is available in the predefined list. This is
- * required for several important use cases.
- * <p>
- * It means configuration of the ChoiceBox is order independent. You
- * may either specify the items and then the selected item, or you may
- * specify the selected item and then the items. Either way will function
+ * required for several important use cases. Configuration of the ChoiceBox is
+ * order independent. You may either specify the items and then the selected item,
+ * or you may specify the selected item and then the items. Either way will function
  * correctly.
  * <p>
  * ChoiceBox item selection is handled by
- * {@link javafx.scene.control.SelectionModel SelectionModel}
+ * {@link javafx.scene.control.SelectionModel SelectionModel}.
  * As with ListView and ComboBox, it is possible to modify the
  * {@link javafx.scene.control.SelectionModel SelectionModel} that is used,
  * although this is likely to be rarely changed. ChoiceBox supports only a
@@ -399,7 +397,7 @@
 
     // -- On Shown
     /**
-     * Called just after the {@link ChoiceBox} popup is shown.
+     * Called just after the {@code ChoiceBox} popup is shown.
      * @return the on shown property
      * @since JavaFX 8u60
      */
@@ -423,7 +421,7 @@
 
     // --- On Hiding
     /**
-     * Called just prior to the {@link ChoiceBox} popup being hidden.
+     * Called just prior to the {@code ChoiceBox} popup being hidden.
      * @return the on hiding property
      * @since JavaFX 8u60
      */
@@ -447,7 +445,7 @@
 
     // --- On Hidden
     /**
-     * Called just after the {@link ChoiceBox} popup has been hidden.
+     * Called just after the {@code ChoiceBox} popup has been hidden.
      * @return the on hidden property
      * @since JavaFX 8u60
      */
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java	Fri Feb 15 10:21:28 2019 -0800
@@ -269,7 +269,7 @@
      * Shows the {@code ContextMenu} at the specified screen coordinates. If there
      * is not enough room at the specified location to show the {@code ContextMenu}
      * given its size requirements, the necessary adjustments are made to bring
-     * the {@code ContextMenu} back back on screen. This also means that the
+     * the {@code ContextMenu} back on screen. This also means that the
      * {@code ContextMenu} will not span multiple monitors.
      * @param anchor the anchor node
      * @param screenX the x position of the anchor in screen coordinates
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/ProgressBar.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/ProgressBar.java	Fri Feb 15 10:21:28 2019 -0800
@@ -52,7 +52,6 @@
  *
  * <img src="doc-files/ProgressBar.png" alt="Image of the ProgressBar control">
  *
- * Implementation of ProgressBar According to JavaFX UI Control API Specification
  * @since JavaFX 2.0
  */
 public class ProgressBar extends ProgressIndicator {
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/ProgressIndicator.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/ProgressIndicator.java	Fri Feb 15 10:21:28 2019 -0800
@@ -59,7 +59,6 @@
  *
  * <img src="doc-files/ProgressIndicator.png" alt="Image of the ProgressIndicator control">
  *
- * Implementation of ProgressIndicator According to JavaFX UI Control API Specification
  * @since JavaFX 2.0
  */
 public class ProgressIndicator extends Control {
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/ScrollBar.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/ScrollBar.java	Fri Feb 15 10:21:28 2019 -0800
@@ -63,9 +63,8 @@
  * <pre><code> ScrollBar s1 = new ScrollBar();
  * s1.setOrientation(Orientation.VERTICAL);</code></pre>
  *
- * <p><img src="doc-files/ScrollBar.png" alt="Image of the ScrollBar control"></p>
+ * <img src="doc-files/ScrollBar.png" alt="Image of the ScrollBar control">
  *
- * Implementation of ScrollBar According to JavaFX UI Control API Specification
  * @since JavaFX 2.0
  */
 public class ScrollBar extends Control {
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/ScrollPane.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/ScrollPane.java	Fri Feb 15 10:21:28 2019 -0800
@@ -69,7 +69,7 @@
  * ScrollPane layout calculations are based on the layoutBounds rather than
  * the boundsInParent (visual bounds) of the scroll node.
  * If an application wants the scrolling to be based on the visual bounds
- * of the node (for scaled content etc.), they need to wrap the scroll
+ * of the node (for scaled content etc.), it needs to wrap the scroll
  * node in a Group.
  * <p>
  * ScrollPane sets focusTraversable to false.
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/TableView.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/TableView.java	Fri Feb 15 10:21:28 2019 -0800
@@ -896,10 +896,9 @@
     }
 
     /**
-     * This is the function called when the user completes a column-resize
-     * operation. The two most common policies are available as static functions
-     * in the TableView class: {@link #UNCONSTRAINED_RESIZE_POLICY} and
-     * {@link #CONSTRAINED_RESIZE_POLICY}.
+     * Called when the user completes a column-resize operation. The two most common
+     * policies are available as static functions in the TableView class:
+     * {@link #UNCONSTRAINED_RESIZE_POLICY} and {@link #CONSTRAINED_RESIZE_POLICY}.
      * @return columnResizePolicy property
      */
     public final ObjectProperty<Callback<ResizeFeatures, Boolean>> columnResizePolicyProperty() {
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	Fri Feb 15 10:21:28 2019 -0800
@@ -1095,8 +1095,9 @@
     }
 
     /**
-     * Returnst the CssMetaData associated with this class, which may include the
+     * Returns the CssMetaData associated with this class, which may include the
      * CssMetaData of its superclasses.
+     *
      * @return the CssMetaData associated with this class, which may include the
      * CssMetaData of its superclasses
      */
--- a/modules/javafx.graphics/src/main/java/javafx/animation/Animation.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.graphics/src/main/java/javafx/animation/Animation.java	Fri Feb 15 10:21:28 2019 -0800
@@ -640,7 +640,7 @@
     /**
      * The status of the {@code Animation}.
      *
-     * In {@code Animation} can be in one of three states:
+     * An {@code Animation} can be in one of three states:
      * {@link Status#STOPPED}, {@link Status#PAUSED} or {@link Status#RUNNING}.
      */
     private ReadOnlyObjectProperty<Status> status;
--- a/modules/javafx.graphics/src/main/java/javafx/animation/Timeline.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.graphics/src/main/java/javafx/animation/Timeline.java	Fri Feb 15 10:21:28 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * 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,14 +62,12 @@
  * has to be stopped and started again to pick up the new value.
  * <p>
  * A simple Timeline can be created like this:
- * <pre>{@code
- * final Timeline timeline = new Timeline();
+ * <pre> {@code final Timeline timeline = new Timeline();
  * timeline.setCycleCount(2);
  * timeline.setAutoReverse(true);
  * timeline.getKeyFrames().add(new KeyFrame(Duration.millis(5000),
  *   new KeyValue (node.translateXProperty(), 25)));
- * timeline.play();
- * }</pre>
+ * timeline.play();}</pre>
  * <p>
  * This Timeline will run for 10s, animating the node by x axis to value 25 and then back to 0 on the second cycle.
  * <p>
--- a/modules/javafx.graphics/src/main/java/javafx/animation/Transition.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.graphics/src/main/java/javafx/animation/Transition.java	Fri Feb 15 10:21:28 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,10 +52,7 @@
  * with an empty {@code String} and adds gradually letter by letter until the
  * full {@code String} was set when the animation finishes.
  *
- * <pre>
- * {@code
- *
- * final String content = "Lorem ipsum";
+ * <pre> {@code final String content = "Lorem ipsum";
  * final Text text = new Text(10, 20, "");
  *
  * final Animation animation = new Transition() {
@@ -71,8 +68,7 @@
  *
  * };
  *
- * animation.play();
- * }</pre>
+ * animation.play();}</pre>
  *
  * @see Animation
  *
--- a/modules/javafx.graphics/src/main/java/javafx/application/Application.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.graphics/src/main/java/javafx/application/Application.java	Fri Feb 15 10:21:28 2019 -0800
@@ -185,12 +185,12 @@
 
     /**
      * Launch a standalone application. This method is typically called
-     * from the main method(). It must not be called more than once or an
+     * from the {@code main} method. It must not be called more than once or an
      * exception will be thrown.
      *
      * <p>
      * The launch method does not return until the application has exited,
-     * either via a call to Platform.exit or all of the application windows
+     * either via a call to {@link Platform#exit()} or all of the application windows
      * have been closed.
      * The class specified by the {@code appClass} argument must be
      * a public subclass of {@code Application}
@@ -229,7 +229,7 @@
 
     /**
      * Launch a standalone application. This method is typically called
-     * from the main method(). It must not be called more than once or an
+     * from the {@code main} method. It must not be called more than once or an
      * exception will be thrown.
      * This is equivalent to {@code launch(TheClass.class, args)} where
      * {@code TheClass} is the
@@ -242,7 +242,7 @@
      *
      * <p>
      * The launch method does not return until the application has exited,
-     * either via a call to Platform.exit or all of the application windows
+     * either via a call to {@link Platform#exit()} or all of the application windows
      * have been closed.
      *
      * <p>
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/GridPane.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/GridPane.java	Fri Feb 15 10:21:28 2019 -0800
@@ -136,7 +136,7 @@
  *
  * By default, rows and columns will be sized to fit their content;
  * a column will be wide enough to accommodate the widest child, a
- * row tall enough to fit the tallest child.However, if an application needs
+ * row tall enough to fit the tallest child. However, if an application needs
  * to explicitly control the size of rows or columns, it may do so by adding
  * RowConstraints and ColumnConstraints objects to specify those metrics.
  * For example, to create a grid with two fixed-width columns:
@@ -962,7 +962,7 @@
     public final ObservableList<ColumnConstraints> getColumnConstraints() { return columnConstraints; }
 
     /**
-     * Adds a child to the gridpane at the specified column,row position.
+     * Adds a child to the gridpane at the specified [column, row] position.
      * This convenience method will set the gridpane column and row constraints
      * on the child.
      * @param child the node being added to the gridpane
@@ -975,7 +975,7 @@
     }
 
     /**
-     * Adds a child to the gridpane at the specified column,row position and spans.
+     * Adds a child to the gridpane at the specified [column, row] position and spans.
      * This convenience method will set the gridpane column, row, and span constraints
      * on the child.
      * @param child the node being added to the gridpane
--- a/modules/javafx.graphics/src/main/java/javafx/scene/layout/Region.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/layout/Region.java	Fri Feb 15 10:21:28 2019 -0800
@@ -646,8 +646,8 @@
     /**
      * The top, right, bottom, and left padding around the region's content.
      * This space will be included in the calculation of the region's
-     * minimum and preferred sizes. By default padding is Insets.EMPTY. Setting the
-     * value to null should be avoided.
+     * minimum and preferred sizes. By default, padding is {@code Insets.EMPTY}. Setting the
+     * value to {@code null} should be avoided.
      */
     private ObjectProperty<Insets> padding = new StyleableObjectProperty<Insets>(Insets.EMPTY) {
         // Keep track of the last valid value for the sake of
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxml/mac/include/libxml/xmlversion.h	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxml/mac/include/libxml/xmlversion.h	Fri Feb 15 10:21:28 2019 -0800
@@ -282,7 +282,7 @@
  *
  * Whether icu support is available
  */
-#if 0
+#if 1
 #define LIBXML_ICU_ENABLED
 #endif
 
--- a/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java	Tue Feb 12 07:51:16 2019 -0800
+++ b/modules/javafx.web/src/test/java/test/javafx/scene/web/MiscellaneousTest.java	Fri Feb 15 10:21:28 2019 -0800
@@ -524,4 +524,19 @@
                     "  </body>\n" +
                     "</html>");
     }
+
+    @Test public void testWindows1251EncodingWithXML() {
+        loadContent(
+            "<script>\n" +
+            "const text = '<?xml version=\"1.0\" encoding=\"windows-1251\"?><test/>';\n" +
+            "const parser = new DOMParser();\n" +
+            "window.xmlDoc = parser.parseFromString(text, 'text/xml');\n" +
+            "</script>"
+        );
+        submit(() -> {
+            // WebKit injects error message into body incase of encoding error, otherwise
+            // body should be null.
+            assertNull(getEngine().executeScript("window.xmlDoc.body"));
+        });
+    }
 }