--- old/modules/javafx.controls/src/main/java/javafx/scene/control/cell/ComboBoxTreeTableCell.java	2017-03-09 14:44:46.394174065 -0800
+++ new/modules/javafx.controls/src/main/java/javafx/scene/control/cell/ComboBoxTreeTableCell.java	2017-03-09 14:44:46.290174063 -0800
@@ -52,6 +52,7 @@
  * items that will be shown to the user when the {@link ComboBox} menu is
  * showing. These items must be of the same type as the TreeTableColumn.
  *
+ * @param <S> The type of the TableView generic type
  * @param <T> The type of the elements contained within the TreeTableColumn.
  * @since JavaFX 8.0
  */
@@ -69,6 +70,7 @@
      * being edited, and as a ComboBox when in editing mode. The ComboBox will,
      * by default, stretch to fill the entire list cell.
      *
+     * @param <S> The type of the TableView generic type
      * @param <T> The type of the elements contained within the TreeTableColumn.
      * @param items Zero or more items that will be shown to the user when the
      *      {@link ComboBox} menu is showing. These items must be of the same
@@ -93,6 +95,7 @@
      * being edited, and as a ComboBox when in editing mode. The ComboBox will,
      * by default, stretch to fill the entire list cell.
      *
+     * @param <S> The type of the TableView generic type
      * @param <T> The type of the elements contained within the TreeTableColumn.
      * @param converter A {@link StringConverter} to convert the given item (of
      *      type T) to a String for displaying to the user.
@@ -120,6 +123,7 @@
      * being edited, and as a ComboBox when in editing mode. The ComboBox will,
      * by default, stretch to fill the entire list cell.
      *
+     * @param <S> The type of the TableView generic type
      * @param <T> The type of the elements contained within the TreeTableColumn.
      * @param items Zero or more items that will be shown to the user when the
      *      {@link ComboBox} menu is showing. These items must be of the same
@@ -143,6 +147,7 @@
      * being edited, and as a ComboBox when in editing mode. The ComboBox will,
      * by default, stretch to fill the entire list cell.
      *
+     * @param <S> The type of the TableView generic type
      * @param <T> The type of the elements contained within the TreeTableColumn.
      * @param converter A {@link StringConverter} to convert the given item (of
      *      type T) to a String for displaying to the user.
@@ -262,6 +267,7 @@
 
     /**
      * The {@link StringConverter} property.
+     * @return the string converter property
      */
     public final ObjectProperty<StringConverter<T>> converterProperty() {
         return converter;
@@ -269,6 +275,7 @@
 
     /**
      * Sets the {@link StringConverter} to be used in this cell.
+     * @param value the string converter
      */
     public final void setConverter(StringConverter<T> value) {
         converterProperty().set(value);
@@ -276,6 +283,7 @@
 
     /**
      * Returns the {@link StringConverter} used in this cell.
+     * @return the string converter
      */
     public final StringConverter<T> getConverter() {
         return converterProperty().get();
@@ -289,6 +297,8 @@
     /**
      * A property representing whether the ComboBox, when shown to the user,
      * is editable or not.
+     * @return the property representing whether the ComboBox, when shown to the
+     * user, is editable or not
      */
     public final BooleanProperty comboBoxEditableProperty() {
         return comboBoxEditable;
@@ -297,6 +307,7 @@
     /**
      * Configures the ComboBox to be editable (to allow user input outside of the
      * options provide in the dropdown list).
+     * @param value the editable value to be set for this ComboBox
      */
     public final void setComboBoxEditable(boolean value) {
         comboBoxEditableProperty().set(value);
@@ -304,6 +315,7 @@
 
     /**
      * Returns true if the ComboBox is editable.
+     * @return true if the ComboBox is editable
      */
     public final boolean isComboBoxEditable() {
         return comboBoxEditableProperty().get();
@@ -318,7 +330,8 @@
      **************************************************************************/
 
     /**
-     * Returns the items to be displayed in the ChoiceBox when it is showing.
+     * Returns the items to be displayed in the ComboBox when it is showing.
+     * @return the items to be displayed in this ComboBox when it is showing
      */
     public ObservableList<T> getItems() {
         return items;