--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableCellSkin.java 2015-09-03 15:22:17.957521400 -0700 +++ /dev/null 2015-09-03 15:22:19.000000000 -0700 @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.sun.javafx.scene.control.skin; - -import javafx.scene.control.TableCell; - -import com.sun.javafx.scene.control.behavior.TableCellBehavior; -import javafx.beans.property.BooleanProperty; -import javafx.beans.property.ReadOnlyDoubleProperty; -import javafx.scene.control.TableColumn; - -/** - */ -public class TableCellSkin extends TableCellSkinBase, TableCellBehavior> { - - private final TableColumn tableColumn; - - public TableCellSkin(TableCell tableCell) { - super(tableCell, new TableCellBehavior(tableCell)); - - this.tableColumn = tableCell.getTableColumn(); - - super.init(tableCell); - } - - @Override protected BooleanProperty columnVisibleProperty() { - return tableColumn.visibleProperty(); - } - - @Override protected ReadOnlyDoubleProperty columnWidthProperty() { - return tableColumn.widthProperty(); - } -} --- /dev/null 2015-09-03 15:22:19.000000000 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkin.java 2015-09-03 15:22:17.161475900 -0700 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javafx.scene.control.skin; + +import com.sun.javafx.scene.control.behavior.BehaviorBase; +import javafx.scene.Node; +import javafx.scene.control.Accordion; +import javafx.scene.control.Button; +import javafx.scene.control.Control; +import javafx.scene.control.TableCell; + +import com.sun.javafx.scene.control.behavior.TableCellBehavior; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.ReadOnlyDoubleProperty; +import javafx.scene.control.TableColumn; + +/** + * Default skin implementation for the {@link TableCell} control. + * + * @see TableCell + * @since 9 + */ +public class TableCellSkin extends TableCellSkinBase> { + + /*************************************************************************** + * * + * Private Fields * + * * + **************************************************************************/ + + private final BehaviorBase> behavior; + + + + /*************************************************************************** + * * + * Constructors * + * * + **************************************************************************/ + + /** + * Creates a new TableCellSkin instance, installing the necessary child + * nodes into the Control {@link Control#getChildren() children} list, as + * well as the necessary input mappings for handling key, mouse, etc events. + * + * @param control The control that this skin should be installed onto. + */ + public TableCellSkin(TableCell control) { + super(control); + + // install default input map for the TableCell control + behavior = new TableCellBehavior<>(control); +// control.setInputMap(behavior.getInputMap()); + } + + + + /*************************************************************************** + * * + * Public API * + * * + **************************************************************************/ + + /** {@inheritDoc} */ + @Override public void dispose() { + super.dispose(); + + if (behavior != null) { + behavior.dispose(); + } + } + + /** {@inheritDoc} */ + @Override BooleanProperty columnVisibleProperty() { + return getSkinnable().getTableColumn().visibleProperty(); + } + + /** {@inheritDoc} */ + @Override ReadOnlyDoubleProperty columnWidthProperty() { + return getSkinnable().getTableColumn().widthProperty(); + } +}