changeset 1670:001ebed39b58

RT-24540: Applications using Control builders are not binary compatible
author Eva Krejcirova <eva.krejcirova@oracle.com>
date Tue, 28 Aug 2012 14:04:23 +0200
parents 737377b8ab1d
children 8b5b1c866827
files javafx-ui-controls/src/javafx/scene/control/Control.java javafx-ui-controls/src/javafx/scene/control/PasswordField.java javafx-ui-controls/src/javafx/scene/control/TextArea.java javafx-ui-controls/src/javafx/scene/control/TextField.java javafx-ui-controls/src/javafx/scene/control/TextInputControl.java
diffstat 5 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/javafx/scene/control/Control.java	Wed Aug 22 18:59:34 2012 -0400
+++ b/javafx-ui-controls/src/javafx/scene/control/Control.java	Tue Aug 28 14:04:23 2012 +0200
@@ -26,6 +26,7 @@
 package javafx.scene.control;
 
 import com.sun.javafx.Utils;
+import com.sun.javafx.beans.annotations.DuplicateInBuilderProperties;
 import com.sun.javafx.css.*;
 import com.sun.javafx.css.converters.StringConverter;
 import java.lang.reflect.Constructor;
@@ -70,6 +71,7 @@
  * controls that are containers {@link ScrollPane} and {@link ToolBar} do not.
  * Consult individual control documentation for details.
  */
+@DuplicateInBuilderProperties(properties = {"minHeight", "minWidth", "maxHeight", "maxWidth", "prefHeight", "prefWidth"})
 public abstract class Control extends Region implements Skinnable {
 
     static {
--- a/javafx-ui-controls/src/javafx/scene/control/PasswordField.java	Wed Aug 22 18:59:34 2012 -0400
+++ b/javafx-ui-controls/src/javafx/scene/control/PasswordField.java	Tue Aug 28 14:04:23 2012 +0200
@@ -25,9 +25,12 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.beans.annotations.DuplicateInBuilderProperties;
+
 /**
  * Text field that masks entered characters.
  */
+@DuplicateInBuilderProperties(properties = {"promptText"})
 public class PasswordField extends TextField {
     public PasswordField() {
         getStyleClass().add("password-field");
--- a/javafx-ui-controls/src/javafx/scene/control/TextArea.java	Wed Aug 22 18:59:34 2012 -0400
+++ b/javafx-ui-controls/src/javafx/scene/control/TextArea.java	Tue Aug 28 14:04:23 2012 +0200
@@ -25,6 +25,7 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.beans.annotations.DuplicateInBuilderProperties;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -61,6 +62,7 @@
  *
  * @see TextField
  */
+@DuplicateInBuilderProperties(properties = {"promptText"})
 public class TextArea extends TextInputControl {
     // Text area content model
     private static final class TextAreaContent implements Content {
--- a/javafx-ui-controls/src/javafx/scene/control/TextField.java	Wed Aug 22 18:59:34 2012 -0400
+++ b/javafx-ui-controls/src/javafx/scene/control/TextField.java	Tue Aug 28 14:04:23 2012 +0200
@@ -25,6 +25,7 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.beans.annotations.DuplicateInBuilderProperties;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -61,6 +62,7 @@
  * 
  * @see TextArea
  */
+@DuplicateInBuilderProperties(properties = {"promptText"})
 public class TextField extends TextInputControl {
     // Text field content
     private static final class TextFieldContent implements Content {
--- a/javafx-ui-controls/src/javafx/scene/control/TextInputControl.java	Wed Aug 22 18:59:34 2012 -0400
+++ b/javafx-ui-controls/src/javafx/scene/control/TextInputControl.java	Tue Aug 28 14:04:23 2012 +0200
@@ -50,7 +50,6 @@
 import java.text.BreakIterator;
 
 import com.sun.javafx.Utils;
-import com.sun.javafx.beans.annotations.MovedFromSubclass;
 import com.sun.javafx.binding.ExpressionHelper;
 import com.sun.javafx.css.StyleManager;
 
@@ -172,7 +171,6 @@
         }
     };
     public final StringProperty promptTextProperty() { return promptText; }
-    @MovedFromSubclass
     public final String getPromptText() { return promptText.get(); }
     public final void setPromptText(String value) { promptText.set(value); }