changeset 1451:5ba93f3d48b7

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/scrum/controls/jfx/rt
author jgiles
date Mon, 16 Jul 2012 11:57:46 +1200
parents d3c8bd0df966 e848c165aaa9
children 7e06dda995b5 7c7bc01e9da4
files
diffstat 4 files changed, 42 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Fri Jul 13 14:55:35 2012 -0700
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Mon Jul 16 11:57:46 2012 +1200
@@ -147,6 +147,14 @@
                         else comboBox.show();
                         t.consume();
                         return;
+                    } else if (ke.getCode() == KeyCode.F10 || ke.getCode() == KeyCode.ESCAPE) {
+                        // RT-23275: The TextField fires F10 and ESCAPE key events
+                        // up to the parent, which are then fired back at the 
+                        // TextField, and this ends up in an infinite loop until
+                        // the stack overflows. So, here we consume these two
+                        // events and stop them from going any further.
+                        t.consume();
+                        return;
                     }
                 }
                 
@@ -397,7 +405,7 @@
         if (empty) {
             if (buttonCell == null) return;
             cell.setGraphic(null);
-            cell.setText(comboBox.getPromptText() == null ? null : comboBox.getPromptText());
+            cell.setText(null);
         } else if (item instanceof Node) {
             Node currentNode = buttonCell.getGraphic();
             Node newNode = (Node) item;
--- a/javafx-ui-controls/src/javafx/scene/control/MenuItem.java	Fri Jul 13 14:55:35 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/MenuItem.java	Mon Jul 16 11:57:46 2012 +1200
@@ -550,8 +550,14 @@
      * @deprecated This is an experimental API that is not intended for general 
      * use and is subject to change in future versions
      */
+    @Deprecated
     protected Styleable styleable; 
         
+    /**
+     * @treatAsPrivate implementation detail
+     * @deprecated This is an experimental API that is not intended for general 
+     * use and is subject to change in future versions
+     */
     @Deprecated // SB-dependency: RT-21094 has been filed to track this
     public Styleable impl_getStyleable() {
         
--- a/javafx-ui-controls/src/javafx/scene/control/PopupControl.java	Fri Jul 13 14:55:35 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/PopupControl.java	Mon Jul 16 11:57:46 2012 +1200
@@ -975,7 +975,12 @@
                     return null;
                 }
 
-                @Override
+                /**
+                * RT-19263
+                * @treatAsPrivate implementation detail
+                * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions
+                */
+                @Deprecated @Override
                 public List<StyleableProperty> getStyleableProperties() {
                     return PopupControl.this.impl_getStyleableProperties();
                 }                
@@ -992,11 +997,22 @@
 
     protected class CSSBridge extends Group {
         private String currentSkinClassName = null;
-        @Override public void impl_pseudoClassStateChanged(String s) {
+        
+        /**
+        * @treatAsPrivate implementation detail
+        * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+        */
+        @Deprecated @Override public void impl_pseudoClassStateChanged(String s) {
             super.impl_pseudoClassStateChanged(s);
         }
         
-        @Override public List<StyleableProperty> impl_getStyleableProperties() {
+        /**
+        * RT-19263
+        * @treatAsPrivate implementation detail
+        * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions
+        */
+        @Deprecated @Override 
+        public List<StyleableProperty> impl_getStyleableProperties() {
             return PopupControl.this.impl_getStyleableProperties();
         }
 
--- a/javafx-ui-controls/src/javafx/scene/control/TableColumn.java	Fri Jul 13 14:55:35 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/TableColumn.java	Mon Jul 16 11:57:46 2012 +1200
@@ -1259,8 +1259,15 @@
      * @deprecated This is an experimental API that is not intended for general 
      * use and is subject to change in future versions
      */
+    @Deprecated
     protected Styleable styleable; 
-        
+       
+    /**
+     * RT-19263
+     * @treatAsPrivate implementation detail
+     * @deprecated This is an experimental API that is not intended for general 
+     * use and is subject to change in future versions
+     */
     @Deprecated // SB-dependency: RT-21094 has been filed to track this
     public Styleable impl_getStyleable() {