content is lost when adding a new row during edit, fixes apache#4642

hansva · Nov 29, 2024 · a354fc4 · a354fc4
1 parent 3e8b529
commit a354fc4
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java b/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
@@ -638,6 +638,24 @@ public void mouseDown(MouseEvent event) {
     };
   }
 
+  private void applyAllChanges() {
+    if (activeTableItem != null
+        && !activeTableItem.isDisposed()
+        && editor != null
+        && editor.getEditor() != null
+        && !editor.getEditor().isDisposed()
+        && activeTableColumn > 0) {
+      switch (columns[activeTableColumn - 1].getType()) {
+        case ColumnInfo.COLUMN_TYPE_TEXT:
+          applyTextChange(activeTableItem, activeTableRow, activeTableColumn);
+          break;
+        case ColumnInfo.COLUMN_TYPE_CCOMBO:
+          applyComboChange(activeTableItem, activeTableRow, activeTableColumn);
+          break;
+      }
+    }
+  }
+
   private Listener createKeyUpListener() {
     return event -> {
       if (table.isDisposed()) {
@@ -1832,7 +1850,7 @@ public void insertRowBefore() {
       return;
     }
     int rowNr = table.indexOf(row);
-
+    applyAllChanges();
     insertRow(rowNr);
   }
 
@@ -1859,7 +1877,7 @@ public void insertRowAfter() {
       return;
     }
     int rowNr = table.indexOf(tableItem);
-
+    applyAllChanges();
     insertRow(rowNr + 1);
   }
 
@@ -2096,6 +2114,7 @@ public void clipSelected() {
       clipboard.dispose();
       clipboard = null;
     }
+    applyAllChanges();
 
     clipboard = new Clipboard(getDisplay());
     TextTransfer tran = TextTransfer.getInstance();