TableView do not reliably delete rows apache#3712, apache#3767

nadment · Apr 7, 2024 · d89db9c · d89db9c
1 parent cc0669d
commit d89db9c
Showing 1 changed file with 8 additions and 4 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
@@ -574,7 +574,7 @@ public void mouseDown(MouseEvent event) {
                 applyTextChange(activeTableItem, activeTableRow, activeTableColumn);
                 break;
               case ColumnInfo.COLUMN_TYPE_CCOMBO:
-                applyComboChange(activeTableItem, activeTableRow, activeTableColumn);
+                applyComboChange(activeTableItem, activeTableRow, activeTableColumn);          
                 break;
             }
           }
@@ -1753,6 +1753,9 @@ private void fireContentChangedListener(int rowNr, int colNr, String textData) {
   }
 
   private void applyComboChange(TableItem row, int rowNr, int colNr) {
+
+    System.out.println("Apply combo change "+activeTableRow);
+
     String textData;
     boolean usingVariables = columns[colNr - 1].isUsingVariables();
     if (usingVariables) {
@@ -1768,9 +1771,9 @@ private void applyComboChange(TableItem row, int rowNr, int colNr) {
     }
     row.setText(colNr, textData);
     if (usingVariables) {
-      comboVar.setVisible(false);
-    } else {
-      combo.setVisible(false);
+      safelyDisposeControl(comboVar);
+    } else {      
+      safelyDisposeControl(combo);
     }
 
     String[] afterEdit = getItemText(row);
@@ -3431,6 +3434,7 @@ public void closeActiveButton() {
   }
 
   public void unEdit() {
+    System.out.println("unedit");
     if (text != null && !text.isDisposed()) {
       text.dispose();
       text = null;