changeset 1617:22a24297791a

Automated merge with file:///home/dblaukop/ws/graphics/rt
author Daniel Blaukopf <daniel.blaukopf@oracle.com>
date Tue, 24 Jul 2012 13:40:22 +0300
parents 01a197158c61 0ea82eee10cc
children 92f798514a12 8caa490529cc
files .hgtags javafx-ui-common/src/javafx/scene/Node.java
diffstat 3 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 23 09:27:47 2012 +0200
+++ b/.hgtags	Tue Jul 24 13:40:22 2012 +0300
@@ -29,6 +29,7 @@
 804bd3cdb04f7da0ba3c3797c71285d353030fd8 2.2-b08
 aeec67bbcaa2ad0050843915cb3e166556694ce7 2.2-b09
 72bd9ac175004058c2503ed21c975a583d399836 2.2-b10
+bd432837e714c21d8f87f091c5c39441e2fe063d 2.2-embedded-milestone-20120605
 85b700eea97b1307cd043a4eac6ebb6dfd64f8f5 2.2-b11
 348de34f8273c417ecd0131e958c8c4fea6af8a7 2.2-b12
 00a63ce77e97aa5c1e15a3c150a44dd5cce82bf5 2.2-b13
--- a/javafx-ui-common/src/com/sun/javafx/tk/Toolkit.java	Mon Jul 23 09:27:47 2012 +0200
+++ b/javafx-ui-common/src/com/sun/javafx/tk/Toolkit.java	Tue Jul 24 13:40:22 2012 +0300
@@ -134,6 +134,8 @@
             return DEFAULT_TOOLKIT;
         } else if (PlatformUtil.isLinux()) {
             return DEFAULT_TOOLKIT;
+        } else if (PlatformUtil.isIOS()) {
+            return DEFAULT_TOOLKIT;
         }
 
         throw new UnsupportedOperationException(System.getProperty("os.name") + " is not supported");
--- a/javafx-ui-common/src/javafx/scene/Node.java	Mon Jul 23 09:27:47 2012 +0200
+++ b/javafx-ui-common/src/javafx/scene/Node.java	Tue Jul 24 13:40:22 2012 +0300
@@ -594,7 +594,7 @@
                 protected void invalidated() {
                     if (oldParent != null) {
                         oldParent.disabledProperty().removeListener(parentDisabledChangedListener);
-                        oldParent.treeVisibleProperty().removeListener(parentTreeVisibleChangedListener);
+                        oldParent.impl_treeVisibleProperty().removeListener(parentTreeVisibleChangedListener);
                         if (nodeTransformation != null && nodeTransformation.listenerReasons > 0) {
                             ((Node) oldParent).localToSceneTransformProperty().removeListener(
                                     nodeTransformation.getLocalToSceneInvalidationListener());
@@ -604,8 +604,8 @@
                     computeDerivedDepthTest();
                     final Parent newParent = get();
                     if (newParent != null) {
-                    	newParent.disabledProperty().addListener(parentDisabledChangedListener);
-                    	newParent.treeVisibleProperty().addListener(parentTreeVisibleChangedListener);
+                        newParent.disabledProperty().addListener(parentDisabledChangedListener);
+                        newParent.impl_treeVisibleProperty().addListener(parentTreeVisibleChangedListener);
                         if (nodeTransformation != null && nodeTransformation.listenerReasons > 0) {
                             ((Node) newParent).localToSceneTransformProperty().addListener(
                                     nodeTransformation.getLocalToSceneInvalidationListener());
@@ -3696,7 +3696,7 @@
      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
      */
     @Deprecated
-    public final void impl_transformsChanged() {
+    public void impl_transformsChanged() {
         if (!transformDirty) {
             impl_markDirty(DirtyBits.NODE_TRANSFORM);
             transformDirty = true;
@@ -6413,7 +6413,7 @@
             treeVisible = value;
             updateCanReceiveFocus();
             focusSetDirty(getScene());
-            ((TreeVisiblePropertyReadOnly)treeVisibleProperty()).invalidate();
+            ((TreeVisiblePropertyReadOnly)impl_treeVisibleProperty()).invalidate();
         }
     }
 
@@ -6423,10 +6423,15 @@
      */
     @Deprecated
     public final boolean impl_isTreeVisible() {
-        return treeVisibleProperty().get();
-    }
-
-    BooleanExpression treeVisibleProperty() {
+        return impl_treeVisibleProperty().get();
+    }
+
+    /**
+     * @treatAsPrivate implementation detail
+     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+     */
+    @Deprecated
+    protected final BooleanExpression impl_treeVisibleProperty() {
         if (treeVisibleRO == null) {
             treeVisibleRO = new TreeVisiblePropertyReadOnly();
         }