This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 7beeae5dc9 Issue #5953 : Keep configured fields when previous fields 
fail to load (#9204)
7beeae5dc9 is described below

commit 7beeae5dc9c2fc12de2695f3fd4ed42531a9b796
Author: Matt Casters <[email protected]>
AuthorDate: Mon Nov 2 15:50:33 2026 +0100

    Issue #5953 : Keep configured fields when previous fields fail to load 
(#9204)
    
    * Issue #5953 : Keep configured fields when previous fields fail to load
    
    Those dialogs cleared the combo before the previous-transform lookup.
    A failed lookup never wrote the configured name back. The list is now
    cleared only after the lookup returns. ComboItems writes the previous
    text back when items are replaced.
    
    * Issue #5953 : Address review on failed field lookups
    
    PGP Encrypt Stream no longer clears the stream field before the lookup.
    Get XML Data no longer stores <EMPTY> when that lookup fails.
    Language Model Chat loads previous fields before it replaces the list.
    ComboItems follows CCombo, and the dialogs that write the name back call it.
    Fuzzy Match, XSD Validator, Zip File and getFieldsFromPrevious stay as they 
were.
---
 .../transforms/mailinput/MailInputDialog.java      |   9 +-
 .../binaryfileoutput/BinaryFileOutputDialog.java   |  15 +-
 .../ChangeFileEncodingDialog.java                  |  16 +--
 .../transforms/clonerow/CloneRowDialog.java        |   8 +-
 .../columnexists/ColumnExistsDialog.java           |  17 +--
 .../CreditCardValidatorDialog.java                 |  10 +-
 .../transforms/language/DetectLanguageDialog.java  |  13 +-
 .../dynamicsqlrow/DynamicSqlRowDialog.java         |   9 +-
 .../transforms/execprocess/ExecProcessDialog.java  |   8 +-
 .../transforms/execsqlrow/ExecSqlRowDialog.java    |   9 +-
 .../transforms/fileexists/FileExistsDialog.java    |   8 +-
 .../transforms/filelocked/FileLockedDialog.java    |   8 +-
 .../filemetadata/FileMetadataDialog.java           |   3 +-
 .../getfilenames/GetFileNamesDialog.java           |  25 +---
 .../getfilesrowcount/GetFilesRowsCountDialog.java  |   3 +-
 .../gettablenames/GetTableNamesDialog.java         |   9 +-
 .../transforms/html2text/Html2TextDialog.java      |  12 +-
 .../jsonnormalize/JsonNormalizeInputDialog.java    |   9 +-
 .../internals/ui/GeneralSettingsComposite.java     |  12 +-
 .../transforms/ldapinput/LdapInputDialog.java      |  16 +--
 .../loadfileinput/LoadFileInputDialog.java         |   8 +-
 .../pgpdecryptstream/PGPDecryptStreamDialog.java   |  11 +-
 .../pgpencryptstream/PGPEncryptStreamDialog.java   |  16 +--
 .../processfiles/ProcessFilesDialog.java           |  17 +--
 .../propertyinput/PropertyInputDialog.java         |  12 +-
 .../transforms/regexeval/RegexEvalDialog.java      |   4 +-
 .../hop/pipeline/transforms/ssh/SshDialog.java     |   9 +-
 .../nlp/simple/StanfordSimpleNlpDialog.java        |  13 +-
 .../transforms/tableexists/TableExistsDialog.java  |   2 +-
 .../hop/pipeline/transforms/tika/TikaDialog.java   |   8 +-
 .../transforms/valuemapper/ValueMapperDialog.java  |   9 +-
 .../WebServiceAvailableDialog.java                 |   8 +-
 .../xml/getxmldata/GetXmlDataDialog.java           |   6 +-
 .../xml/xmlinputstream/XmlInputStreamDialog.java   |   9 +-
 .../pipeline/transforms/xml/xslt/XsltDialog.java   |   9 +-
 .../transforms/yamlinput/YamlInputDialog.java      |   2 +-
 .../org/apache/hop/ui/core/widget/ComboItems.java  |  58 ++++++++
 .../apache/hop/ui/core/widget/ComboItemsTest.java  | 153 +++++++++++++++++++++
 38 files changed, 293 insertions(+), 280 deletions(-)

diff --git 
a/plugins/misc/mail/src/main/java/org/apache/hop/mail/pipeline/transforms/mailinput/MailInputDialog.java
 
b/plugins/misc/mail/src/main/java/org/apache/hop/mail/pipeline/transforms/mailinput/MailInputDialog.java
index eb2f186036..e2eadfc9c6 100644
--- 
a/plugins/misc/mail/src/main/java/org/apache/hop/mail/pipeline/transforms/mailinput/MailInputDialog.java
+++ 
b/plugins/misc/mail/src/main/java/org/apache/hop/mail/pipeline/transforms/mailinput/MailInputDialog.java
@@ -48,6 +48,7 @@ import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.gui.WindowProperty;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.MetaSelectionLine;
 import org.apache.hop.ui.core.widget.PasswordTextVar;
 import org.apache.hop.ui.core.widget.TableView;
@@ -1509,15 +1510,9 @@ public class MailInputDialog extends BaseTransformDialog 
{
   private void setFolderField() {
     if (!gotPreviousfields) {
       try {
-        String field = wFolderField.getText();
-        wFolderField.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFolderField.setItems(r.getFieldNames());
-        }
-        if (field != null) {
-          wFolderField.setText(field);
+          ComboItems.setItemsKeepingText(wFolderField, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/binaryfileoutput/src/main/java/org/apache/hop/pipeline/transforms/binaryfileoutput/BinaryFileOutputDialog.java
 
b/plugins/transforms/binaryfileoutput/src/main/java/org/apache/hop/pipeline/transforms/binaryfileoutput/BinaryFileOutputDialog.java
index 6c01ac30c5..22be47ee49 100644
--- 
a/plugins/transforms/binaryfileoutput/src/main/java/org/apache/hop/pipeline/transforms/binaryfileoutput/BinaryFileOutputDialog.java
+++ 
b/plugins/transforms/binaryfileoutput/src/main/java/org/apache/hop/pipeline/transforms/binaryfileoutput/BinaryFileOutputDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -253,21 +254,11 @@ public class BinaryFileOutputDialog extends 
BaseTransformDialog {
       return;
     }
     try {
-      String binaryValue = wBinaryField.getText();
-      String filenameValue = wFilenameField.getText();
-      wBinaryField.removeAll();
-      wFilenameField.removeAll();
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
       if (r != null) {
         String[] fields = r.getFieldNames();
-        wBinaryField.setItems(fields);
-        wFilenameField.setItems(fields);
-      }
-      if (binaryValue != null) {
-        wBinaryField.setText(binaryValue);
-      }
-      if (filenameValue != null) {
-        wFilenameField.setText(filenameValue);
+        ComboItems.setItemsKeepingText(wBinaryField, fields);
+        ComboItems.setItemsKeepingText(wFilenameField, fields);
       }
       gotPreviousFields = true;
     } catch (HopException ke) {
diff --git 
a/plugins/transforms/changefileencoding/src/main/java/org/apache/hop/pipeline/transforms/changefileencoding/ChangeFileEncodingDialog.java
 
b/plugins/transforms/changefileencoding/src/main/java/org/apache/hop/pipeline/transforms/changefileencoding/ChangeFileEncodingDialog.java
index f7ae9bf5dd..13952e4e43 100644
--- 
a/plugins/transforms/changefileencoding/src/main/java/org/apache/hop/pipeline/transforms/changefileencoding/ChangeFileEncodingDialog.java
+++ 
b/plugins/transforms/changefileencoding/src/main/java/org/apache/hop/pipeline/transforms/changefileencoding/ChangeFileEncodingDialog.java
@@ -28,6 +28,7 @@ import org.apache.hop.ui.core.ConstUi;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.ComboVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.apache.hop.ui.pipeline.transform.ComponentSelectionListener;
@@ -343,20 +344,11 @@ public class ChangeFileEncodingDialog extends 
BaseTransformDialog {
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String filefield = wFileName.getText();
-        String targetfilefield = wTargetFileName.getText();
-        wFileName.removeAll();
-        wTargetFileName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFileName.setItems(r.getFieldNames());
-          wTargetFileName.setItems(r.getFieldNames());
-        }
-        if (filefield != null) {
-          wFileName.setText(filefield);
-        }
-        if (targetfilefield != null) {
-          wTargetFileName.setText(targetfilefield);
+          String[] fields = r.getFieldNames();
+          ComboItems.setItemsKeepingText(wFileName, fields);
+          ComboItems.setItemsKeepingText(wTargetFileName, fields);
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/clonerow/src/main/java/org/apache/hop/pipeline/transforms/clonerow/CloneRowDialog.java
 
b/plugins/transforms/clonerow/src/main/java/org/apache/hop/pipeline/transforms/clonerow/CloneRowDialog.java
index 97bc24fa97..8dd60739fd 100644
--- 
a/plugins/transforms/clonerow/src/main/java/org/apache/hop/pipeline/transforms/clonerow/CloneRowDialog.java
+++ 
b/plugins/transforms/clonerow/src/main/java/org/apache/hop/pipeline/transforms/clonerow/CloneRowDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
@@ -299,14 +300,9 @@ public class CloneRowDialog extends BaseTransformDialog {
   private void setisNrCloneInField() {
     if (!gotPreviousFields) {
       try {
-        String field = wNrCloneField.getText();
-        wNrCloneField.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wNrCloneField.setItems(r.getFieldNames());
-        }
-        if (field != null) {
-          wNrCloneField.setText(field);
+          ComboItems.setItemsKeepingText(wNrCloneField, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsDialog.java
 
b/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsDialog.java
index 3f1730d5c5..e18db8ed7f 100644
--- 
a/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsDialog.java
+++ 
b/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsDialog.java
@@ -33,6 +33,7 @@ import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.EnterSelectionDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.MessageBox;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.MetaSelectionLine;
 import org.apache.hop.ui.core.widget.NamingSchemeTypes;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -395,22 +396,12 @@ public class ColumnExistsDialog extends 
BaseTransformDialog {
 
   private void get() {
     try {
-      String columnName = wColumnName.getText();
-      String tableName = wTableName.getText();
-
-      wColumnName.removeAll();
-      wTableName.removeAll();
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
       if (r != null) {
-        r.getFieldNames();
-
-        for (int i = 0; i < r.getFieldNames().length; i++) {
-          wTableName.add(r.getFieldNames()[i]);
-          wColumnName.add(r.getFieldNames()[i]);
-        }
+        String[] fields = r.getFieldNames();
+        ComboItems.setItemsKeepingText(wColumnName, fields);
+        ComboItems.setItemsKeepingText(wTableName, fields);
       }
-      wColumnName.setText(columnName);
-      wTableName.setText(tableName);
     } catch (HopException ke) {
       new ErrorDialog(
           shell,
diff --git 
a/plugins/transforms/creditcardvalidator/src/main/java/org/apache/hop/pipeline/transforms/creditcardvalidator/CreditCardValidatorDialog.java
 
b/plugins/transforms/creditcardvalidator/src/main/java/org/apache/hop/pipeline/transforms/creditcardvalidator/CreditCardValidatorDialog.java
index e29ab81576..2be5dd545f 100644
--- 
a/plugins/transforms/creditcardvalidator/src/main/java/org/apache/hop/pipeline/transforms/creditcardvalidator/CreditCardValidatorDialog.java
+++ 
b/plugins/transforms/creditcardvalidator/src/main/java/org/apache/hop/pipeline/transforms/creditcardvalidator/CreditCardValidatorDialog.java
@@ -43,6 +43,7 @@ import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.ComboVar;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -882,17 +883,10 @@ public class CreditCardValidatorDialog extends 
BaseTransformDialog {
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String columnName = wFieldName.getText();
-        wFieldName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          r.getFieldNames();
-
-          for (int i = 0; i < r.getFieldNames().length; i++) {
-            wFieldName.add(r.getFieldNames()[i]);
-          }
+          ComboItems.setItemsKeepingText(wFieldName, r.getFieldNames());
         }
-        wFieldName.setText(columnName);
         gotPreviousFields = true;
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/detectlanguage/src/main/java/org/apache/hop/pipeline/transforms/language/DetectLanguageDialog.java
 
b/plugins/transforms/detectlanguage/src/main/java/org/apache/hop/pipeline/transforms/language/DetectLanguageDialog.java
index 433b82db8a..c5a1fcb766 100644
--- 
a/plugins/transforms/detectlanguage/src/main/java/org/apache/hop/pipeline/transforms/language/DetectLanguageDialog.java
+++ 
b/plugins/transforms/detectlanguage/src/main/java/org/apache/hop/pipeline/transforms/language/DetectLanguageDialog.java
@@ -34,6 +34,7 @@ import org.apache.hop.pipeline.transform.ITransformDialog;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -167,19 +168,9 @@ public class DetectLanguageDialog extends 
BaseTransformDialog implements ITransf
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String corpusField = null;
-
-        if (wCorpusFieldName.getText() != null) {
-          corpusField = wCorpusFieldName.getText();
-        }
-        wCorpusFieldName.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wCorpusFieldName.setItems(r.getFieldNames());
-        }
-        if (corpusField != null) {
-          wCorpusFieldName.setText(corpusField);
+          ComboItems.setItemsKeepingText(wCorpusFieldName, r.getFieldNames());
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowDialog.java
 
b/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowDialog.java
index b28aef32fb..c191601440 100644
--- 
a/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowDialog.java
+++ 
b/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowDialog.java
@@ -32,6 +32,7 @@ import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.MessageBox;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.MetaSelectionLine;
 import org.apache.hop.ui.core.widget.SQLStyledTextComp;
 import org.apache.hop.ui.core.widget.StyledTextComp;
@@ -440,15 +441,9 @@ public class DynamicSqlRowDialog extends 
BaseTransformDialog {
     if (!gotPreviousFields) {
       gotPreviousFields = true;
       try {
-        String sqlfield = wSqlFieldName.getText();
-        wSqlFieldName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wSqlFieldName.removeAll();
-          wSqlFieldName.setItems(r.getFieldNames());
-        }
-        if (sqlfield != null) {
-          wSqlFieldName.setText(sqlfield);
+          ComboItems.setItemsKeepingText(wSqlFieldName, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/execprocess/src/main/java/org/apache/hop/pipeline/transforms/execprocess/ExecProcessDialog.java
 
b/plugins/transforms/execprocess/src/main/java/org/apache/hop/pipeline/transforms/execprocess/ExecProcessDialog.java
index 1b3e94679b..cd2ad520db 100644
--- 
a/plugins/transforms/execprocess/src/main/java/org/apache/hop/pipeline/transforms/execprocess/ExecProcessDialog.java
+++ 
b/plugins/transforms/execprocess/src/main/java/org/apache/hop/pipeline/transforms/execprocess/ExecProcessDialog.java
@@ -31,6 +31,7 @@ import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.LabelTextVar;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -396,14 +397,9 @@ public class ExecProcessDialog extends BaseTransformDialog 
{
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String fieldValue = wProcess.getText();
-        wProcess.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wProcess.setItems(r.getFieldNames());
-        }
-        if (fieldValue != null) {
-          wProcess.setText(fieldValue);
+          ComboItems.setItemsKeepingText(wProcess, r.getFieldNames());
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowDialog.java
 
b/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowDialog.java
index fcad865ed8..f129122094 100644
--- 
a/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowDialog.java
+++ 
b/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowDialog.java
@@ -29,6 +29,7 @@ import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.MessageBox;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.MetaSelectionLine;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
@@ -402,15 +403,9 @@ public class ExecSqlRowDialog extends BaseTransformDialog {
     if (!gotPreviousFields) {
       gotPreviousFields = true;
       try {
-        String sqlfield = wSqlFieldName.getText();
-        wSqlFieldName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wSqlFieldName.removeAll();
-          wSqlFieldName.setItems(r.getFieldNames());
-        }
-        if (sqlfield != null) {
-          wSqlFieldName.setText(sqlfield);
+          ComboItems.setItemsKeepingText(wSqlFieldName, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/fileexists/src/main/java/org/apache/hop/pipeline/transforms/fileexists/FileExistsDialog.java
 
b/plugins/transforms/fileexists/src/main/java/org/apache/hop/pipeline/transforms/fileexists/FileExistsDialog.java
index a1fc3db696..9ffff526b0 100644
--- 
a/plugins/transforms/fileexists/src/main/java/org/apache/hop/pipeline/transforms/fileexists/FileExistsDialog.java
+++ 
b/plugins/transforms/fileexists/src/main/java/org/apache/hop/pipeline/transforms/fileexists/FileExistsDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.apache.hop.ui.pipeline.transform.ComponentSelectionListener;
@@ -276,14 +277,9 @@ public class FileExistsDialog extends BaseTransformDialog {
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String fieldvalue = wFileName.getText();
-        wFileName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFileName.setItems(r.getFieldNames());
-        }
-        if (fieldvalue != null) {
-          wFileName.setText(fieldvalue);
+          ComboItems.setItemsKeepingText(wFileName, r.getFieldNames());
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/filelocked/src/main/java/org/apache/hop/pipeline/transforms/filelocked/FileLockedDialog.java
 
b/plugins/transforms/filelocked/src/main/java/org/apache/hop/pipeline/transforms/filelocked/FileLockedDialog.java
index 98ff665c6f..629e30acbd 100644
--- 
a/plugins/transforms/filelocked/src/main/java/org/apache/hop/pipeline/transforms/filelocked/FileLockedDialog.java
+++ 
b/plugins/transforms/filelocked/src/main/java/org/apache/hop/pipeline/transforms/filelocked/FileLockedDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
@@ -186,14 +187,9 @@ public class FileLockedDialog extends BaseTransformDialog {
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String filefield = wFileName.getText();
-        wFileName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFileName.setItems(r.getFieldNames());
-        }
-        if (filefield != null) {
-          wFileName.setText(filefield);
+          ComboItems.setItemsKeepingText(wFileName, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java
 
b/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java
index c00cea7080..749d6d5c8c 100644
--- 
a/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java
+++ 
b/plugins/transforms/filemetadata/src/main/java/org/apache/hop/pipeline/transforms/filemetadata/FileMetadataDialog.java
@@ -396,9 +396,8 @@ public class FileMetadataDialog extends BaseTransformDialog 
{
       if (!getPreviousFields) {
         getPreviousFields = true;
 
-        wFilenameField.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
+        wFilenameField.removeAll();
         if (r != null) {
           wFilenameField.setItems(r.getFieldNames());
         }
diff --git 
a/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
 
b/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
index 622aadd0b0..a366a16e7b 100644
--- 
a/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
+++ 
b/plugins/transforms/getfilenames/src/main/java/org/apache/hop/pipeline/transforms/getfilenames/GetFileNamesDialog.java
@@ -41,6 +41,7 @@ import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.NamingSchemeTypes;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -831,14 +832,6 @@ public class GetFileNamesDialog extends 
BaseTransformDialog {
     try {
       if (!getPreviousFields) {
         getPreviousFields = true;
-        String filename = wFilenameField.getText();
-        String wildcard = wWildcardField.getText();
-        String excludewildcard = wExcludeWildcardField.getText();
-
-        wFilenameField.removeAll();
-        wWildcardField.removeAll();
-        wExcludeWildcardField.removeAll();
-
         IRowMeta r = null;
 
         try {
@@ -849,18 +842,10 @@ public class GetFileNamesDialog extends 
BaseTransformDialog {
         }
 
         if (r != null) {
-          wFilenameField.setItems(r.getFieldNames());
-          wWildcardField.setItems(r.getFieldNames());
-          wExcludeWildcardField.setItems(r.getFieldNames());
-        }
-        if (filename != null) {
-          wFilenameField.setText(filename);
-        }
-        if (wildcard != null) {
-          wWildcardField.setText(wildcard);
-        }
-        if (excludewildcard != null) {
-          wExcludeWildcardField.setText(excludewildcard);
+          String[] fields = r.getFieldNames();
+          ComboItems.setItemsKeepingText(wFilenameField, fields);
+          ComboItems.setItemsKeepingText(wWildcardField, fields);
+          ComboItems.setItemsKeepingText(wExcludeWildcardField, fields);
         }
       }
     } catch (HopException ke) {
diff --git 
a/plugins/transforms/getfilesrowcount/src/main/java/org/apache/hop/pipeline/transforms/getfilesrowcount/GetFilesRowsCountDialog.java
 
b/plugins/transforms/getfilesrowcount/src/main/java/org/apache/hop/pipeline/transforms/getfilesrowcount/GetFilesRowsCountDialog.java
index 1f3dd1c766..c1ce73b776 100644
--- 
a/plugins/transforms/getfilesrowcount/src/main/java/org/apache/hop/pipeline/transforms/getfilesrowcount/GetFilesRowsCountDialog.java
+++ 
b/plugins/transforms/getfilesrowcount/src/main/java/org/apache/hop/pipeline/transforms/getfilesrowcount/GetFilesRowsCountDialog.java
@@ -825,9 +825,8 @@ public class GetFilesRowsCountDialog extends 
BaseTransformDialog {
   private void setFileField() {
     try {
 
-      wFilenameField.removeAll();
-
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
+      wFilenameField.removeAll();
       if (r != null) {
         r.getFieldNames();
 
diff --git 
a/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesDialog.java
 
b/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesDialog.java
index f8b7d183c0..3b50f15ad8 100644
--- 
a/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesDialog.java
+++ 
b/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesDialog.java
@@ -35,6 +35,7 @@ import org.apache.hop.ui.core.dialog.EnterTextDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.MetaSelectionLine;
 import org.apache.hop.ui.core.widget.NamingSchemeTypes;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -577,15 +578,9 @@ public class GetTableNamesDialog extends 
BaseTransformDialog {
   private void setSchemaField() {
     if (!gotPreviousFields) {
       try {
-        String value = wSchemaField.getText();
-        wSchemaField.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wSchemaField.setItems(r.getFieldNames());
-        }
-        if (value != null) {
-          wSchemaField.setText(value);
+          ComboItems.setItemsKeepingText(wSchemaField, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/html2text/src/main/java/org/apache/hop/pipeline/transforms/html2text/Html2TextDialog.java
 
b/plugins/transforms/html2text/src/main/java/org/apache/hop/pipeline/transforms/html2text/Html2TextDialog.java
index 359f39035c..9d3612f90c 100644
--- 
a/plugins/transforms/html2text/src/main/java/org/apache/hop/pipeline/transforms/html2text/Html2TextDialog.java
+++ 
b/plugins/transforms/html2text/src/main/java/org/apache/hop/pipeline/transforms/html2text/Html2TextDialog.java
@@ -39,6 +39,7 @@ import 
org.apache.hop.pipeline.transforms.html2text.Html2TextMeta.SafelistType;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
@@ -328,18 +329,9 @@ public class Html2TextDialog extends BaseTransformDialog 
implements ITransformDi
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String htmlField = null;
-        if (wHtmlFieldName.getText() != null) {
-          htmlField = wHtmlFieldName.getText();
-        }
-        wHtmlFieldName.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wHtmlFieldName.setItems(r.getFieldNames());
-        }
-        if (htmlField != null) {
-          wHtmlFieldName.setText(htmlField);
+          ComboItems.setItemsKeepingText(wHtmlFieldName, r.getFieldNames());
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInputDialog.java
 
b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInputDialog.java
index fa618d7f16..0983859acd 100644
--- 
a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInputDialog.java
+++ 
b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInputDialog.java
@@ -52,6 +52,7 @@ import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog;
@@ -1222,15 +1223,9 @@ public class JsonNormalizeInputDialog extends 
BaseTransformDialog {
 
   private void setSourceStreamField(boolean isShowErrorDialog) {
     try {
-      String value = wFieldValue.getText();
-      wFieldValue.removeAll();
-
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
       if (r != null) {
-        wFieldValue.setItems(r.getFieldNames());
-      }
-      if (value != null) {
-        wFieldValue.setText(value);
+        ComboItems.setItemsKeepingText(wFieldValue, r.getFieldNames());
       }
     } catch (HopException ke) {
       if (!isShowErrorDialog) {
diff --git 
a/plugins/transforms/languagemodelchat/src/main/java/org/apache/hop/pipeline/transforms/languagemodelchat/internals/ui/GeneralSettingsComposite.java
 
b/plugins/transforms/languagemodelchat/src/main/java/org/apache/hop/pipeline/transforms/languagemodelchat/internals/ui/GeneralSettingsComposite.java
index e3e175d64c..4f849d0f0c 100644
--- 
a/plugins/transforms/languagemodelchat/src/main/java/org/apache/hop/pipeline/transforms/languagemodelchat/internals/ui/GeneralSettingsComposite.java
+++ 
b/plugins/transforms/languagemodelchat/src/main/java/org/apache/hop/pipeline/transforms/languagemodelchat/internals/ui/GeneralSettingsComposite.java
@@ -41,6 +41,7 @@ import 
org.apache.hop.pipeline.transforms.languagemodelchat.LanguageModelChatMet
 import 
org.apache.hop.pipeline.transforms.languagemodelchat.internals.ModelType;
 import 
org.apache.hop.pipeline.transforms.languagemodelchat.internals.ui.FormDataBuilder.Builder;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.FocusEvent;
@@ -284,21 +285,12 @@ public class GeneralSettingsComposite implements 
IDialogComposite {
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String inputField = null;
-        if (inputFieldInput.getText() != null) {
-          inputField = inputFieldInput.getText();
-        }
-        inputFieldInput.removeAll();
-
         IRowMeta r =
             parameters
                 .pipelineMeta()
                 .getPrevTransformFields(parameters.variables(), 
parameters.transformName());
         if (r != null) {
-          inputFieldInput.setItems(r.getFieldNames());
-        }
-        if (inputField != null) {
-          inputFieldInput.setText(inputField);
+          ComboItems.setItemsKeepingText(inputFieldInput, r.getFieldNames());
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
 
b/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
index 2a384c1f9a..4310d74a0a 100644
--- 
a/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
+++ 
b/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInputDialog.java
@@ -39,6 +39,7 @@ import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.ComboVar;
 import org.apache.hop.ui.core.widget.PasswordTextVar;
 import org.apache.hop.ui.core.widget.StyledTextComp;
@@ -1517,20 +1518,11 @@ public class LdapInputDialog extends 
BaseTransformDialog {
   private void setSearchBaseField() {
     if (!gotPreviousFields) {
       try {
-        String basefield = wSearchBaseField.getText();
-        String filterfield = wFilterField.getText();
-        wSearchBaseField.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wSearchBaseField.setItems(r.getFieldNames());
-          wFilterField.setItems(r.getFieldNames());
-        }
-        if (basefield != null) {
-          wSearchBaseField.setText(basefield);
-        }
-        if (filterfield != null) {
-          wFilterField.setText(basefield);
+          String[] fields = r.getFieldNames();
+          ComboItems.setItemsKeepingText(wSearchBaseField, fields);
+          ComboItems.setItemsKeepingText(wFilterField, fields);
         }
 
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
 
b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
index 26797d8107..a669ead4e1 100644
--- 
a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
+++ 
b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInputDialog.java
@@ -42,6 +42,7 @@ import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog;
@@ -1022,14 +1023,9 @@ public class LoadFileInputDialog extends 
BaseTransformDialog {
   private void setDynamicFilenameField() {
     if (!gotPreviousFields) {
       try {
-        String field = wFilenameField.getText();
-        wFilenameField.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFilenameField.setItems(r.getFieldNames());
-        }
-        if (field != null) {
-          wFilenameField.setText(field);
+          ComboItems.setItemsKeepingText(wFilenameField, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpdecryptstream/PGPDecryptStreamDialog.java
 
b/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpdecryptstream/PGPDecryptStreamDialog.java
index 6bbfafd880..de43a82240 100644
--- 
a/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpdecryptstream/PGPDecryptStreamDialog.java
+++ 
b/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpdecryptstream/PGPDecryptStreamDialog.java
@@ -27,6 +27,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.PasswordTextVar;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -332,18 +333,12 @@ public class PGPDecryptStreamDialog extends 
BaseTransformDialog {
       try {
         shell.setCursor(busy);
 
-        String fieldValue = wStreamFieldName.getText();
-        String passPhraseFieldValue = wPassPhraseFieldName.getText();
-        wStreamFieldName.removeAll();
-        wPassPhraseFieldName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
           String[] fields = r.getFieldNames();
-          wStreamFieldName.setItems(fields);
-          wPassPhraseFieldName.setItems(fields);
+          ComboItems.setItemsKeepingText(wStreamFieldName, fields);
+          ComboItems.setItemsKeepingText(wPassPhraseFieldName, fields);
         }
-        wStreamFieldName.setText(Const.NVL(fieldValue, ""));
-        wPassPhraseFieldName.setText(Const.NVL(passPhraseFieldValue, ""));
         gotPreviousFields = true;
       } catch (HopException ke) {
         shell.setCursor(null);
diff --git 
a/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpencryptstream/PGPEncryptStreamDialog.java
 
b/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpencryptstream/PGPEncryptStreamDialog.java
index f2612ba243..11bf6728d9 100644
--- 
a/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpencryptstream/PGPEncryptStreamDialog.java
+++ 
b/plugins/transforms/pgp/src/main/java/org/apache/hop/pipeline/transforms/pgpencryptstream/PGPEncryptStreamDialog.java
@@ -27,6 +27,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
@@ -335,20 +336,11 @@ public class PGPEncryptStreamDialog extends 
BaseTransformDialog {
       Cursor busy = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
       try {
         shell.setCursor(busy);
-        String fieldValue = wStreamFieldName.getText();
-        wStreamFieldName.removeAll();
-        String keyNameFieldNameText = wKeyNameFieldName.getText();
-        wKeyNameFieldName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wStreamFieldName.setItems(r.getFieldNames());
-          wKeyNameFieldName.setItems(r.getFieldNames());
-        }
-        if (fieldValue != null) {
-          wStreamFieldName.setText(fieldValue);
-        }
-        if (keyNameFieldNameText != null) {
-          wKeyNameFieldName.setText(keyNameFieldNameText);
+          String[] fields = r.getFieldNames();
+          ComboItems.setItemsKeepingText(wStreamFieldName, fields);
+          ComboItems.setItemsKeepingText(wKeyNameFieldName, fields);
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFilesDialog.java
 
b/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFilesDialog.java
index 78519336a8..4e85440f3f 100644
--- 
a/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFilesDialog.java
+++ 
b/plugins/transforms/processfiles/src/main/java/org/apache/hop/pipeline/transforms/processfiles/ProcessFilesDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -403,21 +404,11 @@ public class ProcessFilesDialog extends 
BaseTransformDialog {
     if (!gotPreviousFields) {
       gotPreviousFields = true;
       try {
-        String source = wSourceFileNameField.getText();
-        String target = wTargetFileNameField.getText();
-
-        wSourceFileNameField.removeAll();
-        wTargetFileNameField.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wSourceFileNameField.setItems(r.getFieldNames());
-          wTargetFileNameField.setItems(r.getFieldNames());
-          if (source != null) {
-            wSourceFileNameField.setText(source);
-          }
-          if (target != null) {
-            wTargetFileNameField.setText(target);
-          }
+          String[] fields = r.getFieldNames();
+          ComboItems.setItemsKeepingText(wSourceFileNameField, fields);
+          ComboItems.setItemsKeepingText(wTargetFileNameField, fields);
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
 
b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
index 4ccc320d93..2625e52ff1 100644
--- 
a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
+++ 
b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInputDialog.java
@@ -46,6 +46,7 @@ import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.ComboVar;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -1056,18 +1057,9 @@ public class PropertyInputDialog extends 
BaseTransformDialog {
 
   private void setFileField() {
     try {
-      String value = wFilenameField.getText();
-      wFilenameField.removeAll();
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
       if (r != null) {
-        r.getFieldNames();
-
-        for (int i = 0; i < r.getFieldNames().length; i++) {
-          wFilenameField.add(r.getFieldNames()[i]);
-        }
-      }
-      if (value != null) {
-        wFilenameField.setText(value);
+        ComboItems.setItemsKeepingText(wFilenameField, r.getFieldNames());
       }
 
     } catch (HopException ke) {
diff --git 
a/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
 
b/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
index 7baf0fc0b7..a1c07df065 100644
--- 
a/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
+++ 
b/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEvalDialog.java
@@ -629,12 +629,12 @@ public class RegexEvalDialog extends BaseTransformDialog {
     // Save user-selected value, if applicable
     String selectedValue = wFieldEvaluate.getText();
 
-    // Clear the existing list, and reload
-    wFieldEvaluate.removeAll();
     try {
       shell.setCursor(busy);
 
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
+      // Clear the existing list, and reload
+      wFieldEvaluate.removeAll();
       if (r != null) {
         for (String item : r.getFieldNames()) {
           wFieldEvaluate.add(item);
diff --git 
a/plugins/transforms/ssh/src/main/java/org/apache/hop/pipeline/transforms/ssh/SshDialog.java
 
b/plugins/transforms/ssh/src/main/java/org/apache/hop/pipeline/transforms/ssh/SshDialog.java
index 1cb7461125..c862d598e1 100644
--- 
a/plugins/transforms/ssh/src/main/java/org/apache/hop/pipeline/transforms/ssh/SshDialog.java
+++ 
b/plugins/transforms/ssh/src/main/java/org/apache/hop/pipeline/transforms/ssh/SshDialog.java
@@ -36,6 +36,7 @@ import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.LabelTextVar;
 import org.apache.hop.ui.core.widget.StyledTextComp;
 import org.apache.hop.ui.core.widget.TextComposite;
@@ -725,15 +726,9 @@ public class SshDialog extends BaseTransformDialog {
     if (!gotPreviousFields) {
       gotPreviousFields = true;
       try {
-        String source = wCommandField.getText();
-
-        wCommandField.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wCommandField.setItems(r.getFieldNames());
-          if (source != null) {
-            wCommandField.setText(source);
-          }
+          ComboItems.setItemsKeepingText(wCommandField, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/stanfordnlp/src/main/java/org/apache/hop/pipeline/transforms/stanford/nlp/simple/StanfordSimpleNlpDialog.java
 
b/plugins/transforms/stanfordnlp/src/main/java/org/apache/hop/pipeline/transforms/stanford/nlp/simple/StanfordSimpleNlpDialog.java
index 13ba3290d5..6c3f29c934 100644
--- 
a/plugins/transforms/stanfordnlp/src/main/java/org/apache/hop/pipeline/transforms/stanford/nlp/simple/StanfordSimpleNlpDialog.java
+++ 
b/plugins/transforms/stanfordnlp/src/main/java/org/apache/hop/pipeline/transforms/stanford/nlp/simple/StanfordSimpleNlpDialog.java
@@ -37,6 +37,7 @@ import org.apache.hop.pipeline.transform.ITransformDialog;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -222,19 +223,9 @@ public class StanfordSimpleNlpDialog extends 
BaseTransformDialog implements ITra
   private void getPreviousFields() {
     if (!gotPreviousFields) {
       try {
-        String corpusField = null;
-
-        if (wCorpusFieldName.getText() != null) {
-          corpusField = wCorpusFieldName.getText();
-        }
-        wCorpusFieldName.removeAll();
-
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wCorpusFieldName.setItems(r.getFieldNames());
-        }
-        if (corpusField != null) {
-          wCorpusFieldName.setText(corpusField);
+          ComboItems.setItemsKeepingText(wCorpusFieldName, r.getFieldNames());
         }
         gotPreviousFields = true;
       } catch (HopException ke) {
diff --git 
a/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsDialog.java
 
b/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsDialog.java
index 257e3d6d39..543edbbed2 100644
--- 
a/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsDialog.java
+++ 
b/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsDialog.java
@@ -263,8 +263,8 @@ public class TableExistsDialog extends BaseTransformDialog {
   private void get() {
     try {
 
-      wTableName.removeAll();
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
+      wTableName.removeAll();
       if (r != null) {
         r.getFieldNames();
 
diff --git 
a/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/TikaDialog.java
 
b/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/TikaDialog.java
index 956cd950fe..407002d6a2 100755
--- 
a/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/TikaDialog.java
+++ 
b/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/TikaDialog.java
@@ -41,6 +41,7 @@ import org.apache.hop.ui.core.dialog.MessageBox;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.NamingSchemeTypes;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -709,14 +710,9 @@ public class TikaDialog extends BaseTransformDialog {
   private void setDynamicFilenameField() {
     if (!gotPreviousFields) {
       try {
-        String field = wFilenameField.getText();
-        wFilenameField.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFilenameField.setItems(r.getFieldNames());
-        }
-        if (field != null) {
-          wFilenameField.setText(field);
+          ComboItems.setItemsKeepingText(wFilenameField, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/valuemapper/src/main/java/org/apache/hop/pipeline/transforms/valuemapper/ValueMapperDialog.java
 
b/plugins/transforms/valuemapper/src/main/java/org/apache/hop/pipeline/transforms/valuemapper/ValueMapperDialog.java
index 447c4e764f..4d2c44cd2a 100644
--- 
a/plugins/transforms/valuemapper/src/main/java/org/apache/hop/pipeline/transforms/valuemapper/ValueMapperDialog.java
+++ 
b/plugins/transforms/valuemapper/src/main/java/org/apache/hop/pipeline/transforms/valuemapper/ValueMapperDialog.java
@@ -29,6 +29,7 @@ import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.NamingSchemeTypes;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -252,15 +253,9 @@ public class ValueMapperDialog extends BaseTransformDialog 
{
     if (!gotPreviousFields) {
       gotPreviousFields = true;
       try {
-        String fieldname = wFieldName.getText();
-
-        wFieldName.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wFieldName.setItems(r.getFieldNames());
-          if (fieldname != null) {
-            wFieldName.setText(fieldname);
-          }
+          ComboItems.setItemsKeepingText(wFieldName, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/webserviceavailable/src/main/java/org/apache/hop/pipeline/transforms/webserviceavailable/WebServiceAvailableDialog.java
 
b/plugins/transforms/webserviceavailable/src/main/java/org/apache/hop/pipeline/transforms/webserviceavailable/WebServiceAvailableDialog.java
index 9927603a23..d1750fddb4 100644
--- 
a/plugins/transforms/webserviceavailable/src/main/java/org/apache/hop/pipeline/transforms/webserviceavailable/WebServiceAvailableDialog.java
+++ 
b/plugins/transforms/webserviceavailable/src/main/java/org/apache/hop/pipeline/transforms/webserviceavailable/WebServiceAvailableDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
 import org.eclipse.swt.SWT;
@@ -256,14 +257,9 @@ public class WebServiceAvailableDialog extends 
BaseTransformDialog {
   private void get() {
     if (!gotPreviousFields) {
       try {
-        String filefield = wURL.getText();
-        wURL.removeAll();
         IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
         if (r != null) {
-          wURL.setItems(r.getFieldNames());
-        }
-        if (filefield != null) {
-          wURL.setText(filefield);
+          ComboItems.setItemsKeepingText(wURL, r.getFieldNames());
         }
       } catch (HopException ke) {
         new ErrorDialog(
diff --git 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
index 51a38ea01d..86eb85c49d 100644
--- 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
+++ 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlDataDialog.java
@@ -1287,9 +1287,8 @@ public class GetXmlDataDialog extends BaseTransformDialog 
{
   private void setXMLStreamField() {
     try {
 
-      wXMLField.removeAll();
-
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
+      wXMLField.removeAll();
       if (r != null) {
         String[] fieldNames = r.getFieldNames();
         if (fieldNames != null) {
@@ -1303,9 +1302,6 @@ public class GetXmlDataDialog extends BaseTransformDialog 
{
       if (!Const.isOSX()) {
         shell.setFocus();
       }
-      final String EMPTY_FIELDS = "<EMPTY>";
-      wXMLField.add(EMPTY_FIELDS);
-      wXMLField.setText(EMPTY_FIELDS);
       new ErrorDialog(
           shell,
           BaseMessages.getString(PKG, 
CONST_GET_XMLDATA_DIALOG_FAILED_TO_GET_FIELDS_DIALOG_TITLE),
diff --git 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
index c8ed7f678e..86ae579a9f 100644
--- 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
+++ 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xmlinputstream/XmlInputStreamDialog.java
@@ -34,6 +34,7 @@ import org.apache.hop.ui.core.dialog.EnterNumberDialog;
 import org.apache.hop.ui.core.dialog.EnterTextDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.dialog.PreviewRowsDialog;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.TextVar;
 import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -953,15 +954,9 @@ public class XmlInputStreamDialog extends 
BaseTransformDialog {
 
   private void setSourceStreamField() {
     try {
-      String value = cbSourceField.getText();
-      cbSourceField.removeAll();
-
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
       if (r != null) {
-        cbSourceField.setItems(r.getFieldNames());
-      }
-      if (value != null) {
-        cbSourceField.setText(value);
+        ComboItems.setItemsKeepingText(cbSourceField, r.getFieldNames());
       }
     } catch (HopException ke) {
       new ErrorDialog(
diff --git 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltDialog.java
 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltDialog.java
index cefd904d5d..f6b11820b3 100644
--- 
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltDialog.java
+++ 
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltDialog.java
@@ -26,7 +26,6 @@ import org.apache.hop.core.Const;
 import org.apache.hop.core.Props;
 import org.apache.hop.core.exception.HopException;
 import org.apache.hop.core.row.IRowMeta;
-import org.apache.hop.core.util.Utils;
 import org.apache.hop.core.variables.IVariables;
 import org.apache.hop.i18n.BaseMessages;
 import org.apache.hop.pipeline.PipelineMeta;
@@ -36,6 +35,7 @@ import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.core.widget.ColumnInfo;
+import org.apache.hop.ui.core.widget.ComboItems;
 import org.apache.hop.ui.core.widget.LabelTextVar;
 import org.apache.hop.ui.core.widget.TableView;
 import org.apache.hop.ui.core.widget.TextVar;
@@ -583,14 +583,9 @@ public class XsltDialog extends BaseTransformDialog {
       return;
     }
     try {
-      String initValue = cc.getText();
-      cc.removeAll();
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
       if (r != null) {
-        cc.setItems(r.getFieldNames());
-      }
-      if (!Utils.isEmpty(initValue)) {
-        cc.setText(initValue);
+        ComboItems.setItemsKeepingText(cc, r.getFieldNames());
       }
     } catch (HopException ke) {
       new ErrorDialog(
diff --git 
a/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputDialog.java
 
b/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputDialog.java
index 63fbfa391e..159549a91f 100644
--- 
a/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputDialog.java
+++ 
b/plugins/transforms/yamlinput/src/main/java/org/apache/hop/pipeline/transforms/yamlinput/YamlInputDialog.java
@@ -916,9 +916,9 @@ public class YamlInputDialog extends BaseTransformDialog {
 
   private void setXMLStreamField() {
     try {
-      wYAMLLField.removeAll();
 
       IRowMeta r = pipelineMeta.getPrevTransformFields(variables, 
transformName);
+      wYAMLLField.removeAll();
       if (r != null) {
         r.getFieldNames();
 
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/ComboItems.java 
b/ui/src/main/java/org/apache/hop/ui/core/widget/ComboItems.java
new file mode 100644
index 0000000000..798b08c3b1
--- /dev/null
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/ComboItems.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hop.ui.core.widget;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import org.eclipse.swt.custom.CCombo;
+
+/**
+ * Replaces the items of a combo and writes the previous text back.
+ *
+ * <p>{@code CCombo.setItems} clears the text only when the combo is not 
editable. {@code
+ * removeAll()} always clears it, including on an editable combo. Call this 
after a field lookup
+ * instead of calling {@code removeAll()} first, so a failed lookup can leave 
the configured name in
+ * place.
+ *
+ * <p>On an editable combo the previous text is kept, including a name that is 
not in the new list.
+ * On a read-only combo {@code setText} only selects a name that is in the new 
list.
+ */
+public final class ComboItems {
+
+  private ComboItems() {}
+
+  public static void setItemsKeepingText(CCombo combo, String[] items) {
+    apply(combo::getText, combo::setItems, combo::setText, items);
+  }
+
+  /**
+   * @param items the replacement list. {@code CCombo.setItems} rejects {@code 
null}.
+   */
+  static void apply(
+      Supplier<String> currentText,
+      Consumer<String[]> replaceItems,
+      Consumer<String> restoreText,
+      String[] items) {
+    String text = currentText.get();
+    replaceItems.accept(items);
+    // setText(null) is an SWT error. A null previous value is left as 
setItems left it.
+    if (text != null) {
+      restoreText.accept(text);
+    }
+  }
+}
diff --git a/ui/src/test/java/org/apache/hop/ui/core/widget/ComboItemsTest.java 
b/ui/src/test/java/org/apache/hop/ui/core/widget/ComboItemsTest.java
new file mode 100644
index 0000000000..babfdafb30
--- /dev/null
+++ b/ui/src/test/java/org/apache/hop/ui/core/widget/ComboItemsTest.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hop.ui.core.widget;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Test;
+
+class ComboItemsTest {
+
+  @Test
+  void editableSetItemsDoesNotClearTheText() {
+    FakeCombo combo = new FakeCombo(true);
+    combo.text = "id_json";
+
+    combo.setItems(new String[] {"other"});
+
+    assertEquals("id_json", combo.text);
+  }
+
+  @Test
+  void readOnlySetItemsClearsTheText() {
+    FakeCombo combo = new FakeCombo(false);
+    combo.text = "id_json";
+
+    combo.setItems(new String[] {"other"});
+
+    assertEquals("", combo.text);
+  }
+
+  @Test
+  void editableComboKeepsANameThatIsNotInTheNewList() {
+    FakeCombo combo = new FakeCombo(true);
+    combo.text = "id_json";
+    combo.items = new String[] {"old"};
+
+    ComboItems.apply(combo::getText, combo::setItems, combo::setText, new 
String[] {"other"});
+
+    assertArrayEquals(new String[] {"other"}, combo.items);
+    assertEquals("id_json", combo.text);
+  }
+
+  @Test
+  void readOnlyComboWritesBackANameThatIsInTheNewList() {
+    FakeCombo combo = new FakeCombo(false);
+    combo.text = "id_json";
+    combo.items = new String[] {"old"};
+
+    ComboItems.apply(
+        combo::getText, combo::setItems, combo::setText, new String[] 
{"other", "id_json"});
+
+    assertArrayEquals(new String[] {"other", "id_json"}, combo.items);
+    assertEquals("id_json", combo.text);
+  }
+
+  @Test
+  void readOnlyComboDoesNotRestoreANameMissingFromTheNewList() {
+    FakeCombo combo = new FakeCombo(false);
+    combo.text = "id_json";
+    combo.items = new String[] {"old"};
+
+    ComboItems.apply(combo::getText, combo::setItems, combo::setText, new 
String[] {"other"});
+
+    assertArrayEquals(new String[] {"other"}, combo.items);
+    assertEquals("", combo.text);
+  }
+
+  @Test
+  void nullTextIsNotWrittenBack() {
+    FakeCombo combo = new FakeCombo(false);
+    combo.text = null;
+    combo.items = new String[] {"old"};
+    boolean[] wrote = {false};
+
+    ComboItems.apply(
+        combo::getText,
+        combo::setItems,
+        value -> {
+          wrote[0] = true;
+          combo.setText(value);
+        },
+        new String[] {"other"});
+
+    assertFalse(wrote[0]);
+    assertArrayEquals(new String[] {"other"}, combo.items);
+    assertEquals("", combo.text);
+  }
+
+  /**
+   * Models {@code CCombo}. {@code setItems} clears the text only when the 
combo is not editable.
+   * {@code setText} on a read-only combo changes the text only when the value 
is one of the items.
+   * {@code removeAll()} is the call that always clears the text. This fake 
does not implement it.
+   */
+  private static final class FakeCombo {
+    private final boolean editable;
+    private String text;
+    private String[] items = new String[0];
+
+    private FakeCombo(boolean editable) {
+      this.editable = editable;
+    }
+
+    private String getText() {
+      return text;
+    }
+
+    private void setItems(String[] items) {
+      if (items == null) {
+        throw new IllegalArgumentException("items");
+      }
+      this.items = items.clone();
+      if (!editable) {
+        this.text = "";
+      }
+    }
+
+    private void setText(String text) {
+      if (text == null) {
+        throw new IllegalArgumentException("text");
+      }
+      if (!editable && indexOf(text) < 0) {
+        return;
+      }
+      this.text = text;
+    }
+
+    private int indexOf(String value) {
+      for (int i = 0; i < items.length; i++) {
+        if (value.equals(items[i])) {
+          return i;
+        }
+      }
+      return -1;
+    }
+  }
+}

Reply via email to