You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by na...@apache.org on 2023/06/26 19:08:33 UTC
[hop] 01/01: Add sequence dialog not properly formatted #3029
This is an automated email from the ASF dual-hosted git repository.
nadment pushed a commit to branch 3029
in repository https://gitbox.apache.org/repos/asf/hop.git
commit 122566babe3165f5087d4f390aefd9776e14a03a
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Mon Jun 26 21:03:32 2023 +0200
Add sequence dialog not properly formatted #3029
---
.../transforms/addsequence/AddSequenceDialog.java | 50 ++++++----------------
1 file changed, 13 insertions(+), 37 deletions(-)
diff --git a/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceDialog.java b/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceDialog.java
index 5b1d6146f2..53f8290171 100644
--- a/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceDialog.java
+++ b/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceDialog.java
@@ -107,7 +107,7 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
shell.setText(BaseMessages.getString(PKG, "AddSequenceDialog.Shell.Title"));
int middle = props.getMiddlePct();
- int margin = props.getMargin();
+ int margin = PropsUi.getMargin();
// TransformName line
wlTransformName = new Label(shell, SWT.RIGHT);
@@ -170,8 +170,7 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
wlUseDatabase.setLayoutData(fdlUseDatabase);
wUseDatabase = new Button(gDatabase, SWT.CHECK);
PropsUi.setLook(wUseDatabase);
- wUseDatabase.setToolTipText(
- BaseMessages.getString(PKG, "AddSequenceDialog.UseDatabase.Tooltip"));
+ wUseDatabase.setToolTipText(BaseMessages.getString(PKG, "AddSequenceDialog.UseDatabase.Tooltip"));
FormData fdUseDatabase = new FormData();
fdUseDatabase.left = new FormAttachment(middle, 0);
fdUseDatabase.top = new FormAttachment(wlUseDatabase, 0, SWT.CENTER);
@@ -186,7 +185,7 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
}
});
// Connection line
- wConnection = addConnectionLine(shell, wTransformName, input.getConnection(), lsMod);
+ wConnection = addConnectionLine(gDatabase, wUseDatabase, input.getConnection(), lsMod);
wConnection.addModifyListener(e -> activeSequence());
// Schema line...
@@ -206,7 +205,8 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
fdbSchema.top = new FormAttachment(wConnection, 2 * margin);
fdbSchema.right = new FormAttachment(100, 0);
wbSchema.setLayoutData(fdbSchema);
-
+ wbSchema.addListener(SWT.Selection, e -> getSchemaNames());
+
wSchema = new TextVar(variables, gDatabase, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
PropsUi.setLook(wSchema);
wSchema.addModifyListener(lsMod);
@@ -230,10 +230,11 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
PropsUi.setLook(wbSequence);
wbSequence.setText(BaseMessages.getString(PKG, "AddSequenceDialog.GetSequences.Label"));
FormData fdbSequence = new FormData();
- fdbSequence.right = new FormAttachment(100, -margin);
+ fdbSequence.right = new FormAttachment(100, 0);
fdbSequence.top = new FormAttachment(wbSchema, margin);
wbSequence.setLayoutData(fdbSequence);
-
+ wbSequence.addListener(SWT.Selection, e -> getSequences());
+
wSeqname = new TextVar(variables, gDatabase, SWT.SINGLE | SWT.LEFT | SWT.BORDER);
wSeqname.setText("");
PropsUi.setLook(wSeqname);
@@ -357,20 +358,7 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
fdMaxVal.top = new FormAttachment(wIncrBy, margin);
fdMaxVal.right = new FormAttachment(100, 0);
wMaxVal.setLayoutData(fdMaxVal);
- wbSequence.addSelectionListener(
- new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- getSequences();
- }
- });
- wbSchema.addSelectionListener(
- new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- getSchemaNames();
- }
- });
+
// THE BUTTONS
wOk = new Button(shell, SWT.PUSH);
wOk.setText(BaseMessages.getString(PKG, "System.Button.OK"));
@@ -492,9 +480,8 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
private void getSequences() {
DatabaseMeta databaseMeta = pipelineMeta.findDatabase(wConnection.getText(), variables);
- if (databaseMeta != null) {
- Database database = new Database(loggingObject, variables, databaseMeta);
- try {
+ if (databaseMeta != null) {
+ try (Database database = new Database(loggingObject, variables, databaseMeta)) {
database.connect();
String[] sequences = database.getSequences();
@@ -525,11 +512,6 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
BaseMessages.getString(PKG, "System.Dialog.Error.Title"),
BaseMessages.getString(PKG, "AddSequenceDialog.ErrorGettingSequences"),
e);
- } finally {
- if (database != null) {
- database.disconnect();
- database = null;
- }
}
}
}
@@ -540,8 +522,7 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
}
DatabaseMeta databaseMeta = pipelineMeta.findDatabase(wConnection.getText(), variables);
if (databaseMeta != null) {
- Database database = new Database(loggingObject, variables, databaseMeta);
- try {
+ try (Database database = new Database(loggingObject, variables, databaseMeta)) {
database.connect();
String[] schemas = database.getSchemas();
@@ -570,12 +551,7 @@ public class AddSequenceDialog extends BaseTransformDialog implements ITransform
shell,
BaseMessages.getString(PKG, "System.Dialog.Error.Title"),
BaseMessages.getString(PKG, "AddSequenceDialog.ErrorGettingSchemas"),
- e);
- } finally {
- if (database != null) {
- database.disconnect();
- database = null;
- }
+ e);
}
}
}