changeset 708:cabf09d667e8

branch merge
author David Grieve<david.grieve@oracle.com>
date Mon, 26 Mar 2012 11:27:34 -0400
parents 380ad2619f75 e1dc3a64d8c9
children 37d21fdd9285
files
diffstat 5 files changed, 46 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Mar 26 10:27:02 2012 -0400
+++ b/.hgtags	Mon Mar 26 11:27:34 2012 -0400
@@ -15,3 +15,4 @@
 fc8a4ecd18dbe182aac3e0f3caaac110e3e4ca4f 2.1-b15
 159ae36c5cbe2c42e47331a46a976c9d65738b22 2.1-b16
 fbd9064f3f17727254745b6d6ae5a8ef1f2c066c 2.1-b17
+226d6fc60d699af3a37483b7fd52c44211181259 2.1-b18
--- a/javafx-ui-common/src/javafx/scene/Node.java	Mon Mar 26 10:27:02 2012 -0400
+++ b/javafx-ui-common/src/javafx/scene/Node.java	Mon Mar 26 11:27:34 2012 -0400
@@ -992,16 +992,16 @@
      * Specifies how opaque (that is, solid) the {@code Node} appears. A Node
      * with 0% opacity is fully translucent. That is, while it is still
      * {@link #visibleProperty visible} and rendered, you generally won't be able to see it. The
-     * exception to this rule is when the Z{@code Node} is combined with a
+     * exception to this rule is when the {@code Node} is combined with a
      * blending mode and blend effect in which case a translucent Node may still
      * have an impact in rendering. An opacity of 50% will render the node as
      * being 50% transparent.
      * <p>
      * A {@link #visibleProperty visible} node with any opacity setting still receives mouse
      * events and can receive keyboard focus. For example, if you want to have
-     * a large invisible rectangle overlay all Nodes in the scene graph in order
-     * to intercept mouse events but not be visible to the user, you could
-     * create a large Rectangle that had an opacity of 0%.
+     * a large invisible rectangle overlay all {@code Node}s in the scene graph
+     * in order to intercept mouse events but not be visible to the user, you could
+     * create a large {@code Rectangle} that had an opacity of 0%.
      * <p>
      * Opacity is specified as a value between 0 and 1. Values less than 0 are
      * treated as 0, values greater than 1 are treated as 1.
@@ -1180,7 +1180,7 @@
      * little benefit to caching Nodes as bitmaps when blurs and other effects
      * are used since they are very fast to render on the GPU.
      *
-     * The {@code cacheHint} variable provides additional options for enabling
+     * The {@link cacheHint} variable provides additional options for enabling
      * more aggressive bitmap caching.
      *
      * <p>
@@ -1295,11 +1295,11 @@
 
     /**
      * Indicates whether depth testing is used when rendering this node.
-     * If the depthTest flag is DepthTest.DISABLE, then depth testing
+     * If the depthTest flag is {@code DepthTest.DISABLE}, then depth testing
      * is disabled for this node.
-     * If the depthTest flag is DepthTest.ENABLE, then depth testing
+     * If the depthTest flag is {@code DepthTest.ENABLE}, then depth testing
      * is enabled for this node.
-     * If the depthTest flag is DepthTest.INHERIT, then depth testing
+     * If the depthTest flag is {@code DepthTest.INHERIT}, then depth testing
      * is enabled for this node if it is enabled for the parent node or the
      * parent node is null.
      * <p>
@@ -1863,7 +1863,8 @@
     /**
      * Defines whether or not this node's layout will be managed by it's parent.
      * If the node is managed, it's parent will factor the node's geometry
-     * into its own preferred size and layoutBounds calculations and will lay it
+     * into its own preferred size and {@link #layoutBoundsProperty layoutBounds}
+     * calculations and will lay it
      * out during the scene's layout pass.  If a managed node's layoutBounds
      * changes, it will automatically trigger relayout up the scene-graph
      * to the nearest layout root (which is typically the scene's root node).
@@ -1871,15 +1872,17 @@
      * If the node is unmanaged, its parent will ignore the child in both preferred
      * size computations and layout.   Changes in layoutBounds will not trigger
      * relayout above it.   If an unmanaged node is of type {@link javafx.scene.Parent Parent},
-     * it will act as a "layout root", meaning that calls to requestLayout()
+     * it will act as a "layout root", meaning that calls to {@link requestLayout()}
      * beneath it will cause only the branch rooted by the node to be relayed out,
      * thereby isolating layout changes to that root and below.  It's the application's
      * responsibility to set the size and position of an unmanaged node.
      * <p>
      * By default all nodes are managed.
-     * <p>
+     * </p>
+     * 
      * @see #isResizable()
-     * @see #getLayoutBounds()
+     * @see #layoutBoundsProperty()
+     * @see Parent#requestLayout()
      *
      */
     private BooleanProperty managed;
@@ -1922,7 +1925,7 @@
      * Defines the x coordinate of the translation that is added to this {@code Node}'s
      * transform for the purpose of layout.  The value should be computed as the
      * offset required to adjust the position of the node from its current
-     * {@code layoutBounds minX} position (which might not be 0) to the desired location.
+     * {@link #layoutBoundsProperty() layoutBounds minX} position (which might not be 0) to the desired location.
      *
      * <p>For example, if {@code textnode} should be positioned at {@code finalX}
      * <code><pre>
@@ -1930,7 +1933,7 @@
      * </pre></code>
      * <p>
      * Failure to subtract {@code layoutBounds minX} may result in misplacement
-     * of the node.  The {@code relocate(x,y)} method will automatically do the
+     * of the node.  The {@link #relocate(double, double) relocate(x, y)} method will automatically do the
      * correct computation and should generally be used over setting layoutX directly.
      * <p>
      * The node's final translation will be computed as {@code layoutX} + {@link #translateXProperty translateX},
@@ -1943,7 +1946,8 @@
      * own layout policy.   If the node is unmanaged or parented by a {@link Group},
      * then the application may set {@code layoutX} directly to position it.
      * <p>
-     * @see #relocate(double, double) 
+     * @see #relocate(double, double)
+     * @see #layoutBoundsProperty()
      *
      */
     private DoubleProperty layoutX;
@@ -1983,7 +1987,7 @@
      * Defines the y coordinate of the translation that is added to this {@code Node}'s
      * transform for the purpose of layout.  The value should be computed as the
      * offset required to adjust the position of the node from its current
-     * {@code layoutBounds minY} position (which might not be 0) to the desired location.
+     * {@link #layoutBoundsProperty() layoutBounds minY} position (which might not be 0) to the desired location.
      *
      * <p>For example, if {@code textnode} should be positioned at {@code finalY}
      * <code><pre>
@@ -1991,7 +1995,7 @@
      * </pre></code>
      * <p>
      * Failure to subtract {@code layoutBounds minY} may result in misplacement
-     * of the node.  The {@code relocate(x,y)} method will automatically do the
+     * of the node.  The {@link #relocate(double, double) relocate(x, y)} method will automatically do the
      * correct computation and should generally be used over setting layoutY directly.
      * <p>
      * The node's final translation will be computed as {@code layoutY} + {@link #translateYProperty translateY},
@@ -2005,6 +2009,7 @@
      * then the application may set {@code layoutY} directly to position it.
      *
      * @see #relocate(double, double) 
+     * @see #layoutBoundsProperty()
      */
     private DoubleProperty layoutY;
 
@@ -4856,7 +4861,7 @@
      * due to the mouse being over the node, though it could be due to a pen
      * hovering on a graphics tablet or other form of input.
      *
-     * the <p>NOTE current implementation of hover relies on mouse enter and
+     * <p>Note that current implementation of hover relies on mouse enter and
      * exit events to determine whether this Node is in the hover state; this
      * means that this feature is currently supported only on systems that
      * have a mouse. Future implementations may provide alternative means of
@@ -5346,8 +5351,9 @@
      * Indicates whether this {@code Node} currently has the input focus.
      * To have the input focus, a node must be the {@code Scene}'s focus
      * owner, and the scene must be in a {@code Stage} that is visible
-     * and active. See {@code requestFocus()} for more information.
+     * and active. See {@link requestFocus()} for more information.
      *
+     * @see #requestFocus()
      * @defaultValue false
      */
     private ReadOnlyBooleanWrapper focused;
@@ -5402,8 +5408,9 @@
      * {@code Node} whose {@code focusTraversable} variable is true
      * and that is eligible to receive the focus,
      * unless the focus had been set explicitly via a call
-     * to {@code requestFocus()}.
+     * to {@link requestFocus()}.
      *
+     * @see #requestFocus()
      * @defaultValue false
      */
     private BooleanProperty focusTraversable;
--- a/javafx-ui-common/src/javafx/stage/Stage.java	Mon Mar 26 10:27:02 2012 -0400
+++ b/javafx-ui-common/src/javafx/stage/Stage.java	Mon Mar 26 11:27:34 2012 -0400
@@ -59,7 +59,12 @@
  * Stage objects must be constructed and modified on the
  * JavaFX Application Thread.
  * </p>
- *
+ * <p>
+ * Many of the {@code Stage} properties are read only because they can
+ * be changed externally by the underlying platform and therefore must
+ * not be bindable.
+ * </p>
+ * 
  * <p><b>Style</b></p>
  * <p>
  * A stage has one of the following styles:
@@ -73,7 +78,7 @@
  * <li>{@link StageStyle#UTILITY} - a stage with a solid white background and
  * minimal platform decorations.</li>
  * </ul>
- * The style must be initialized before the stage is made visible.
+ * <p>The style must be initialized before the stage is made visible.</p>
  * 
  * <p><b>Owner</b></p>
  * <p>
@@ -97,19 +102,14 @@
  * from its child hierarchy.</li>
  * </ul> 
  * 
- * When a window is blocked by a modal stage, it receives no input events, but 
- * continues to animate and render normally. Note that showing a modal stage does
- * not block the calling thread. The {@link #show} method returns immediately 
- * regardless of the modality.
- * The modality must be initialized before the stage is made visible. 
- * 
- * <p>
- * Many of the {@code Stage} properties are read only because they can
- * be changed externally by the underlying platform and therefore must
- * not be bindable.
- * </p>
+ * <p>When a window is blocked by a modal stage its Z-order relative to its ancestors
+ * is preserved, and it receives no input events and no window activation events,
+ * but continues to animate and render normally.
+ * Note that showing a modal stage does not block the calling thread. The
+ * {@link #show} method returns immediately regardless of the modality.
+ * The modality must be initialized before the stage is made visible.</p> 
  *
- * <p>Example:</p>
+ * <p><b>Example:</b></p>
  *
  *
 <pre><code>
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/resources/controls_pt_BR.properties	Mon Mar 26 10:27:02 2012 -0400
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/resources/controls_pt_BR.properties	Mon Mar 26 11:27:34 2012 -0400
@@ -2,8 +2,8 @@
 ProgressIndicator.doneString=Conclu\u00EDdo
 
 # TableView
-TableView.noContent=Nenhum conte\u00FAdo na tabela
-TableView.noColumns=Nenhuma coluna na tabela
+TableView.noContent=N\u00E3o h\u00E1 conte\u00FAdo na tabela
+TableView.noColumns=N\u00E3o h\u00E1 coluna na tabela
 # Note there is a space after the comma:
 TableView.nestedColumnControlMenuSeparator=, 
 
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/resources/controls_sv.properties	Mon Mar 26 10:27:02 2012 -0400
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/resources/controls_sv.properties	Mon Mar 26 11:27:34 2012 -0400
@@ -2,8 +2,8 @@
 ProgressIndicator.doneString=OK
 
 # TableView
-TableView.noContent=Inneh\u00E5ll saknas i tabellen
-TableView.noColumns=Kolumner saknas i tabellen
+TableView.noContent=Tabellen saknar inneh\u00E5ll
+TableView.noColumns=Tabellen saknar kolumner
 # Note there is a space after the comma:
 TableView.nestedColumnControlMenuSeparator=,