fix #3852 - Last improvements to transform's GUI

apache · Apr 24, 2024 · 6d9413b · 6d9413b
1 parent b02cb9d
commit 6d9413b
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/...java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java b/...java/org/apache/hop/pipeline/transforms/redshift/bulkloader/RedshiftBulkLoaderDialog.java
@@ -198,7 +198,6 @@ public void focusLost(FocusEvent arg0) {
  wConnection.select(0);
  }
  wConnection.addModifyListener(lsMod);
- wConnection.addModifyListener(event -> toggleSpecifyFieldsFlags());
 
  Control lastControl = wConnection;
 
@@ -302,6 +301,9 @@ public void focusLost(FocusEvent arg0) {
  setTableFieldCombo();
  input.setChanged(backupChanged);
 
+ toggleSpecifyFieldsFlags();
+ toggleKeysSelection();
+
  BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel());
  return transformName;
  }
@@ -486,14 +488,6 @@ public void widgetSelected(SelectionEvent e) {
  fdlCopyFromFile.right = new FormAttachment(middle, -margin);
  wlCopyFromFile.setLayoutData(fdlCopyFromFile);
 
- Button wbCopyFromFile = new Button(wGeneralComp, SWT.PUSH | SWT.CENTER);
- PropsUi.setLook(wbCopyFromFile);
- wbCopyFromFile.setText(BaseMessages.getString("System.Button.Browse"));
- FormData fdbCopyFromFile = new FormData();
- fdbCopyFromFile.top = new FormAttachment(lastControl, margin);
- fdbCopyFromFile.right = new FormAttachment(100, 0);
- wbCopyFromFile.setLayoutData(fdbCopyFromFile);
-
  wCopyFromFilename = new TextVar(variables, wGeneralComp, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
  PropsUi.setLook(wCopyFromFilename);
  wCopyFromFilename.addModifyListener(lsMod);
@@ -503,7 +497,7 @@ public void widgetSelected(SelectionEvent e) {
  FormData fdCopyFromFile = new FormData();
  fdCopyFromFile.top = new FormAttachment(lastControl, margin);
  fdCopyFromFile.left = new FormAttachment(middle, 0);
- fdCopyFromFile.right = new FormAttachment(wbCopyFromFile, -margin);
+ fdCopyFromFile.right = new FormAttachment(100, -margin);
  wCopyFromFilename.setLayoutData(fdCopyFromFile);
 
  FormData fdGeneralComp = new FormData();
@@ -609,7 +603,7 @@ public void widgetSelected(SelectionEvent e) {
  fdlSecretAccessKey.left = new FormAttachment(0, 0);
  fdlSecretAccessKey.right = new FormAttachment(middle, -margin);
  wlSecretAccessKey.setLayoutData(fdlSecretAccessKey);
- wSecretAccessKey = new TextVar(variables, wAwsAuthComp, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
+ wSecretAccessKey = new TextVar(variables, wAwsAuthComp, SWT.SINGLE | SWT.LEFT | SWT.BORDER | SWT.PASSWORD);
  PropsUi.setLook(wSecretAccessKey);
  FormData fdSecretAccessKey = new FormData();
  fdSecretAccessKey.top = new FormAttachment(lastControl, margin);
@@ -619,7 +613,6 @@ public void widgetSelected(SelectionEvent e) {
  wSecretAccessKey.addModifyListener(lsMod);
 
  lastControl = wSecretAccessKey;
- toggleKeysSelection();
 
  wlAwsIamRole = new Label(wAwsAuthComp, SWT.RIGHT);
  wlAwsIamRole.setText(BaseMessages.getString(PKG, "RedshiftBulkLoaderDialog.IamRole.Label"));
@@ -1053,8 +1046,6 @@ public void getData() {
  }
  }
 
- toggleSpecifyFieldsFlags();
-
  wTransformName.selectAll();
  }