--- old/modules/javafx.controls/src/main/java/javafx/scene/control/cell/ChoiceBoxTreeTableCell.java	2017-03-09 14:44:44.946174039 -0800
+++ new/modules/javafx.controls/src/main/java/javafx/scene/control/cell/ChoiceBoxTreeTableCell.java	2017-03-09 14:44:44.842174037 -0800
@@ -50,6 +50,7 @@
  * items that will be shown to the user when the {@link ChoiceBox} 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
  */
@@ -67,6 +68,7 @@
      * being edited, and as a ChoiceBox when in editing mode. The ChoiceBox 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 ChoiceBox} menu is showing. These items must be of the same
@@ -90,6 +92,7 @@
      * being edited, and as a ChoiceBox when in editing mode. The ChoiceBox
      * 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.
@@ -117,6 +120,7 @@
      * being edited, and as a ChoiceBox when in editing mode. The ChoiceBox 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 ChoiceBox} menu is showing. These items must be of the same
@@ -140,6 +144,7 @@
      * being edited, and as a ChoiceBox when in editing mode. The ChoiceBox 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.
@@ -258,6 +263,7 @@
 
     /**
      * The {@link StringConverter} property.
+     * @return the {@link StringConverter} property
      */
     public final ObjectProperty<StringConverter<T>> converterProperty() {
         return converter;
@@ -265,6 +271,7 @@
 
     /**
      * Sets the {@link StringConverter} to be used in this cell.
+     * @param value the {@link StringConverter} to be used in this cell
      */
     public final void setConverter(StringConverter<T> value) {
         converterProperty().set(value);
@@ -272,6 +279,7 @@
 
     /**
      * Returns the {@link StringConverter} used in this cell.
+     * @return the {@link StringConverter} used in this cell
      */
     public final StringConverter<T> getConverter() {
         return converterProperty().get();
@@ -287,6 +295,7 @@
 
     /**
      * Returns the items to be displayed in the ChoiceBox when it is showing.
+     * @return the items to be displayed in the ChoiceBox when it is showing
      */
     public ObservableList<T> getItems() {
         return items;