diff -r 7fc778a2c243 -r 82011c6a0e99 javafx-ui-controls/src/com/sun/javafx/scene/control/skin/SplitMenuButtonSkin.java --- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/SplitMenuButtonSkin.java Sat Aug 06 16:59:13 2011 +1000 +++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/SplitMenuButtonSkin.java Sun Aug 07 19:41:28 2011 -0700 @@ -58,28 +58,6 @@ } }); - // If button has no initial label and useSelectedItem is true, then copy from first item. - if (splitMenuButton.getText() == "" && splitMenuButton.getGraphic() == null && - splitMenuButton.isUseSelectedItem() && splitMenuButton.getItems().size() > 0) { - - setLabelFromMenuItem(splitMenuButton, splitMenuButton.getItems().get(0)); - } - - popup.setOnAction(new EventHandler() { - public void handle(ActionEvent ev) { - if (splitMenuButton.isUseSelectedItem() && ev.getTarget() instanceof MenuItem) { - setLabelFromMenuItem(splitMenuButton, (MenuItem)ev.getTarget()); - } - } - }); label.setLabelFor(splitMenuButton); } - - private static void setLabelFromMenuItem(SplitMenuButton splitMenuButton, MenuItem menuItem) { - // TODO: The menu item should be rendered fully in the button, - // with CSS, check/radiobutton mark, etc. - splitMenuButton.setText(menuItem.getText()); - splitMenuButton.setGraphic(menuItem.getGraphic()); - splitMenuButton.setOnAction(menuItem.getOnAction()); - } } diff -r 7fc778a2c243 -r 82011c6a0e99 javafx-ui-controls/src/javafx/scene/control/SplitMenuButton.java --- a/javafx-ui-controls/src/javafx/scene/control/SplitMenuButton.java Sat Aug 06 16:59:13 2011 +1000 +++ b/javafx-ui-controls/src/javafx/scene/control/SplitMenuButton.java Sun Aug 07 19:41:28 2011 -0700 @@ -68,11 +68,6 @@ /** * Creates a new split menu button with the given list of menu items. * - * If the button's {@link #text} and/or {@link #graphic} properties are not - * set explicitly, and {@link #useSelectedItem} is set to true (default), then - * the {@link #text}, {@link #graphic}, and {@link #onAction} properties will - * initially be copied from the first {@link MenuItem}. - * * @param items The items to show within this button's menu */ public SplitMenuButton(MenuItem... items) { @@ -97,35 +92,6 @@ } - /** - * If true, the button's {@link #text} and {@link #graphic} will be those - * of the most recently selected menu item. If an initial {@link #text} - * and/or {@link #graphic} has not been set, then they will be fetched from - * the first {@link MenuItem} in {@link #items}. - * - * If set to false, then the button's {@link #text} and {@link #graphic} - * will not change when a {@link MenuItem} is selected, and must be set - * explicitly. - * - * @defaultvalue true - */ - private BooleanProperty useSelectedItem; - - public final void setUseSelectedItem(boolean value) { - useSelectedItemProperty().set(value); - } - - public final boolean isUseSelectedItem() { - return useSelectedItem == null ? true : useSelectedItem.get(); - } - - public BooleanProperty useSelectedItemProperty() { - if (useSelectedItem == null) { - useSelectedItem = new SimpleBooleanProperty(true); - } - return useSelectedItem; - } - /*************************************************************************** * * * Stylesheet Handling * diff -r 7fc778a2c243 -r 82011c6a0e99 toys/HelloWorld/src/helloworld/HelloMenuButton.java --- a/toys/HelloWorld/src/helloworld/HelloMenuButton.java Sat Aug 06 16:59:13 2011 +1000 +++ b/toys/HelloWorld/src/helloworld/HelloMenuButton.java Sun Aug 07 19:41:28 2011 -0700 @@ -209,7 +209,6 @@ smb.setTooltip(new Tooltip("Tooltip for SplitMenuButton1")); smb.setLayoutX(column_enabled); smb.setLayoutY(y); - smb.setUseSelectedItem(false); smb.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { System.out.println("SplitMenuButton1"); @@ -241,7 +240,6 @@ smb.setDisable(true); smb.setLayoutX(column_disabled); smb.setLayoutY(y); - smb.setUseSelectedItem(false); smb.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { System.out.println("SplitMenuButton1"); @@ -290,6 +288,7 @@ mi.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { System.out.println("Land"); + smb.setText(mi.getText()); } }); smb.getItems().add(mi); @@ -298,6 +297,7 @@ mi.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { System.out.println("Sea"); + smb.setText(mi.getText()); } }); smb.getItems().add(mi); @@ -321,6 +321,7 @@ mi.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { System.out.println("Land"); + smb.setText(mi.getText()); } }); smb.getItems().add(mi); @@ -329,6 +330,7 @@ mi.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { System.out.println("Sea"); + smb.setText(mi.getText()); } }); smb.getItems().add(mi);