You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2023/06/26 16:51:46 UTC
[hop] branch master updated: Question popup get fields not showing #3020
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 08d938baaf Question popup get fields not showing #3020
new a109799fcc Merge pull request #3022 from nadment/3020
08d938baaf is described below
commit 08d938baaf3da44c0e1d6f3d2aa6e77b8cc080a3
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Wed Jun 21 21:07:01 2023 +0200
Question popup get fields not showing #3020
---
.../main/java/org/apache/hop/ui/core/dialog/DialogBoxWithButtons.java | 3 ++-
.../java/org/apache/hop/ui/pipeline/transform/BaseTransformDialog.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/DialogBoxWithButtons.java b/ui/src/main/java/org/apache/hop/ui/core/dialog/DialogBoxWithButtons.java
index 3cc0f6b17f..c9366f6020 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/DialogBoxWithButtons.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/DialogBoxWithButtons.java
@@ -66,7 +66,8 @@ public class DialogBoxWithButtons {
formLayout.marginBottom = formMargin;
formLayout.marginRight = formMargin;
shell.setLayout(formLayout);
-
+ PropsUi.setLook(shell);
+
Label wLabel = new Label(shell, SWT.CENTER | SWT.WRAP);
PropsUi.setLook(wLabel);
wLabel.setText(Const.NVL(message, ""));
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/transform/BaseTransformDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/transform/BaseTransformDialog.java
index 316d619cb7..c44c0d62fb 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/transform/BaseTransformDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/transform/BaseTransformDialog.java
@@ -930,7 +930,7 @@ public class BaseTransformDialog extends Dialog {
int choice = 0;
- if (keys.isEmpty()) {
+ if ( !keys.isEmpty()) {
// Ask what we should do with the existing data in the transform.
//
DialogBoxWithButtons getFieldsChoiceDialog =