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 2022/08/21 13:08:53 UTC
[hop] branch master updated: HOP-4105 bring to front action/transform dialog if already opened - add setActive() method to ITtrandformDialog/IActionDialog - move shell reference variable to ActionDialog - move dispose method to ActionDialog
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 f99d447d4d HOP-4105 bring to front action/transform dialog if already opened - add setActive() method to ITtrandformDialog/IActionDialog - move shell reference variable to ActionDialog - move dispose method to ActionDialog
new 3a2a236ce5 Merge pull request #1645 from nadment/HOP-4105
f99d447d4d is described below
commit f99d447d4d700d37b242b5b275ca0121e1186799
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Wed Aug 17 23:37:23 2022 +0200
HOP-4105 bring to front action/transform dialog if already opened
- add setActive() method to ITtrandformDialog/IActionDialog
- move shell reference variable to ActionDialog
- move dispose method to ActionDialog
---
.../hop/pipeline/transform/ITransformDialog.java | 5 +++++
.../apache/hop/workflow/action/IActionDialog.java | 5 +++++
.../workflow/actions/abort/ActionAbortDialog.java | 9 ---------
.../ActionAddResultFilenamesDialog.java | 8 --------
.../as400command/ActionAs400CommandDialog.java | 9 ---------
.../ActionCheckDbConnectionsDialog.java | 9 ---------
.../ActionCheckFilesLockedDialog.java | 8 --------
.../columnsexist/ActionColumnsExistDialog.java | 9 ---------
.../actions/copyfiles/ActionCopyFilesDialog.java | 8 --------
.../ActionCopyMoveResultFilenamesDialog.java | 8 --------
.../actions/createfile/ActionCreateFileDialog.java | 8 --------
.../createfolder/ActionCreateFolderDialog.java | 8 --------
.../workflow/actions/delay/ActionDelayDialog.java | 8 --------
.../actions/deletefile/ActionDeleteFileDialog.java | 8 --------
.../deletefiles/ActionDeleteFilesDialog.java | 9 ---------
.../deletefolders/ActionDeleteFoldersDialog.java | 9 ---------
.../ActionDeleteResultFilenamesDialog.java | 8 --------
.../actions/dostounix/ActionDosToUnixDialog.java | 8 --------
.../workflow/actions/eval/ActionEvalDialog.java | 9 ---------
.../ActionEvalFilesMetricsDialog.java | 8 --------
.../ActionEvalTableContentDialog.java | 9 ---------
.../filecompare/ActionFileCompareDialog.java | 8 --------
.../actions/fileexists/ActionFileExistsDialog.java | 9 ---------
.../actions/filesexist/ActionFilesExistDialog.java | 9 ---------
.../folderisempty/ActionFolderIsEmptyDialog.java | 8 --------
.../folderscompare/ActionFoldersCompareDialog.java | 8 --------
.../hop/workflow/actions/ftp/ActionFtpDialog.java | 7 +------
.../actions/ftpdelete/ActionFtpDeleteDialog.java | 7 +------
.../actions/ftpput/ActionFtpPutDialog.java | 7 +------
.../workflow/actions/sftp/ActionSftpDialog.java | 7 +------
.../actions/sftpput/ActionSftpPutDialog.java | 6 +-----
.../actions/getpop/ActionGetPOPDialog.java | 7 +------
.../workflow/actions/http/ActionHttpDialog.java | 9 ---------
.../workflow/actions/mail/ActionMailDialog.java | 9 ---------
.../actions/movefiles/ActionMoveFilesDialog.java | 17 ++++++++--------
.../actions/msgboxinfo/ActionMsgBoxInfoDialog.java | 9 ---------
.../mssqlbulkload/ActionMssqlBulkLoadDialog.java | 9 +--------
.../mysqlbulkfile/ActionMysqlBulkFileDialog.java | 9 ---------
.../mysqlbulkload/ActionMysqlBulkLoadDialog.java | 9 +--------
.../ActionPGPDecryptFilesDialog.java | 8 --------
.../ActionPGPEncryptFilesDialog.java | 8 --------
.../actions/pgpverify/ActionPGPVerifyDialog.java | 9 ---------
.../workflow/actions/ping/ActionPingDialog.java | 9 ---------
.../actions/pipeline/ActionPipelineDialog.java | 6 ------
.../workflow/actions/repeat/EndRepeatDialog.java | 7 -------
.../hop/workflow/actions/repeat/RepeatDialog.java | 7 -------
.../ActionSendNagiosPassiveCheckDialog.java | 9 ---------
.../setvariables/ActionSetVariablesDialog.java | 8 --------
.../workflow/actions/shell/ActionShellDialog.java | 9 ---------
.../actions/simpleeval/ActionSimpleEvalDialog.java | 8 --------
.../actions/snmptrap/ActionSNMPTrapDialog.java | 9 ---------
.../hop/workflow/actions/sql/ActionSqlDialog.java | 9 ---------
.../actions/success/ActionSuccessDialog.java | 9 ---------
.../tableexists/ActionTableExistsDialog.java | 9 ---------
.../actions/telnet/ActionTelnetDialog.java | 9 ---------
.../truncatetables/ActionTruncateTablesDialog.java | 8 --------
.../workflow/actions/unzip/ActionUnZipDialog.java | 8 --------
.../waitforfile/ActionWaitForFileDialog.java | 8 --------
.../actions/waitforsql/ActionWaitForSqlDialog.java | 9 ---------
.../ActionWebServiceAvailableDialog.java | 9 ---------
.../actions/workflow/ActionWorkflowDialog.java | 6 ------
.../writetofile/ActionWriteToFileDialog.java | 8 --------
.../actions/writetolog/ActionWriteToLogDialog.java | 9 ---------
.../xml/dtdvalidator/DtdValidatorDialog.java | 8 --------
.../xml/xmlwellformed/XmlWellFormedDialog.java | 7 -------
.../xml/xsdvalidator/XsdValidatorDialog.java | 7 -------
.../hop/workflow/actions/xml/xslt/XsltDialog.java | 7 -------
.../actions/zipfile/ActionZipFileDialog.java | 9 ---------
.../actions/runtests/RunPipelineTestsDialog.java | 7 -------
.../actions/check/CheckConnectionsDialog.java | 7 -------
.../actions/constraint/Neo4jConstraintDialog.java | 7 -------
.../actions/cypherscript/CypherScriptDialog.java | 7 -------
.../hop/neo4j/actions/index/Neo4jIndexDialog.java | 7 -------
.../transforms/metainject/MetaInjectDialog.java | 22 +++++----------------
.../rowgenerator/RowGeneratorDialog.java | 6 +++---
.../delegates/HopGuiPipelineTransformDelegate.java | 21 +++++++++++++++++---
.../delegates/HopGuiWorkflowActionDelegate.java | 23 +++++++++++++++++-----
.../ui/pipeline/transform/BaseTransformDialog.java | 6 ++++++
.../hop/ui/workflow/action/ActionDialog.java | 17 +++++++++++++++-
.../hop/ui/workflow/actions/ActionBaseDialog.java | 6 ++----
.../workflow/actions/dummy/ActionDummyDialog.java | 9 ---------
.../actions/missing/MissingActionDialog.java | 1 -
.../workflow/actions/start/ActionStartDialog.java | 8 --------
83 files changed, 94 insertions(+), 620 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformDialog.java b/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformDialog.java
index 76ea76bb5c..6cd6312fea 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformDialog.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformDialog.java
@@ -32,6 +32,11 @@ public interface ITransformDialog {
*/
String open();
+ /**
+ * Brings the dialog to the front if the dialog is already open.
+ */
+ void setActive();
+
/**
* void populateComposite( Composite parent);
*
diff --git a/engine/src/main/java/org/apache/hop/workflow/action/IActionDialog.java b/engine/src/main/java/org/apache/hop/workflow/action/IActionDialog.java
index 58232f435c..fc5d67d597 100644
--- a/engine/src/main/java/org/apache/hop/workflow/action/IActionDialog.java
+++ b/engine/src/main/java/org/apache/hop/workflow/action/IActionDialog.java
@@ -59,6 +59,11 @@ public interface IActionDialog {
*/
IAction open();
+ /**
+ * Brings the dialog to the front if the dialog is already open.
+ */
+ void setActive();
+
/**
* The Metadata provider to pass
*
diff --git a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
index cda3e4aefe..4ed9723cdb 100644
--- a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
+++ b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -42,8 +41,6 @@ import org.eclipse.swt.widgets.*;
public class ActionAbortDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = ActionAbortDialog.class; // For Translator
- private Shell shell;
-
private ActionAbort action;
private boolean changed;
@@ -155,12 +152,6 @@ public class ActionAbortDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/addresultfilenames/src/main/java/org/apache/hop/workflow/actions/addresultfilenames/ActionAddResultFilenamesDialog.java b/plugins/actions/addresultfilenames/src/main/java/org/apache/hop/workflow/actions/addresultfilenames/ActionAddResultFilenamesDialog.java
index b4b2dea7fc..6c33cd9517 100644
--- a/plugins/actions/addresultfilenames/src/main/java/org/apache/hop/workflow/actions/addresultfilenames/ActionAddResultFilenamesDialog.java
+++ b/plugins/actions/addresultfilenames/src/main/java/org/apache/hop/workflow/actions/addresultfilenames/ActionAddResultFilenamesDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -61,7 +60,6 @@ public class ActionAddResultFilenamesDialog extends ActionDialog implements IAct
private Button wDeleteAllBefore;
private ActionAddResultFilenames action;
- private Shell shell;
private boolean changed;
@@ -463,12 +461,6 @@ public class ActionAddResultFilenamesDialog extends ActionDialog implements IAct
wbDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/as400command/src/main/java/org/apache/hop/workflow/actions/as400command/ActionAs400CommandDialog.java b/plugins/actions/as400command/src/main/java/org/apache/hop/workflow/actions/as400command/ActionAs400CommandDialog.java
index bd6f2af751..d971e49e31 100644
--- a/plugins/actions/as400command/src/main/java/org/apache/hop/workflow/actions/as400command/ActionAs400CommandDialog.java
+++ b/plugins/actions/as400command/src/main/java/org/apache/hop/workflow/actions/as400command/ActionAs400CommandDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.FormDataBuilder;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -44,8 +43,6 @@ import org.eclipse.swt.widgets.*;
public class ActionAs400CommandDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = ActionAs400CommandDialog.class; // For Translator
- private Shell shell;
-
private ActionAs400Command action;
private boolean changed;
@@ -245,12 +242,6 @@ public class ActionAs400CommandDialog extends ActionDialog implements IActionDia
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/checkdbconnection/src/main/java/org/apache/hop/workflow/actions/checkdbconnection/ActionCheckDbConnectionsDialog.java b/plugins/actions/checkdbconnection/src/main/java/org/apache/hop/workflow/actions/checkdbconnection/ActionCheckDbConnectionsDialog.java
index 5dd6d17689..527c866845 100644
--- a/plugins/actions/checkdbconnection/src/main/java/org/apache/hop/workflow/actions/checkdbconnection/ActionCheckDbConnectionsDialog.java
+++ b/plugins/actions/checkdbconnection/src/main/java/org/apache/hop/workflow/actions/checkdbconnection/ActionCheckDbConnectionsDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -46,8 +45,6 @@ import java.util.List;
public class ActionCheckDbConnectionsDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = ActionCheckDbConnectionsDialog.class; // For Translator
- private Shell shell;
-
private Text wName;
private ActionCheckDbConnections action;
@@ -225,12 +222,6 @@ public class ActionCheckDbConnectionsDialog extends ActionDialog implements IAct
wFields.optWidth(true);
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/checkfilelocked/src/main/java/org/apache/hop/workflow/actions/checkfilelocked/ActionCheckFilesLockedDialog.java b/plugins/actions/checkfilelocked/src/main/java/org/apache/hop/workflow/actions/checkfilelocked/ActionCheckFilesLockedDialog.java
index 0600a35f14..6c880aef64 100644
--- a/plugins/actions/checkfilelocked/src/main/java/org/apache/hop/workflow/actions/checkfilelocked/ActionCheckFilesLockedDialog.java
+++ b/plugins/actions/checkfilelocked/src/main/java/org/apache/hop/workflow/actions/checkfilelocked/ActionCheckFilesLockedDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -58,7 +57,6 @@ public class ActionCheckFilesLockedDialog extends ActionDialog implements IActio
private Button wIncludeSubfolders;
private ActionCheckFilesLocked action;
- private Shell shell;
private boolean changed;
@@ -434,12 +432,6 @@ public class ActionCheckFilesLockedDialog extends ActionDialog implements IActio
wbDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/columnsexist/src/main/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistDialog.java b/plugins/actions/columnsexist/src/main/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistDialog.java
index eb399857fc..cee3876591 100644
--- a/plugins/actions/columnsexist/src/main/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistDialog.java
+++ b/plugins/actions/columnsexist/src/main/java/org/apache/hop/workflow/actions/columnsexist/ActionColumnsExistDialog.java
@@ -29,7 +29,6 @@ import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
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.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.TableView;
@@ -65,8 +64,6 @@ public class ActionColumnsExistDialog extends ActionDialog implements IActionDia
private ActionColumnsExist action;
- private Shell shell;
-
private boolean changed;
private TableView wFields;
@@ -292,12 +289,6 @@ public class ActionColumnsExistDialog extends ActionDialog implements IActionDia
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void getTableName() {
String databaseName = wConnection.getText();
if (StringUtils.isNotEmpty(databaseName)) {
diff --git a/plugins/actions/copyfiles/src/main/java/org/apache/hop/workflow/actions/copyfiles/ActionCopyFilesDialog.java b/plugins/actions/copyfiles/src/main/java/org/apache/hop/workflow/actions/copyfiles/ActionCopyFilesDialog.java
index 1584257c2b..c983f0fd90 100644
--- a/plugins/actions/copyfiles/src/main/java/org/apache/hop/workflow/actions/copyfiles/ActionCopyFilesDialog.java
+++ b/plugins/actions/copyfiles/src/main/java/org/apache/hop/workflow/actions/copyfiles/ActionCopyFilesDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
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.ITextVarButtonRenderCallback;
import org.apache.hop.ui.core.widget.TableView;
@@ -70,7 +69,6 @@ public class ActionCopyFilesDialog extends ActionDialog implements IActionDialog
protected Button wCreateDestinationFolder;
protected ActionCopyFiles action;
- protected Shell shell;
protected boolean changed;
@@ -434,12 +432,6 @@ public class ActionCopyFilesDialog extends ActionDialog implements IActionDialog
deleteToolItem.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java b/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
index fb2aebbda6..aeb6aa0586 100644
--- a/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
+++ b/plugins/actions/copymoveresultfilenames/src/main/java/org/apache/hop/workflow/actions/copymoveresultfilenames/ActionCopyMoveResultFilenamesDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -57,7 +56,6 @@ public class ActionCopyMoveResultFilenamesDialog extends ActionDialog implements
private CCombo wAction;
private ActionCopyMoveResultFilenames action;
- private Shell shell;
private boolean changed;
@@ -680,12 +678,6 @@ public class ActionCopyMoveResultFilenamesDialog extends ActionDialog implements
wNrErrorsLessThan.setEnabled(wSuccessCondition.getSelectionIndex() != 0);
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void CheckLimit() {
wlWildcard.setEnabled(wSpecifyWildcard.getSelection());
wWildcard.setEnabled(wSpecifyWildcard.getSelection());
diff --git a/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java b/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
index 2c287941ef..620bda759d 100644
--- a/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
+++ b/plugins/actions/createfile/src/main/java/org/apache/hop/workflow/actions/createfile/ActionCreateFileDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -55,7 +54,6 @@ public class ActionCreateFileDialog extends ActionDialog implements IActionDialo
private Button wAddFilenameToResult;
private ActionCreateFile action;
- private Shell shell;
private boolean changed;
@@ -206,12 +204,6 @@ public class ActionCreateFileDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java b/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
index f24a5fc19f..69a863b98c 100644
--- a/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
+++ b/plugins/actions/createfolder/src/main/java/org/apache/hop/workflow/actions/createfolder/ActionCreateFolderDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -50,7 +49,6 @@ public class ActionCreateFolderDialog extends ActionDialog implements IActionDia
private Button wAbortExists;
private ActionCreateFolder action;
- private Shell shell;
private boolean changed;
@@ -177,12 +175,6 @@ public class ActionCreateFolderDialog extends ActionDialog implements IActionDia
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java b/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
index c5e23af122..5a096566fb 100644
--- a/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
+++ b/plugins/actions/delay/src/main/java/org/apache/hop/workflow/actions/delay/ActionDelayDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -49,7 +48,6 @@ public class ActionDelayDialog extends ActionDialog implements IActionDialog {
private LabelTextVar wMaximumTimeout;
private ActionDelay action;
- private Shell shell;
private boolean changed;
@@ -152,12 +150,6 @@ public class ActionDelayDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java b/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
index 240dec6eed..29c6e2cf38 100644
--- a/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
+++ b/plugins/actions/deletefile/src/main/java/org/apache/hop/workflow/actions/deletefile/ActionDeleteFileDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -53,7 +52,6 @@ public class ActionDeleteFileDialog extends ActionDialog implements IActionDialo
private Button wAbortExists;
private ActionDeleteFile action;
- private Shell shell;
private boolean changed;
@@ -187,12 +185,6 @@ public class ActionDeleteFileDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/deletefiles/src/main/java/org/apache/hop/workflow/actions/deletefiles/ActionDeleteFilesDialog.java b/plugins/actions/deletefiles/src/main/java/org/apache/hop/workflow/actions/deletefiles/ActionDeleteFilesDialog.java
index 21bf1b722b..a70904c9a6 100644
--- a/plugins/actions/deletefiles/src/main/java/org/apache/hop/workflow/actions/deletefiles/ActionDeleteFilesDialog.java
+++ b/plugins/actions/deletefiles/src/main/java/org/apache/hop/workflow/actions/deletefiles/ActionDeleteFilesDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -49,8 +48,6 @@ public class ActionDeleteFilesDialog extends ActionDialog implements IActionDial
private static final String[] FILETYPES =
new String[] {BaseMessages.getString(PKG, "ActionDeleteFiles.Filetype.All")};
- private Shell shell;
-
private Text wName;
private Label wlFilename;
@@ -432,12 +429,6 @@ public class ActionDeleteFilesDialog extends ActionDialog implements IActionDial
wbDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/deletefolders/src/main/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersDialog.java b/plugins/actions/deletefolders/src/main/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersDialog.java
index 3f283ce46e..e5a5c1986a 100644
--- a/plugins/actions/deletefolders/src/main/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersDialog.java
+++ b/plugins/actions/deletefolders/src/main/java/org/apache/hop/workflow/actions/deletefolders/ActionDeleteFoldersDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -47,8 +46,6 @@ import org.eclipse.swt.widgets.*;
public class ActionDeleteFoldersDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = ActionDeleteFolders.class; // For Translator
- private Shell shell;
-
private Text wName;
private Label wlFilename;
@@ -444,12 +441,6 @@ public class ActionDeleteFoldersDialog extends ActionDialog implements IActionDi
wbDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java b/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
index 53385b9c23..b650fc3e9e 100644
--- a/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
+++ b/plugins/actions/deleteresultfilenames/src/main/java/org/apache/hop/workflow/actions/deleteresultfilenames/ActionDeleteResultFilenamesDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -54,7 +53,6 @@ public class ActionDeleteResultFilenamesDialog extends ActionDialog implements I
private TextVar wWildcardExclude;
private ActionDeleteResultFilenames action;
- private Shell shell;
private boolean changed;
@@ -202,12 +200,6 @@ public class ActionDeleteResultFilenamesDialog extends ActionDialog implements I
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void CheckLimit() {
wlWildcard.setEnabled(wSpecifyWildcard.getSelection());
wWildcard.setEnabled(wSpecifyWildcard.getSelection());
diff --git a/plugins/actions/dostounix/src/main/java/org/apache/hop/workflow/actions/dostounix/ActionDosToUnixDialog.java b/plugins/actions/dostounix/src/main/java/org/apache/hop/workflow/actions/dostounix/ActionDosToUnixDialog.java
index 45c8ec16ac..a08dd33fd6 100644
--- a/plugins/actions/dostounix/src/main/java/org/apache/hop/workflow/actions/dostounix/ActionDosToUnixDialog.java
+++ b/plugins/actions/dostounix/src/main/java/org/apache/hop/workflow/actions/dostounix/ActionDosToUnixDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.PropsUi;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -66,7 +65,6 @@ public class ActionDosToUnixDialog extends ActionDialog implements IActionDialog
private Button wIncludeSubfolders;
private ActionDosToUnix action;
- private Shell shell;
private boolean changed;
@@ -676,12 +674,6 @@ public class ActionDosToUnixDialog extends ActionDialog implements IActionDialog
wbSourceDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/eval/src/main/java/org/apache/hop/workflow/actions/eval/ActionEvalDialog.java b/plugins/actions/eval/src/main/java/org/apache/hop/workflow/actions/eval/ActionEvalDialog.java
index 52b57d06a8..989131ea00 100644
--- a/plugins/actions/eval/src/main/java/org/apache/hop/workflow/actions/eval/ActionEvalDialog.java
+++ b/plugins/actions/eval/src/main/java/org/apache/hop/workflow/actions/eval/ActionEvalDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.StyledTextComp;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -50,8 +49,6 @@ public class ActionEvalDialog extends ActionDialog implements IActionDialog {
private ActionEval action;
- private Shell shell;
-
private boolean changed;
public ActionEvalDialog(
@@ -200,12 +197,6 @@ public class ActionEvalDialog extends ActionDialog implements IActionDialog {
PKG, "ActionEval.Position.Label", "" + lineNumber, "" + columnNumber));
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/evalfilesmetrics/src/main/java/org/apache/hop/workflow/actions/evalfilesmetrics/ActionEvalFilesMetricsDialog.java b/plugins/actions/evalfilesmetrics/src/main/java/org/apache/hop/workflow/actions/evalfilesmetrics/ActionEvalFilesMetricsDialog.java
index dc8a52cc4b..1c4f99a9a6 100644
--- a/plugins/actions/evalfilesmetrics/src/main/java/org/apache/hop/workflow/actions/evalfilesmetrics/ActionEvalFilesMetricsDialog.java
+++ b/plugins/actions/evalfilesmetrics/src/main/java/org/apache/hop/workflow/actions/evalfilesmetrics/ActionEvalFilesMetricsDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -61,7 +60,6 @@ public class ActionEvalFilesMetricsDialog extends ActionDialog implements IActio
private TextVar wSourceFileFolder;
private ActionEvalFilesMetrics action;
- private Shell shell;
private boolean changed;
@@ -826,12 +824,6 @@ public class ActionEvalFilesMetricsDialog extends ActionDialog implements IActio
wScale.setVisible(useSize);
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/evaluatetablecontent/src/main/java/org/apache/hop/workflow/actions/evaluatetablecontent/ActionEvalTableContentDialog.java b/plugins/actions/evaluatetablecontent/src/main/java/org/apache/hop/workflow/actions/evaluatetablecontent/ActionEvalTableContentDialog.java
index d5d1180723..e0c5f4bb88 100644
--- a/plugins/actions/evaluatetablecontent/src/main/java/org/apache/hop/workflow/actions/evaluatetablecontent/ActionEvalTableContentDialog.java
+++ b/plugins/actions/evaluatetablecontent/src/main/java/org/apache/hop/workflow/actions/evaluatetablecontent/ActionEvalTableContentDialog.java
@@ -30,7 +30,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.StyledTextComp;
import org.apache.hop.ui.core.widget.TextVar;
@@ -64,8 +63,6 @@ public class ActionEvalTableContentDialog extends ActionDialog implements IActio
private ActionEvalTableContent action;
- private Shell shell;
-
private boolean changed;
private Label wlUseSubs;
@@ -623,12 +620,6 @@ public class ActionEvalTableContentDialog extends ActionDialog implements IActio
wSchemaname.setEnabled(!wCustomSql.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java b/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
index 36d6f467a0..59c20ecbb8 100644
--- a/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
+++ b/plugins/actions/filecompare/src/main/java/org/apache/hop/workflow/actions/filecompare/ActionFileCompareDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -53,7 +52,6 @@ public class ActionFileCompareDialog extends ActionDialog implements IActionDial
private TextVar wFilename2;
private ActionFileCompare action;
- private Shell shell;
private Button wAddFilenameResult;
private boolean changed;
@@ -221,12 +219,6 @@ public class ActionFileCompareDialog extends ActionDialog implements IActionDial
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java b/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
index 3b8098cf0e..bbb3290d71 100644
--- a/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
+++ b/plugins/actions/fileexists/src/main/java/org/apache/hop/workflow/actions/fileexists/ActionFileExistsDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -59,8 +58,6 @@ public class ActionFileExistsDialog extends ActionDialog implements IActionDialo
private ActionFileExists action;
- private Shell shell;
-
private boolean changed;
public ActionFileExistsDialog(
@@ -165,12 +162,6 @@ public class ActionFileExistsDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/filesexist/src/main/java/org/apache/hop/workflow/actions/filesexist/ActionFilesExistDialog.java b/plugins/actions/filesexist/src/main/java/org/apache/hop/workflow/actions/filesexist/ActionFilesExistDialog.java
index e3e2c045db..eaa82d9839 100644
--- a/plugins/actions/filesexist/src/main/java/org/apache/hop/workflow/actions/filesexist/ActionFilesExistDialog.java
+++ b/plugins/actions/filesexist/src/main/java/org/apache/hop/workflow/actions/filesexist/ActionFilesExistDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -58,8 +57,6 @@ public class ActionFilesExistDialog extends ActionDialog implements IActionDialo
private ActionFilesExist action;
- private Shell shell;
-
private boolean changed;
private TableView wFields;
@@ -298,12 +295,6 @@ public class ActionFilesExistDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java b/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
index 9b98a40152..dc7b6c6a89 100644
--- a/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
+++ b/plugins/actions/folderisempty/src/main/java/org/apache/hop/workflow/actions/folderisempty/ActionFolderIsEmptyDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -55,7 +54,6 @@ public class ActionFolderIsEmptyDialog extends ActionDialog implements IActionDi
private TextVar wWildcard;
private ActionFolderIsEmpty action;
- private Shell shell;
private boolean changed;
@@ -236,12 +234,6 @@ public class ActionFolderIsEmptyDialog extends ActionDialog implements IActionDi
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void checkLimitSearch() {
wlWildcard.setEnabled(wSpecifyWildcard.getSelection());
wWildcard.setEnabled(wSpecifyWildcard.getSelection());
diff --git a/plugins/actions/folderscompare/src/main/java/org/apache/hop/workflow/actions/folderscompare/ActionFoldersCompareDialog.java b/plugins/actions/folderscompare/src/main/java/org/apache/hop/workflow/actions/folderscompare/ActionFoldersCompareDialog.java
index 78aa28ba9a..d689842ad1 100644
--- a/plugins/actions/folderscompare/src/main/java/org/apache/hop/workflow/actions/folderscompare/ActionFoldersCompareDialog.java
+++ b/plugins/actions/folderscompare/src/main/java/org/apache/hop/workflow/actions/folderscompare/ActionFoldersCompareDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -54,7 +53,6 @@ public class ActionFoldersCompareDialog extends ActionDialog implements IActionD
private TextVar wFilename2;
private ActionFoldersCompare action;
- private Shell shell;
private boolean changed;
@@ -408,12 +406,6 @@ public class ActionFoldersCompareDialog extends ActionDialog implements IActionD
wlCompareFileSize.setEnabled(wCompareOnly.getSelectionIndex() != 2);
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
if (action.getName() != null) {
diff --git a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftp/ActionFtpDialog.java b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftp/ActionFtpDialog.java
index 47f4963f8c..071b5d30aa 100644
--- a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftp/ActionFtpDialog.java
+++ b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftp/ActionFtpDialog.java
@@ -25,7 +25,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelText;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.TextVar;
@@ -81,8 +80,6 @@ public class ActionFtpDialog extends ActionDialog implements IActionDialog {
private ActionFtp action;
- private Shell shell;
-
private Combo wControlEncoding;
private boolean changed;
@@ -1327,9 +1324,7 @@ public class ActionFtpDialog extends ActionDialog implements IActionDialog {
public void dispose() {
closeFtpConnection();
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
+ super.dispose();
}
/** Copy information from the meta-data input to the dialog fields. */
diff --git a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpdelete/ActionFtpDeleteDialog.java b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpdelete/ActionFtpDeleteDialog.java
index b55504976a..e47d0d27a7 100644
--- a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpdelete/ActionFtpDeleteDialog.java
+++ b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpdelete/ActionFtpDeleteDialog.java
@@ -25,7 +25,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelText;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.TextVar;
@@ -76,8 +75,6 @@ public class ActionFtpDeleteDialog extends ActionDialog implements IActionDialog
private ActionFtpDelete action;
- private Shell shell;
-
private Combo wProtocol;
private Label wlUsePublicKey;
@@ -1127,9 +1124,7 @@ public class ActionFtpDeleteDialog extends ActionDialog implements IActionDialog
public void dispose() {
closeFtpConnections();
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
+ super.dispose();
}
/** Copy information from the meta-data input to the dialog fields. */
diff --git a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpput/ActionFtpPutDialog.java b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpput/ActionFtpPutDialog.java
index 227e5105d3..9cb87faab8 100644
--- a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpput/ActionFtpPutDialog.java
+++ b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/ftpput/ActionFtpPutDialog.java
@@ -25,7 +25,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.PasswordTextVar;
import org.apache.hop.ui.core.widget.TextVar;
@@ -69,8 +68,6 @@ public class ActionFtpPutDialog extends ActionDialog implements IActionDialog {
private ActionFtpPut action;
- private Shell shell;
-
private boolean changed;
private Button wBinaryMode;
@@ -909,9 +906,7 @@ public class ActionFtpPutDialog extends ActionDialog implements IActionDialog {
public void dispose() {
closeFtpConnection();
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
+ super.dispose();
}
/** Copy information from the meta-data input to the dialog fields. */
diff --git a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftp/ActionSftpDialog.java b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftp/ActionSftpDialog.java
index 612287d6ed..bee760c9e5 100644
--- a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftp/ActionSftpDialog.java
+++ b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftp/ActionSftpDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.PasswordTextVar;
import org.apache.hop.ui.core.widget.TextVar;
@@ -78,8 +77,6 @@ public class ActionSftpDialog extends ActionDialog implements IActionDialog {
private ActionSftp action;
- private Shell shell;
-
private boolean changed;
private Button wAddFilenameToResult;
@@ -870,9 +867,7 @@ public class ActionSftpDialog extends ActionDialog implements IActionDialog {
public void dispose() {
closeFtpConnections();
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
+ super.dispose();
}
/** Copy information from the meta-data input to the dialog fields. */
diff --git a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftpput/ActionSftpPutDialog.java b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftpput/ActionSftpPutDialog.java
index 99f2c3d226..dfeb94ae95 100644
--- a/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftpput/ActionSftpPutDialog.java
+++ b/plugins/actions/ftp/src/main/java/org/apache/hop/workflow/actions/sftpput/ActionSftpPutDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.PasswordTextVar;
import org.apache.hop.ui.core.widget.TextVar;
@@ -76,7 +75,6 @@ public class ActionSftpPutDialog extends ActionDialog implements IActionDialog {
private TextVar wWildcard;
private ActionSftpPut action;
- private Shell shell;
private Button wCreateRemoteFolder;
@@ -1039,9 +1037,7 @@ public class ActionSftpPutDialog extends ActionDialog implements IActionDialog {
public void dispose() {
// Close open connections
closeFtpConnections();
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
+ super.dispose();
}
/** Copy information from the meta-data input to the dialog fields. */
diff --git a/plugins/actions/getpop/src/main/java/org/apache/hop/workflow/actions/getpop/ActionGetPOPDialog.java b/plugins/actions/getpop/src/main/java/org/apache/hop/workflow/actions/getpop/ActionGetPOPDialog.java
index a15512af15..3dd97b9b8e 100644
--- a/plugins/actions/getpop/src/main/java/org/apache/hop/workflow/actions/getpop/ActionGetPOPDialog.java
+++ b/plugins/actions/getpop/src/main/java/org/apache/hop/workflow/actions/getpop/ActionGetPOPDialog.java
@@ -27,7 +27,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
import org.apache.hop.ui.core.gui.GuiResource;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.PasswordTextVar;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -177,8 +176,6 @@ public class ActionGetPOPDialog extends ActionDialog implements IActionDialog {
private ActionGetPOP action;
- private Shell shell;
-
private boolean changed;
private Label wlReadFrom;
@@ -1857,9 +1854,7 @@ public class ActionGetPOPDialog extends ActionDialog implements IActionDialog {
public void dispose() {
closeMailConnection();
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
+ super.dispose();
}
/** Copy information from the meta-data input to the dialog fields. */
diff --git a/plugins/actions/http/src/main/java/org/apache/hop/workflow/actions/http/ActionHttpDialog.java b/plugins/actions/http/src/main/java/org/apache/hop/workflow/actions/http/ActionHttpDialog.java
index fb2eb016ac..85df7db9f1 100644
--- a/plugins/actions/http/src/main/java/org/apache/hop/workflow/actions/http/ActionHttpDialog.java
+++ b/plugins/actions/http/src/main/java/org/apache/hop/workflow/actions/http/ActionHttpDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.PasswordTextVar;
import org.apache.hop.ui.core.widget.TableView;
@@ -118,8 +117,6 @@ public class ActionHttpDialog extends ActionDialog implements IActionDialog {
private ActionHttp action;
- private Shell shell;
-
private boolean changed;
public ActionHttpDialog(
@@ -841,12 +838,6 @@ public class ActionHttpDialog extends ActionDialog implements IActionDialog {
wTargetExt.setEnabled(wRunEveryRow.getSelection() ? false : wDateTimeAdded.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.NVL(action.getName(), ""));
diff --git a/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java b/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java
index 6b4e2ce2f0..bf9fa71254 100644
--- a/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java
+++ b/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.*;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -128,8 +127,6 @@ public class ActionMailDialog extends ActionDialog implements IActionDialog {
private Label wlSensitivity;
private CCombo wSensitivity;
- private Shell shell;
-
private ActionMail action;
private boolean backupDate;
@@ -1377,12 +1374,6 @@ public class ActionMailDialog extends ActionDialog implements IActionDialog {
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
wDestination.setText(Const.nullToEmpty(action.getDestination()));
diff --git a/plugins/actions/movefiles/src/main/java/org/apache/hop/workflow/actions/movefiles/ActionMoveFilesDialog.java b/plugins/actions/movefiles/src/main/java/org/apache/hop/workflow/actions/movefiles/ActionMoveFilesDialog.java
index 94248aae65..5c4a01b65f 100644
--- a/plugins/actions/movefiles/src/main/java/org/apache/hop/workflow/actions/movefiles/ActionMoveFilesDialog.java
+++ b/plugins/actions/movefiles/src/main/java/org/apache/hop/workflow/actions/movefiles/ActionMoveFilesDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -43,7 +42,14 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
/** This dialog allows you to edit the Move Files action settings. */
public class ActionMoveFilesDialog extends ActionDialog implements IActionDialog {
@@ -68,7 +74,6 @@ public class ActionMoveFilesDialog extends ActionDialog implements IActionDialog
private Button wIncludeSubfolders;
private ActionMoveFiles action;
- private Shell shell;
private boolean changed;
@@ -1467,12 +1472,6 @@ public class ActionMoveFilesDialog extends ActionDialog implements IActionDialog
wbDestinationDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void checkIncludeSubFolders() {
wlMoveEmptyFolders.setEnabled(wIncludeSubfolders.getSelection());
wMoveEmptyFolders.setEnabled(wIncludeSubfolders.getSelection());
diff --git a/plugins/actions/msgboxinfo/src/main/java/org/apache/hop/workflow/actions/msgboxinfo/ActionMsgBoxInfoDialog.java b/plugins/actions/msgboxinfo/src/main/java/org/apache/hop/workflow/actions/msgboxinfo/ActionMsgBoxInfoDialog.java
index 63af461e54..1394e90592 100644
--- a/plugins/actions/msgboxinfo/src/main/java/org/apache/hop/workflow/actions/msgboxinfo/ActionMsgBoxInfoDialog.java
+++ b/plugins/actions/msgboxinfo/src/main/java/org/apache/hop/workflow/actions/msgboxinfo/ActionMsgBoxInfoDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -48,8 +47,6 @@ public class ActionMsgBoxInfoDialog extends ActionDialog implements IActionDialo
private ActionMsgBoxInfo action;
- private Shell shell;
-
private boolean changed;
private TextVar wTitleMessage;
@@ -162,12 +159,6 @@ public class ActionMsgBoxInfoDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.NVL(action.getName(), ""));
diff --git a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
index ef09f9a293..0c9d038224 100644
--- a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
+++ b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
@@ -31,7 +31,6 @@ import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
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.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -72,7 +71,7 @@ public class ActionMssqlBulkLoadDialog extends ActionDialog implements IActionDi
private TextVar wTablename;
private ActionMssqlBulkLoad action;
- private Shell shell;
+
private boolean changed;
private TextVar wFilename;
@@ -1026,12 +1025,6 @@ public class ActionMssqlBulkLoadDialog extends ActionDialog implements IActionDi
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void setDataType() {
if (wDataFiletype.getSelectionIndex() == 0 || wDataFiletype.getSelectionIndex() == 2) {
wFieldTerminator.setEnabled(true);
diff --git a/plugins/actions/mysqlbulkfile/src/main/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileDialog.java b/plugins/actions/mysqlbulkfile/src/main/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileDialog.java
index 4b18686443..5e590775b0 100644
--- a/plugins/actions/mysqlbulkfile/src/main/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileDialog.java
+++ b/plugins/actions/mysqlbulkfile/src/main/java/org/apache/hop/workflow/actions/mysqlbulkfile/ActionMysqlBulkFileDialog.java
@@ -30,7 +30,6 @@ import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
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.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -71,8 +70,6 @@ public class ActionMysqlBulkFileDialog extends ActionDialog implements IActionDi
private ActionMysqlBulkFile action;
- private Shell shell;
-
private TextVar wFilename;
private Button wHighPriority;
@@ -517,12 +514,6 @@ public class ActionMysqlBulkFileDialog extends ActionDialog implements IActionDi
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.NVL(action.getName(), ""));
diff --git a/plugins/actions/mysqlbulkload/src/main/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadDialog.java b/plugins/actions/mysqlbulkload/src/main/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadDialog.java
index e8445364f0..2c8e6c36ae 100644
--- a/plugins/actions/mysqlbulkload/src/main/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadDialog.java
+++ b/plugins/actions/mysqlbulkload/src/main/java/org/apache/hop/workflow/actions/mysqlbulkload/ActionMysqlBulkLoadDialog.java
@@ -30,7 +30,6 @@ import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
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.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -68,7 +67,7 @@ public class ActionMysqlBulkLoadDialog extends ActionDialog implements IActionDi
private TextVar wTablename;
private ActionMysqlBulkLoad action;
- private Shell shell;
+
private boolean changed;
private TextVar wFilename;
@@ -551,12 +550,6 @@ public class ActionMysqlBulkLoadDialog extends ActionDialog implements IActionDi
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpdecryptfiles/ActionPGPDecryptFilesDialog.java b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpdecryptfiles/ActionPGPDecryptFilesDialog.java
index 0e96c589c8..85e05a66e5 100644
--- a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpdecryptfiles/ActionPGPDecryptFilesDialog.java
+++ b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpdecryptfiles/ActionPGPDecryptFilesDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -65,7 +64,6 @@ public class ActionPGPDecryptFilesDialog extends ActionDialog implements IAction
private Button wIncludeSubfolders;
private ActionPGPDecryptFiles action;
- private Shell shell;
private boolean changed;
@@ -1474,12 +1472,6 @@ public class ActionPGPDecryptFilesDialog extends ActionDialog implements IAction
wbDestinationDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void checkIncludeSubFolders() {
wlDoNotKeepFolderStructure.setEnabled(wIncludeSubfolders.getSelection());
wDoNotKeepFolderStructure.setEnabled(wIncludeSubfolders.getSelection());
diff --git a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
index ef8b31dea6..37c5c9098d 100644
--- a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
+++ b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpencryptfiles/ActionPGPEncryptFilesDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -65,7 +64,6 @@ public class ActionPGPEncryptFilesDialog extends ActionDialog implements IAction
private Button wIncludeSubfolders;
private ActionPGPEncryptFiles action;
- private Shell shell;
private boolean changed;
@@ -1501,12 +1499,6 @@ public class ActionPGPEncryptFilesDialog extends ActionDialog implements IAction
wbDestinationDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void checkIncludeSubFolders() {
wlDoNotKeepFolderStructure.setEnabled(wIncludeSubfolders.getSelection());
wDoNotKeepFolderStructure.setEnabled(wIncludeSubfolders.getSelection());
diff --git a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpverify/ActionPGPVerifyDialog.java b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpverify/ActionPGPVerifyDialog.java
index 601e4ccb0d..f5a76b3b6b 100644
--- a/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpverify/ActionPGPVerifyDialog.java
+++ b/plugins/actions/pgpfiles/src/main/java/org/apache/hop/workflow/actions/pgpverify/ActionPGPVerifyDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -64,8 +63,6 @@ public class ActionPGPVerifyDialog extends ActionDialog implements IActionDialog
private ActionPGPVerify action;
- private Shell shell;
-
private boolean changed;
public ActionPGPVerifyDialog(
@@ -293,12 +290,6 @@ public class ActionPGPVerifyDialog extends ActionDialog implements IActionDialog
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java b/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
index 79a75df46f..611e171207 100644
--- a/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
+++ b/plugins/actions/ping/src/main/java/org/apache/hop/workflow/actions/ping/ActionPingDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -53,8 +52,6 @@ public class ActionPingDialog extends ActionDialog implements IActionDialog {
private ActionPing action;
- private Shell shell;
-
private CCombo wPingType;
private Label wlNbrPackets;
@@ -234,12 +231,6 @@ public class ActionPingDialog extends ActionDialog implements IActionDialog {
|| wPingType.getSelectionIndex() == action.ibothPings);
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipelineDialog.java b/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipelineDialog.java
index 0011294915..5c81882992 100644
--- a/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipelineDialog.java
+++ b/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipelineDialog.java
@@ -31,7 +31,6 @@ import org.apache.hop.pipeline.config.PipelineRunConfiguration;
import org.apache.hop.ui.core.ConstUi;
import org.apache.hop.ui.core.dialog.BaseDialog;
import org.apache.hop.ui.core.dialog.ErrorDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.hopgui.HopGui;
import org.apache.hop.ui.hopgui.file.pipeline.HopPipelineFileType;
import org.apache.hop.ui.util.SwtSvgImageUtil;
@@ -220,11 +219,6 @@ public class ActionPipelineDialog extends ActionBaseDialog implements IActionDia
return "${" + Const.INTERNAL_VARIABLE_ENTRY_CURRENT_FOLDER + "}/" + name;
}
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
-
public void getData() {
wName.setText(Const.NVL(action.getName(), ""));
wPath.setText(Const.NVL(action.getFilename(), ""));
diff --git a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
index dbe222af08..8893d92131 100644
--- a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
+++ b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/EndRepeatDialog.java
@@ -39,8 +39,6 @@ public class EndRepeatDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = EndRepeatDialog.class; // For Translator
- private Shell shell;
-
private EndRepeat action;
private Text wName;
@@ -130,9 +128,4 @@ public class EndRepeatDialog extends ActionDialog implements IActionDialog {
dispose();
}
-
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
}
diff --git a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/RepeatDialog.java b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/RepeatDialog.java
index d2bb0841ba..a47be43138 100644
--- a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/RepeatDialog.java
+++ b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/RepeatDialog.java
@@ -55,8 +55,6 @@ public class RepeatDialog extends ActionDialog implements IActionDialog {
private static final String COLON_SEPARATOR = " : ";
- private Shell shell;
-
private Repeat action;
private Text wName;
@@ -628,9 +626,4 @@ public class RepeatDialog extends ActionDialog implements IActionDialog {
dispose();
}
-
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
}
diff --git a/plugins/actions/sendnagiospassivecheck/src/main/java/org/apache/hop/workflow/actions/sendnagiospassivecheck/ActionSendNagiosPassiveCheckDialog.java b/plugins/actions/sendnagiospassivecheck/src/main/java/org/apache/hop/workflow/actions/sendnagiospassivecheck/ActionSendNagiosPassiveCheckDialog.java
index a294c7920c..634b6ea032 100644
--- a/plugins/actions/sendnagiospassivecheck/src/main/java/org/apache/hop/workflow/actions/sendnagiospassivecheck/ActionSendNagiosPassiveCheckDialog.java
+++ b/plugins/actions/sendnagiospassivecheck/src/main/java/org/apache/hop/workflow/actions/sendnagiospassivecheck/ActionSendNagiosPassiveCheckDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.PropsUi;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelText;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.StyledTextComp;
@@ -64,8 +63,6 @@ public class ActionSendNagiosPassiveCheckDialog extends ActionDialog implements
private ActionSendNagiosPassiveCheck action;
- private Shell shell;
-
private boolean changed;
private LabelTextVar wPort;
@@ -474,12 +471,6 @@ public class ActionSendNagiosPassiveCheckDialog extends ActionDialog implements
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/setvariables/src/main/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesDialog.java b/plugins/actions/setvariables/src/main/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesDialog.java
index 0b2c79fa11..74c40a8780 100644
--- a/plugins/actions/setvariables/src/main/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesDialog.java
+++ b/plugins/actions/setvariables/src/main/java/org/apache/hop/workflow/actions/setvariables/ActionSetVariablesDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -51,7 +50,6 @@ public class ActionSetVariablesDialog extends ActionDialog implements IActionDia
private Button wVarSubs;
private ActionSetVariables action;
- private Shell shell;
private TableView wFields;
@@ -275,12 +273,6 @@ public class ActionSetVariablesDialog extends ActionDialog implements IActionDia
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/shell/src/main/java/org/apache/hop/workflow/actions/shell/ActionShellDialog.java b/plugins/actions/shell/src/main/java/org/apache/hop/workflow/actions/shell/ActionShellDialog.java
index 71a780b8d4..29e4daa8e6 100644
--- a/plugins/actions/shell/src/main/java/org/apache/hop/workflow/actions/shell/ActionShellDialog.java
+++ b/plugins/actions/shell/src/main/java/org/apache/hop/workflow/actions/shell/ActionShellDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.TableView;
import org.apache.hop.ui.core.widget.TextVar;
@@ -100,8 +99,6 @@ public class ActionShellDialog extends ActionDialog implements IActionDialog {
private TableView wFields;
- private Shell shell;
-
private ActionShell action;
private boolean backupChanged;
@@ -655,12 +652,6 @@ public class ActionShellDialog extends ActionDialog implements IActionDialog {
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
public void setActive() {
wlLogfile.setEnabled(action.setLogfile);
wLogfile.setEnabled(action.setLogfile);
diff --git a/plugins/actions/simpleeval/src/main/java/org/apache/hop/workflow/actions/simpleeval/ActionSimpleEvalDialog.java b/plugins/actions/simpleeval/src/main/java/org/apache/hop/workflow/actions/simpleeval/ActionSimpleEvalDialog.java
index 2f01cd0fd0..ff700c1b78 100644
--- a/plugins/actions/simpleeval/src/main/java/org/apache/hop/workflow/actions/simpleeval/ActionSimpleEvalDialog.java
+++ b/plugins/actions/simpleeval/src/main/java/org/apache/hop/workflow/actions/simpleeval/ActionSimpleEvalDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ComboVar;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -51,7 +50,6 @@ public class ActionSimpleEvalDialog extends ActionDialog implements IActionDialo
private Text wName;
private ActionSimpleEval action;
- private Shell shell;
private boolean changed;
@@ -547,12 +545,6 @@ public class ActionSimpleEvalDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/snmptrap/src/main/java/org/apache/hop/workflow/actions/snmptrap/ActionSNMPTrapDialog.java b/plugins/actions/snmptrap/src/main/java/org/apache/hop/workflow/actions/snmptrap/ActionSNMPTrapDialog.java
index 9de8f2d195..005a0068b8 100644
--- a/plugins/actions/snmptrap/src/main/java/org/apache/hop/workflow/actions/snmptrap/ActionSNMPTrapDialog.java
+++ b/plugins/actions/snmptrap/src/main/java/org/apache/hop/workflow/actions/snmptrap/ActionSNMPTrapDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.LabelText;
import org.apache.hop.ui.core.widget.LabelTextVar;
import org.apache.hop.ui.core.widget.StyledTextComp;
@@ -71,8 +70,6 @@ public class ActionSNMPTrapDialog extends ActionDialog implements IActionDialog
private ActionSNMPTrap action;
- private Shell shell;
-
private boolean changed;
private LabelTextVar wPort;
@@ -490,12 +487,6 @@ public class ActionSNMPTrapDialog extends ActionDialog implements IActionDialog
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/sql/src/main/java/org/apache/hop/workflow/actions/sql/ActionSqlDialog.java b/plugins/actions/sql/src/main/java/org/apache/hop/workflow/actions/sql/ActionSqlDialog.java
index 18157086c9..ebaf9bb7e7 100644
--- a/plugins/actions/sql/src/main/java/org/apache/hop/workflow/actions/sql/ActionSqlDialog.java
+++ b/plugins/actions/sql/src/main/java/org/apache/hop/workflow/actions/sql/ActionSqlDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.StyledTextComp;
import org.apache.hop.ui.core.widget.TextVar;
@@ -71,8 +70,6 @@ public class ActionSqlDialog extends ActionDialog implements IActionDialog {
private ActionSql action;
- private Shell shell;
-
private Button wSendOneStatement;
// File
@@ -345,12 +342,6 @@ public class ActionSqlDialog extends ActionDialog implements IActionDialog {
PKG, "ActionSQL.Position.Label", "" + lineNumber, "" + columnNumber));
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java b/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
index 6f00f70142..cf8c9366d1 100644
--- a/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
+++ b/plugins/actions/success/src/main/java/org/apache/hop/workflow/actions/success/ActionSuccessDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
import org.apache.hop.ui.workflow.dialog.WorkflowDialog;
@@ -44,8 +43,6 @@ public class ActionSuccessDialog extends ActionDialog implements IActionDialog {
private ActionSuccess action;
- private Shell shell;
-
private boolean changed;
public ActionSuccessDialog(
@@ -113,12 +110,6 @@ public class ActionSuccessDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/tableexists/src/main/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsDialog.java b/plugins/actions/tableexists/src/main/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsDialog.java
index 135e1527e9..2305e63e7d 100644
--- a/plugins/actions/tableexists/src/main/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsDialog.java
+++ b/plugins/actions/tableexists/src/main/java/org/apache/hop/workflow/actions/tableexists/ActionTableExistsDialog.java
@@ -28,7 +28,6 @@ import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
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.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -63,8 +62,6 @@ public class ActionTableExistsDialog extends ActionDialog implements IActionDial
private ActionTableExists action;
- private Shell shell;
-
private boolean changed;
public ActionTableExistsDialog(
@@ -204,12 +201,6 @@ public class ActionTableExistsDialog extends ActionDialog implements IActionDial
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/telnet/src/main/java/org/apache/hop/workflow/actions/telnet/ActionTelnetDialog.java b/plugins/actions/telnet/src/main/java/org/apache/hop/workflow/actions/telnet/ActionTelnetDialog.java
index cef3e53ddd..6db6562396 100644
--- a/plugins/actions/telnet/src/main/java/org/apache/hop/workflow/actions/telnet/ActionTelnetDialog.java
+++ b/plugins/actions/telnet/src/main/java/org/apache/hop/workflow/actions/telnet/ActionTelnetDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -51,8 +50,6 @@ public class ActionTelnetDialog extends ActionDialog implements IActionDialog {
private ActionTelnet action;
- private Shell shell;
-
private boolean changed;
public ActionTelnetDialog(
@@ -179,12 +176,6 @@ public class ActionTelnetDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/truncatetables/src/main/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesDialog.java b/plugins/actions/truncatetables/src/main/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesDialog.java
index fd109adeba..a8156c683d 100644
--- a/plugins/actions/truncatetables/src/main/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesDialog.java
+++ b/plugins/actions/truncatetables/src/main/java/org/apache/hop/workflow/actions/truncatetables/ActionTruncateTablesDialog.java
@@ -27,7 +27,6 @@ import org.apache.hop.i18n.BaseMessages;
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.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ColumnInfo;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.TableView;
@@ -56,8 +55,6 @@ import java.util.Arrays;
public class ActionTruncateTablesDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = ActionTruncateTables.class; // For Translator
- private Shell shell;
-
private Button wbTable;
private Text wName;
@@ -270,11 +267,6 @@ public class ActionTruncateTablesDialog extends ActionDialog implements IActionD
wbTable.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/unzip/src/main/java/org/apache/hop/workflow/actions/unzip/ActionUnZipDialog.java b/plugins/actions/unzip/src/main/java/org/apache/hop/workflow/actions/unzip/ActionUnZipDialog.java
index 4eabf39958..f3d8f1d7d1 100644
--- a/plugins/actions/unzip/src/main/java/org/apache/hop/workflow/actions/unzip/ActionUnZipDialog.java
+++ b/plugins/actions/unzip/src/main/java/org/apache/hop/workflow/actions/unzip/ActionUnZipDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -62,7 +61,6 @@ public class ActionUnZipDialog extends ActionDialog implements IActionDialog {
private TextVar wZipFilename;
private ActionUnZip action;
- private Shell shell;
private TextVar wTargetDirectory;
@@ -995,12 +993,6 @@ public class ActionUnZipDialog extends ActionDialog implements IActionDialog {
wlWildcardSource.setEnabled(!wArgsPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java b/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
index b907e28670..b4c7438f72 100644
--- a/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
+++ b/plugins/actions/waitforfile/src/main/java/org/apache/hop/workflow/actions/waitforfile/ActionWaitForFileDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -61,7 +60,6 @@ public class ActionWaitForFileDialog extends ActionDialog implements IActionDial
private Button wAddFilenameResult;
private ActionWaitForFile action;
- private Shell shell;
private boolean changed;
@@ -288,12 +286,6 @@ public class ActionWaitForFileDialog extends ActionDialog implements IActionDial
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/waitforsql/src/main/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlDialog.java b/plugins/actions/waitforsql/src/main/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlDialog.java
index 2a6a041d85..08ce07fe97 100644
--- a/plugins/actions/waitforsql/src/main/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlDialog.java
+++ b/plugins/actions/waitforsql/src/main/java/org/apache/hop/workflow/actions/waitforsql/ActionWaitForSqlDialog.java
@@ -30,7 +30,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.ui.core.widget.StyledTextComp;
import org.apache.hop.ui.core.widget.TextVar;
@@ -61,8 +60,6 @@ public class ActionWaitForSqlDialog extends ActionDialog implements IActionDialo
private ActionWaitForSql action;
- private Shell shell;
-
private boolean changed;
private Label wlUseSubs;
@@ -682,12 +679,6 @@ public class ActionWaitForSqlDialog extends ActionDialog implements IActionDialo
wSchemaname.setEnabled(!wCustomSql.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java b/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
index 03b6273d18..139962867f 100644
--- a/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
+++ b/plugins/actions/webserviceavailable/src/main/java/org/apache/hop/workflow/actions/webserviceavailable/ActionWebServiceAvailableDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
@@ -51,8 +50,6 @@ public class ActionWebServiceAvailableDialog extends ActionDialog implements IAc
private ActionWebServiceAvailable action;
- private Shell shell;
-
private boolean changed;
public ActionWebServiceAvailableDialog(
@@ -195,12 +192,6 @@ public class ActionWebServiceAvailableDialog extends ActionDialog implements IAc
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflowDialog.java b/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflowDialog.java
index 223b80b675..7055b9c9aa 100644
--- a/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflowDialog.java
+++ b/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflowDialog.java
@@ -30,7 +30,6 @@ import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.ConstUi;
import org.apache.hop.ui.core.dialog.BaseDialog;
import org.apache.hop.ui.core.dialog.ErrorDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.hopgui.HopGui;
import org.apache.hop.ui.hopgui.file.workflow.HopWorkflowFileType;
import org.apache.hop.ui.util.SwtSvgImageUtil;
@@ -207,11 +206,6 @@ public class ActionWorkflowDialog extends ActionBaseDialog implements IActionDia
}
}
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
-
@Override
public void setActive() {
super.setActive();
diff --git a/plugins/actions/writetofile/src/main/java/org/apache/hop/workflow/actions/writetofile/ActionWriteToFileDialog.java b/plugins/actions/writetofile/src/main/java/org/apache/hop/workflow/actions/writetofile/ActionWriteToFileDialog.java
index 4e379de9cd..95204f41ae 100644
--- a/plugins/actions/writetofile/src/main/java/org/apache/hop/workflow/actions/writetofile/ActionWriteToFileDialog.java
+++ b/plugins/actions/writetofile/src/main/java/org/apache/hop/workflow/actions/writetofile/ActionWriteToFileDialog.java
@@ -23,7 +23,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ComboVar;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -62,7 +61,6 @@ public class ActionWriteToFileDialog extends ActionDialog implements IActionDial
private Text wContent;
private ActionWriteToFile action;
- private Shell shell;
private boolean changed;
@@ -337,12 +335,6 @@ public class ActionWriteToFileDialog extends ActionDialog implements IActionDial
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java b/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
index ea8597f37a..d0bc46a814 100644
--- a/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
+++ b/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ControlSpaceKeyAdapter;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -51,8 +50,6 @@ public class ActionWriteToLogDialog extends ActionDialog implements IActionDialo
private ActionWriteToLog action;
- private Shell shell;
-
private boolean changed;
private TextVar wLogSubject;
@@ -187,12 +184,6 @@ public class ActionWriteToLogDialog extends ActionDialog implements IActionDialo
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/dtdvalidator/DtdValidatorDialog.java b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/dtdvalidator/DtdValidatorDialog.java
index 601438e1f2..ca3ab5c605 100644
--- a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/dtdvalidator/DtdValidatorDialog.java
+++ b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/dtdvalidator/DtdValidatorDialog.java
@@ -67,8 +67,6 @@ public class DtdValidatorDialog extends ActionDialog implements IActionDialog {
private DtdValidator action;
- private Shell shell;
-
private boolean changed;
public DtdValidatorDialog(
@@ -257,12 +255,6 @@ public class DtdValidatorDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
private void activeDTDFilename() {
wldtdFilename.setEnabled(!wDTDIntern.getSelection());
wdtdFilename.setEnabled(!wDTDIntern.getSelection());
diff --git a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xmlwellformed/XmlWellFormedDialog.java b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xmlwellformed/XmlWellFormedDialog.java
index 20988144b9..22bed41519 100644
--- a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xmlwellformed/XmlWellFormedDialog.java
+++ b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xmlwellformed/XmlWellFormedDialog.java
@@ -66,7 +66,6 @@ public class XmlWellFormedDialog extends ActionDialog implements IActionDialog {
private Button wIncludeSubfolders;
private XmlWellFormed action;
- private Shell shell;
private boolean changed;
@@ -699,12 +698,6 @@ public class XmlWellFormedDialog extends ActionDialog implements IActionDialog {
wbSourceDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xsdvalidator/XsdValidatorDialog.java b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xsdvalidator/XsdValidatorDialog.java
index add86393f8..c714f6449b 100644
--- a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xsdvalidator/XsdValidatorDialog.java
+++ b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xsdvalidator/XsdValidatorDialog.java
@@ -71,7 +71,6 @@ public class XsdValidatorDialog extends ActionDialog implements IActionDialog {
Button wbxsdFilename;
private XsdValidator action;
- private Shell shell;
private boolean changed;
@@ -287,12 +286,6 @@ public class XsdValidatorDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xslt/XsltDialog.java b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xslt/XsltDialog.java
index 4df7ff493d..8a85311063 100644
--- a/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xslt/XsltDialog.java
+++ b/plugins/actions/xml/src/main/java/org/apache/hop/workflow/actions/xml/xslt/XsltDialog.java
@@ -81,7 +81,6 @@ public class XsltDialog extends ActionDialog implements IActionDialog {
private CCombo wIfFileExists;
private Xslt action;
- private Shell shell;
private boolean changed;
@@ -645,12 +644,6 @@ public class XsltDialog extends ActionDialog implements IActionDialog {
wbMovetoDirectory.setEnabled(!wPrevious.getSelection());
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/actions/zipfile/src/main/java/org/apache/hop/workflow/actions/zipfile/ActionZipFileDialog.java b/plugins/actions/zipfile/src/main/java/org/apache/hop/workflow/actions/zipfile/ActionZipFileDialog.java
index 117ad2b691..0523d41bbd 100644
--- a/plugins/actions/zipfile/src/main/java/org/apache/hop/workflow/actions/zipfile/ActionZipFileDialog.java
+++ b/plugins/actions/zipfile/src/main/java/org/apache/hop/workflow/actions/zipfile/ActionZipFileDialog.java
@@ -24,7 +24,6 @@ import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
import org.apache.hop.ui.core.dialog.EnterSelectionDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.ComboVar;
import org.apache.hop.ui.core.widget.TextVar;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
@@ -67,8 +66,6 @@ public class ActionZipFileDialog extends ActionDialog implements IActionDialog {
private ActionZipFile action;
- private Shell shell;
-
private Label wlSourceDirectory;
private TextVar wSourceDirectory;
@@ -972,12 +969,6 @@ public class ActionZipFileDialog extends ActionDialog implements IActionDialog {
}
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wName.setText(Const.nullToEmpty(action.getName()));
diff --git a/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTestsDialog.java b/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTestsDialog.java
index 0b683aa52d..d6296f71ca 100644
--- a/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTestsDialog.java
+++ b/plugins/misc/testing/src/main/java/org/apache/hop/testing/actions/runtests/RunPipelineTestsDialog.java
@@ -48,8 +48,6 @@ public class RunPipelineTestsDialog extends ActionDialog implements IActionDialo
private static final String COLON_SEPARATOR = " : ";
- private Shell shell;
-
private RunPipelineTests action;
private Text wName;
@@ -216,9 +214,4 @@ public class RunPipelineTestsDialog extends ActionDialog implements IActionDialo
dispose();
}
-
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
}
diff --git a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/check/CheckConnectionsDialog.java b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/check/CheckConnectionsDialog.java
index bbf17c17e2..20e46f7a95 100644
--- a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/check/CheckConnectionsDialog.java
+++ b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/check/CheckConnectionsDialog.java
@@ -49,8 +49,6 @@ public class CheckConnectionsDialog extends ActionDialog implements IActionDialo
private static final Class<?> PKG = CheckConnectionsDialog.class; // For Translator
- private Shell shell;
-
private CheckConnections action;
private boolean changed;
@@ -214,11 +212,6 @@ public class CheckConnectionsDialog extends ActionDialog implements IActionDialo
dispose();
}
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
-
public boolean evaluates() {
return true;
}
diff --git a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/constraint/Neo4jConstraintDialog.java b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/constraint/Neo4jConstraintDialog.java
index cfed79c091..818c0c807e 100644
--- a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/constraint/Neo4jConstraintDialog.java
+++ b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/constraint/Neo4jConstraintDialog.java
@@ -47,8 +47,6 @@ import java.util.List;
public class Neo4jConstraintDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = Neo4jConstraintDialog.class; // For Translator
- private Shell shell;
-
private Neo4jConstraint meta;
private boolean changed;
@@ -290,9 +288,4 @@ public class Neo4jConstraintDialog extends ActionDialog implements IActionDialog
dispose();
}
-
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
}
diff --git a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptDialog.java b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptDialog.java
index c800f88661..a5c067952b 100644
--- a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptDialog.java
+++ b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/cypherscript/CypherScriptDialog.java
@@ -44,8 +44,6 @@ import org.eclipse.swt.widgets.*;
public class CypherScriptDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = CypherScriptDialog.class; // For Translator
- private Shell shell;
-
private CypherScript cypherScript;
private boolean changed;
@@ -218,9 +216,4 @@ public class CypherScriptDialog extends ActionDialog implements IActionDialog {
dispose();
}
-
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
}
diff --git a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/index/Neo4jIndexDialog.java b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/index/Neo4jIndexDialog.java
index c2202065ec..5c575790c8 100644
--- a/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/index/Neo4jIndexDialog.java
+++ b/plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/index/Neo4jIndexDialog.java
@@ -47,8 +47,6 @@ import java.util.List;
public class Neo4jIndexDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = Neo4jIndexDialog.class; // For Translator
- private Shell shell;
-
private Neo4jIndex meta;
private boolean changed;
@@ -266,9 +264,4 @@ public class Neo4jIndexDialog extends ActionDialog implements IActionDialog {
dispose();
}
-
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
}
diff --git a/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectDialog.java b/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectDialog.java
index 04ec6cfb84..da9dd9793b 100644
--- a/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectDialog.java
+++ b/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectDialog.java
@@ -394,14 +394,8 @@ public class MetaInjectDialog extends BaseTransformDialog implements ITransformD
fdSourceTransform.left = new FormAttachment(0, 0);
fdSourceTransform.top = new FormAttachment(wlSourceTransform, 5);
wSourceTransform.setLayoutData(fdSourceTransform);
- wSourceTransform.addSelectionListener(
- new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent arg0) {
- setActive();
- }
- });
-
+ wSourceTransform.addListener(SWT.Selection, e -> updateWidgets());
+
final int fieldRows = metaInjectMeta.getSourceOutputFields().size();
ColumnInfo[] colinf =
@@ -520,13 +514,7 @@ public class MetaInjectDialog extends BaseTransformDialog implements ITransformD
fdStreamingSourceTransform.top = new FormAttachment(wlStreamingSourceTransform, 5);
wStreamingSourceTransform.setLayoutData(fdStreamingSourceTransform);
wStreamingSourceTransform.setItems(pipelineMeta.getTransformNames());
- wStreamingSourceTransform.addSelectionListener(
- new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent arg0) {
- setActive();
- }
- });
+ wStreamingSourceTransform.addListener(SWT.Selection, e -> updateWidgets());
wlStreamingTargetTransform = new Label(wOptionsComp, SWT.RIGHT);
wlStreamingTargetTransform.setText(
@@ -834,7 +822,7 @@ public class MetaInjectDialog extends BaseTransformDialog implements ITransformD
return true;
}
- public void setActive() {
+ public void updateWidgets() {
boolean outputCapture = !Utils.isEmpty(wSourceTransform.getText());
wSourceFields.setEnabled(outputCapture);
@@ -898,7 +886,7 @@ public class MetaInjectDialog extends BaseTransformDialog implements ITransformD
""));
wStreamingTargetTransform.setText(Const.NVL(metaInjectMeta.getStreamTargetTransformName(), ""));
- setActive();
+ updateWidgets();
refreshTree();
wTabFolder.setSelection(0);
diff --git a/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java b/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java
index 136c61867e..0f0352323d 100644
--- a/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java
+++ b/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGeneratorDialog.java
@@ -144,7 +144,7 @@ public class RowGeneratorDialog extends BaseTransformDialog implements ITransfor
new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- setActive();
+ updateWidgets();
input.setChanged();
}
});
@@ -313,7 +313,7 @@ public class RowGeneratorDialog extends BaseTransformDialog implements ITransfor
return transformName;
}
- protected void setActive() {
+ protected void updateWidgets() {
boolean neverEnding = wNeverEnding.getSelection();
wlLimit.setEnabled(!neverEnding);
@@ -375,7 +375,7 @@ public class RowGeneratorDialog extends BaseTransformDialog implements ITransfor
wFields.setRowNums();
wFields.optWidth(true);
- setActive();
+ updateWidgets();
wTransformName.selectAll();
wTransformName.setFocus();
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
index c73390f3d6..f15756657e 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
@@ -56,7 +56,9 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class HopGuiPipelineTransformDelegate {
@@ -65,7 +67,8 @@ public class HopGuiPipelineTransformDelegate {
private HopGui hopGui;
private HopGuiPipelineGraph pipelineGraph;
-
+ private Map<String, ITransformDialog> dialogs = new HashMap<>();
+
public HopGuiPipelineTransformDelegate(HopGui hopGui, HopGuiPipelineGraph pipelineGraph) {
this.hopGui = hopGui;
this.pipelineGraph = pipelineGraph;
@@ -146,18 +149,30 @@ public class HopGuiPipelineTransformDelegate {
try {
String name = transformMeta.getName();
+ // Check if transform dialog is already open
+ ITransformDialog dialog = dialogs.get(name);
+ if ( dialog!=null) {
+ dialog.setActive();
+ return null;
+ }
+
// Before we do anything, let's store the situation the way it
// was...
//
TransformMeta before = (TransformMeta) transformMeta.clone();
- ITransformDialog dialog =
- getTransformDialog(transformMeta.getTransform(), pipelineMeta, name);
+ dialog = getTransformDialog(transformMeta.getTransform(), pipelineMeta, name);
if (dialog != null) {
+ dialogs.put(name, dialog);
+
dialog.setMetadataProvider(hopGui.getMetadataProvider());
transformMeta.getTransform().convertIOMetaToTransformNames();
transformName = dialog.open();
+
+ dialogs.remove(name);
}
+
+
if (!Utils.isEmpty(transformName)) {
// Force the recreation of the transform IO metadata object. (cached by default)
//
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowActionDelegate.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowActionDelegate.java
index 126e25b6d0..98b1aff331 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowActionDelegate.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowActionDelegate.java
@@ -23,6 +23,7 @@ import org.apache.hop.core.plugins.IPlugin;
import org.apache.hop.core.plugins.PluginRegistry;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
+import org.apache.hop.pipeline.transform.ITransformDialog;
import org.apache.hop.ui.core.PropsUi;
import org.apache.hop.ui.core.dialog.ErrorDialog;
import org.apache.hop.ui.hopgui.HopGui;
@@ -40,14 +41,17 @@ import org.eclipse.swt.widgets.Shell;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class HopGuiWorkflowActionDelegate {
private static final Class<?> PKG = HopGui.class; // For Translator
private HopGui hopGui;
private HopGuiWorkflowGraph workflowGraph;
-
+ private Map<String, IActionDialog> dialogs = new HashMap<>();
+
public HopGuiWorkflowActionDelegate(HopGui hopGui, HopGuiWorkflowGraph workflowGraph) {
this.hopGui = hopGui;
this.workflowGraph = workflowGraph;
@@ -224,13 +228,22 @@ public class HopGuiWorkflowActionDelegate {
.getLog()
.logDetailed(BaseMessages.getString(PKG, "HopGui.Log.EditAction", action.getName()));
+
+ // Check if transform dialog is already open
+ IActionDialog dialog = dialogs.get(action.getName());
+ if ( dialog!=null) {
+ dialog.setActive();
+ return;
+ }
+
ActionMeta before = (ActionMeta) action.cloneDeep();
IAction jei = action.getAction();
- IActionDialog d = getActionDialog(jei, workflowMeta);
- if (d != null) {
- if (d.open() != null) {
+ dialog = getActionDialog(jei, workflowMeta);
+ if (dialog != null) {
+ dialogs.put(action.getName(), dialog);
+ if (dialog.open() != null) {
// First see if the name changed.
// If so, we need to verify that the name is not already used in the workflow.
//
@@ -250,7 +263,7 @@ public class HopGuiWorkflowActionDelegate {
mb.setText(BaseMessages.getString(PKG, "HopGui.Dialog.ActionCanNotBeChanged.Title"));
mb.open();
}
-
+ dialogs.remove(action.getName());
} catch (Exception e) {
if (!hopGui.getShell().isDisposed()) {
new ErrorDialog(
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 1d585d4920..9f1720d3d6 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
@@ -230,6 +230,12 @@ public class BaseTransformDialog extends Dialog {
addDeprecation();
}
}
+
+ public void setActive() {
+ if (shell != null && !shell.isDisposed() ) {
+ shell.setActive();
+ }
+ }
private void addDeprecation() {
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/action/ActionDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/action/ActionDialog.java
index 2092b44d79..bf097d9ef5 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/action/ActionDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/action/ActionDialog.java
@@ -26,6 +26,7 @@ import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.metadata.api.IHopMetadataProvider;
import org.apache.hop.pipeline.transform.ITransform;
import org.apache.hop.ui.core.PropsUi;
+import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.core.widget.MetaSelectionLine;
import org.apache.hop.workflow.WorkflowMeta;
import org.eclipse.swt.SWT;
@@ -47,7 +48,7 @@ import org.eclipse.swt.widgets.Shell;
* <p>method on the dialog. SWT is the native windowing environment of HopGui, and it is typically
* the framework used for implementing action dialogs.
*/
-public class ActionDialog extends Dialog {
+public abstract class ActionDialog extends Dialog {
private static final Class<?> PKG = ITransform.class; // For Translator
/** The loggingObject for the dialog */
@@ -66,6 +67,9 @@ public class ActionDialog extends Dialog {
/** A reference to the properties user interface */
protected PropsUi props;
+ /** A reference to the shell */
+ protected Shell shell;
+
/**
* Instantiates a new action dialog.
*
@@ -80,6 +84,17 @@ public class ActionDialog extends Dialog {
this.workflowMeta = workflowMeta;
}
+ public void setActive() {
+ if (shell != null && !shell.isDisposed() ) {
+ shell.setActive();
+ }
+ }
+
+ public void dispose() {
+ props.setScreen(new WindowProperty(shell));
+ shell.dispose();
+ }
+
/**
* Adds the connection line for the given parent and previous control, and returns a meta
* selection manager control
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/actions/ActionBaseDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/actions/ActionBaseDialog.java
index afa088f6c2..9e94415983 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/actions/ActionBaseDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/actions/ActionBaseDialog.java
@@ -109,8 +109,6 @@ public abstract class ActionBaseDialog extends ActionDialog {
protected Listener lsOk;
protected Listener lsCancel;
- protected Shell shell;
-
protected boolean backupChanged;
protected Button wAppendLogfile;
@@ -389,7 +387,7 @@ public abstract class ActionBaseDialog extends ActionDialog {
new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent selectionEvent) {
- setActive();
+ setLogFileEnabled();
}
});
@@ -549,7 +547,7 @@ public abstract class ActionBaseDialog extends ActionDialog {
}
}
- protected void setActive() {
+ protected void setLogFileEnabled() {
gLogFile.setEnabled(wSetLogfile.getSelection());
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
index 375e382700..a0dae9aa38 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/actions/dummy/ActionDummyDialog.java
@@ -21,7 +21,6 @@ import org.apache.hop.core.Const;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
import org.apache.hop.ui.workflow.dialog.WorkflowDialog;
@@ -41,8 +40,6 @@ import org.eclipse.swt.widgets.Text;
public class ActionDummyDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = ActionDummy.class; // For Translator
- private Shell shell;
-
private ActionDummy action;
private boolean backupChanged;
@@ -110,12 +107,6 @@ public class ActionDummyDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- WindowProperty winprop = new WindowProperty(shell);
- props.setScreen(winprop);
- shell.dispose();
- }
-
public void getData() {
wName.setText(action.getName());
}
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/actions/missing/MissingActionDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/actions/missing/MissingActionDialog.java
index 655b0d6ceb..4d1d5348a3 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/actions/missing/MissingActionDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/actions/missing/MissingActionDialog.java
@@ -46,7 +46,6 @@ import java.util.List;
public class MissingActionDialog extends ActionDialog implements IActionDialog {
private static final Class<?> PKG = MissingActionDialog.class; // For Translator
- private Shell shell;
private List<MissingAction> missingActions;
private int mode;
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/actions/start/ActionStartDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/actions/start/ActionStartDialog.java
index a5e0dbd7d1..9fc0f8af64 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/actions/start/ActionStartDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/actions/start/ActionStartDialog.java
@@ -21,7 +21,6 @@ import org.apache.hop.core.Const;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.ui.core.gui.WindowProperty;
import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
import org.apache.hop.ui.workflow.action.ActionDialog;
import org.apache.hop.ui.workflow.dialog.WorkflowDialog;
@@ -51,8 +50,6 @@ public class ActionStartDialog extends ActionDialog implements IActionDialog {
private static final String MONTHLY = BaseMessages.getString(PKG, "ActionStart.Type.Monthly");
- private Shell shell;
-
private ActionStart action;
private Text wName;
@@ -228,11 +225,6 @@ public class ActionStartDialog extends ActionDialog implements IActionDialog {
return action;
}
- public void dispose() {
- props.setScreen(new WindowProperty(shell));
- shell.dispose();
- }
-
public void getData() {
wName.setText(action.getName());
wRepeat.setSelection(action.isRepeat());