--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DatePickerBehavior.java 2015-05-11 15:53:47.139036620 -0700 +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DatePickerBehavior.java 2015-05-11 15:53:47.047036619 -0700 @@ -57,43 +57,9 @@ * * **************************************************************************/ - /** - * Opens the Date Picker Popup - */ - protected static final String OPEN_ACTION = "Open"; - - /** - * Closes the Date Picker Popup - */ - protected static final String CLOSE_ACTION = "Close"; - - protected static final List DATE_PICKER_BINDINGS = new ArrayList(); static { - DATE_PICKER_BINDINGS.add(new KeyBinding(F4, KEY_RELEASED, "togglePopup")); - DATE_PICKER_BINDINGS.add(new KeyBinding(UP, "togglePopup").alt()); - DATE_PICKER_BINDINGS.add(new KeyBinding(DOWN, "togglePopup").alt()); - } - - @Override protected void callAction(String name) { - switch (name) { - case OPEN_ACTION: - show(); break; - - case CLOSE_ACTION: - hide(); break; - - case "togglePopup": - if (getControl().isShowing()) { - hide(); - } else { - show(); - } - break; - - default: - super.callAction(name); - } + DATE_PICKER_BINDINGS.addAll(COMBO_BOX_BASE_BINDINGS); } @Override public void onAutoHide() {