8188027: List/TableCell: must not fire event in startEdit if already editing

Reviewed-by: aghaisas

Author: Jeanette Winzenburg

modules/javafx.controls/src/main/java/javafx/scene/control/ListCell.java

@@ -357,6 +357,7 @@ public void changed(
 
     /** {@inheritDoc} */
     @Override public void startEdit() {
+        if (isEditing()) return;
         final ListView<T> list = getListView();
         if (!isEditable() || (list != null && ! list.isEditable())) {
             return;

modules/javafx.controls/src/main/java/javafx/scene/control/TableCell.java

@@ -304,6 +304,7 @@ private ReadOnlyObjectWrapper<TableView<S>> tableViewPropertyImpl() {
 
     /** {@inheritDoc} */
     @Override public void startEdit() {
+        if (isEditing()) return;
         final TableView<S> table = getTableView();
         final TableColumn<S,T> column = getTableColumn();
         final TableRow<S> row = getTableRow();

modules/javafx.controls/src/test/java/test/javafx/scene/control/ListCellTest.java

@@ -672,6 +672,17 @@ protected void assertInRangeState(int index) {
         assertTrue(called[0]);
     }
 
+    @Test public void editCellDoesNotFireEventWhileAlreadyEditing() {
+        list.setEditable(true);
+        cell.updateListView(list);
+        cell.updateIndex(2);
+        cell.startEdit();
+        List<EditEvent<?>> events = new ArrayList<>();
+        list.setOnEditStart(events::add);
+        cell.startEdit();
+        assertEquals("startEdit must not fire event while editing", 0, events.size());
+    }
+
     // commitEdit()
     @Test public void commitWhenListIsNullIsOK() {
         cell.updateIndex(1);

modules/javafx.controls/src/test/java/test/javafx/scene/control/TableCellTest.java

@@ -529,6 +529,28 @@ public void testEditCancelMemoryLeakAfterRemoveEditingItem() {
         assertEquals("item must be gc'ed", null, itemRef.get());
     }
 
+    @Test
+    public void testEditStartFiresEvent() {
+        setupForEditing();
+        cell.updateIndex(1);
+        List<CellEditEvent<?, ?>> events = new ArrayList<>();
+        editingColumn.setOnEditStart(events::add);
+        cell.startEdit();
+        assertEquals("startEdit must fire", 1, events.size());
+    }
+
+    @Test
+    public void testEditStartDoesNotFireEventWhileEditing() {
+        setupForEditing();
+        cell.updateIndex(1);
+        cell.startEdit();
+        List<CellEditEvent<?, ?>> events = new ArrayList<>();
+        editingColumn.setOnEditStart(events::add);
+        cell.startEdit();
+        assertEquals("startEdit must not fire while editing", 0, events.size());
+    }
+
+
     /**
      * Test that cell.cancelEdit can switch table editing off
      * even if a subclass violates its contract.