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 2020/12/30 10:16:48 UTC
[incubator-hop] branch master updated: HOP-2366: Do no use
CTabFolder.setSimple()
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/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 3bdb42a HOP-2366: Do no use CTabFolder.setSimple()
new 221b9dc Merge pull request #510 from HiromuHota/HOP-2366
3bdb42a is described below
commit 3bdb42a0f95d80511f883c436e60aae22ff5c2bb
Author: Hiromu Hota <hi...@gmail.com>
AuthorDate: Tue Dec 29 17:07:41 2020 -0800
HOP-2366: Do no use CTabFolder.setSimple()
---
.../src/main/java/ui/steps/script/ScriptDialog.java | 1 -
.../src/main/java/ui/steps/simplemapping/SimpleMappingDialog.java | 1 -
.../src/main/java/ui/steps/textfileinput/TextFileInputDialog.java | 1 -
.../apache/hop/pipeline/transforms/concatfields/ConcatFieldsDialog.java | 1 -
.../transforms/userdefinedjavaclass/UserDefinedJavaClassDialog.java | 2 --
.../hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java | 1 -
.../pipeline/transforms/kafka/consumer/KafkaConsumerInputDialog.java | 1 -
.../pipeline/transforms/kafka/producer/KafkaProducerOutputDialog.java | 1 -
.../org/apache/hop/pipeline/transforms/mapping/SimpleMappingDialog.java | 1 -
.../org/apache/hop/pipeline/transforms/metainject/MetaInjectDialog.java | 1 -
.../apache/hop/pipeline/transforms/mongodbinput/MongoDbInputDialog.java | 1 -
.../hop/pipeline/transforms/mongodboutput/MongoDbOutputDialog.java | 1 -
.../apache/hop/pipeline/transforms/fileinput/TextFileInputDialog.java | 1 -
.../hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java | 1 -
.../hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java | 1 -
.../pipeline/transforms/tokenreplacement/TokenReplacementDialog.java | 1 -
ui/src/main/java/org/apache/hop/ui/core/PropsUi.java | 1 -
ui/src/main/java/org/apache/hop/ui/core/dialog/EnterOptionsDialog.java | 1 -
.../apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java | 1 -
ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialog.java | 1 -
.../ui/pipeline/transforms/pipelineexecutor/PipelineExecutorDialog.java | 1 -
.../ui/pipeline/transforms/workflowexecutor/WorkflowExecutorDialog.java | 1 -
22 files changed, 23 deletions(-)
diff --git a/archive-pipeline-transforms/src/main/java/ui/steps/script/ScriptDialog.java b/archive-pipeline-transforms/src/main/java/ui/steps/script/ScriptDialog.java
index 75f946c..56abbeb 100644
--- a/archive-pipeline-transforms/src/main/java/ui/steps/script/ScriptDialog.java
+++ b/archive-pipeline-transforms/src/main/java/ui/steps/script/ScriptDialog.java
@@ -343,7 +343,6 @@ public class ScriptDialog extends BaseTransformDialog implements ITransformDialo
wlScript.setLayoutData( fdlScript );
folder = new CTabFolder( wTop, SWT.BORDER | SWT.RESIZE );
- folder.setSimple( false );
folder.setUnselectedImageVisible( true );
folder.setUnselectedCloseVisible( true );
fdScript = new FormData();
diff --git a/archive-pipeline-transforms/src/main/java/ui/steps/simplemapping/SimpleMappingDialog.java b/archive-pipeline-transforms/src/main/java/ui/steps/simplemapping/SimpleMappingDialog.java
index 422734a..e0b6a20 100644
--- a/archive-pipeline-transforms/src/main/java/ui/steps/simplemapping/SimpleMappingDialog.java
+++ b/archive-pipeline-transforms/src/main/java/ui/steps/simplemapping/SimpleMappingDialog.java
@@ -273,7 +273,6 @@ public class SimpleMappingDialog extends BaseTransformDialog implements ITransfo
//
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
wTabFolder.setUnselectedCloseVisible( true );
wCancel = new Button( shell, SWT.PUSH );
diff --git a/archive-pipeline-transforms/src/main/java/ui/steps/textfileinput/TextFileInputDialog.java b/archive-pipeline-transforms/src/main/java/ui/steps/textfileinput/TextFileInputDialog.java
index 66f500f..fca852f 100644
--- a/archive-pipeline-transforms/src/main/java/ui/steps/textfileinput/TextFileInputDialog.java
+++ b/archive-pipeline-transforms/src/main/java/ui/steps/textfileinput/TextFileInputDialog.java
@@ -489,7 +489,6 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
addFilesTab();
addContentTab();
diff --git a/plugins/transforms/concatfields/src/main/java/org/apache/hop/pipeline/transforms/concatfields/ConcatFieldsDialog.java b/plugins/transforms/concatfields/src/main/java/org/apache/hop/pipeline/transforms/concatfields/ConcatFieldsDialog.java
index 87317fc..b55eb9b 100644
--- a/plugins/transforms/concatfields/src/main/java/org/apache/hop/pipeline/transforms/concatfields/ConcatFieldsDialog.java
+++ b/plugins/transforms/concatfields/src/main/java/org/apache/hop/pipeline/transforms/concatfields/ConcatFieldsDialog.java
@@ -257,7 +257,6 @@ public class ConcatFieldsDialog extends BaseTransformDialog implements ITransfor
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
// Fields tab...
//
diff --git a/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassDialog.java b/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassDialog.java
index dfd82d5..1d1704e 100644
--- a/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassDialog.java
+++ b/plugins/transforms/janino/src/main/java/org/apache/hop/pipeline/transforms/userdefinedjavaclass/UserDefinedJavaClassDialog.java
@@ -247,7 +247,6 @@ public class UserDefinedJavaClassDialog extends BaseTransformDialog implements I
wlScript.setLayoutData( fdlScript );
folder = new CTabFolder( wTop, SWT.BORDER | SWT.RESIZE );
- folder.setSimple( false );
folder.setUnselectedImageVisible( true );
folder.setUnselectedCloseVisible( true );
FormData fdScript = new FormData();
@@ -291,7 +290,6 @@ public class UserDefinedJavaClassDialog extends BaseTransformDialog implements I
//
wTabFolder = new CTabFolder( wSash, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
wTabFolder.setUnselectedCloseVisible( false );
FormData fdTabFolder = new FormData();
diff --git a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
index 277da50..90db840 100644
--- a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
+++ b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesMetaModDialog.java
@@ -243,7 +243,6 @@ public class ScriptValuesMetaModDialog extends BaseTransformDialog implements IT
wlScript.setLayoutData(fdlScript);
folder = new CTabFolder(wTop, SWT.BORDER | SWT.RESIZE );
- folder.setSimple( false );
folder.setUnselectedImageVisible( true );
folder.setUnselectedCloseVisible( true );
FormData fdScript = new FormData();
diff --git a/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputDialog.java b/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputDialog.java
index ddb9820..d3b1e16 100644
--- a/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputDialog.java
+++ b/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputDialog.java
@@ -214,7 +214,6 @@ public class KafkaConsumerInputDialog extends BaseTransformDialog implements ITr
//
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
wTabFolder.setUnselectedCloseVisible( true );
FormData fdTabFolder = new FormData();
diff --git a/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/producer/KafkaProducerOutputDialog.java b/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/producer/KafkaProducerOutputDialog.java
index 2fdbcc3..74c4d11 100644
--- a/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/producer/KafkaProducerOutputDialog.java
+++ b/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/producer/KafkaProducerOutputDialog.java
@@ -140,7 +140,6 @@ public class KafkaProducerOutputDialog extends BaseTransformDialog implements IT
// Start of tabbed display
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
wTabFolder.setUnselectedCloseVisible( true );
wOk = new Button( shell, SWT.PUSH );
diff --git a/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingDialog.java b/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingDialog.java
index 57912bc..8c1e8d5 100644
--- a/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingDialog.java
+++ b/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingDialog.java
@@ -265,7 +265,6 @@ public class SimpleMappingDialog extends BaseTransformDialog implements ITransfo
//
wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
wTabFolder.setUnselectedCloseVisible(true);
Label hSpacer = new Label(shell, SWT.HORIZONTAL | SWT.SEPARATOR);
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 b392586..28ef1f3 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
@@ -260,7 +260,6 @@ public class MetaInjectDialog extends BaseTransformDialog implements ITransformD
wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
Label hSpacer = new Label(shell, SWT.HORIZONTAL | SWT.SEPARATOR);
FormData fdhSpacer = new FormData();
diff --git a/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodbinput/MongoDbInputDialog.java b/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodbinput/MongoDbInputDialog.java
index c2c8339..417fa2e 100644
--- a/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodbinput/MongoDbInputDialog.java
+++ b/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodbinput/MongoDbInputDialog.java
@@ -171,7 +171,6 @@ public class MongoDbInputDialog extends BaseTransformDialog implements ITransfor
CTabFolder wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
// start of the config tab
CTabItem wConfigTab = new CTabItem(wTabFolder, SWT.NONE);
diff --git a/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputDialog.java b/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputDialog.java
index 66196b0..476669e 100644
--- a/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputDialog.java
+++ b/plugins/transforms/mongodb/src/main/java/org/apache/hop/pipeline/transforms/mongodboutput/MongoDbOutputDialog.java
@@ -192,7 +192,6 @@ public class MongoDbOutputDialog extends BaseTransformDialog implements ITransfo
// The tabs of the dialog
CTabFolder wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
// Start of the config tab
CTabItem wConfigTab = new CTabItem( wTabFolder, SWT.NONE );
diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/TextFileInputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/TextFileInputDialog.java
index 74eb636..9e36a34 100644
--- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/TextFileInputDialog.java
+++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/TextFileInputDialog.java
@@ -463,7 +463,6 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
addFilesTab();
addContentTab();
diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java
index 81f2da0..c209394 100644
--- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java
+++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInputDialog.java
@@ -320,7 +320,6 @@ public class TextFileInputDialog extends BaseTransformDialog implements ITransfo
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
addFilesTab();
addContentTab();
diff --git a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
index 421ea89..14ad06f 100644
--- a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
+++ b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
@@ -204,7 +204,6 @@ public class TextFileOutputDialog extends BaseTransformDialog implements ITransf
CTabFolder wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
// ////////////////////////
// START OF FILE TAB///
diff --git a/plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementDialog.java b/plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementDialog.java
index e9dbb46..6c2a7d1 100644
--- a/plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementDialog.java
+++ b/plugins/transforms/tokenreplacement/src/main/java/org/apache/hop/pipeline/transforms/tokenreplacement/TokenReplacementDialog.java
@@ -272,7 +272,6 @@ public class TokenReplacementDialog extends BaseTransformDialog implements ITran
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
// ////////////////////////
// START OF INPUT TAB///
diff --git a/ui/src/main/java/org/apache/hop/ui/core/PropsUi.java b/ui/src/main/java/org/apache/hop/ui/core/PropsUi.java
index e1403ac..7c41057 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/PropsUi.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/PropsUi.java
@@ -524,7 +524,6 @@ public class PropsUi extends Props {
case WIDGET_STYLE_TAB:
background = GuiResource.getInstance().getColorWhite();
CTabFolder tabFolder = (CTabFolder) control;
- tabFolder.setSimple( false );
tabFolder.setBorderVisible( true );
// need to make a copy of the tab selection background color to get around PDI-13940
Color c = GuiResource.getInstance().getColorTab();
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/EnterOptionsDialog.java b/ui/src/main/java/org/apache/hop/ui/core/dialog/EnterOptionsDialog.java
index 273c526..7cf3bc1 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/EnterOptionsDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/EnterOptionsDialog.java
@@ -189,7 +189,6 @@ public class EnterOptionsDialog extends Dialog {
wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
addGeneralTab();
addLookTab();
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java b/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java
index e482bc0..94434af 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/config/PipelineRunConfigurationEditor.java
@@ -139,7 +139,6 @@ public class PipelineRunConfigurationEditor extends MetadataEditor<PipelineRunCo
CTabFolder wTabFolder = new CTabFolder( parent, SWT.BORDER );
props.setLook( wTabFolder );
- wTabFolder.setSimple( false );
CTabItem wMainTab = new CTabItem( wTabFolder, SWT.NONE );
wMainTab.setText( BaseMessages.getString( PKG, "PipelineRunConfigurationDialog.MainTab.TabTitle" ) );
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialog.java
index fca2e2f..7029b44 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineDialog.java
@@ -175,7 +175,6 @@ public class PipelineDialog extends Dialog {
wTabFolder = new CTabFolder( shell, SWT.BORDER );
props.setLook( wTabFolder, Props.WIDGET_STYLE_TAB );
- wTabFolder.setSimple( false );
addPipelineTab();
addParamTab();
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/pipelineexecutor/PipelineExecutorDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/pipelineexecutor/PipelineExecutorDialog.java
index 6149e34..ca84564 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/pipelineexecutor/PipelineExecutorDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/pipelineexecutor/PipelineExecutorDialog.java
@@ -273,7 +273,6 @@ public class PipelineExecutorDialog extends BaseTransformDialog implements ITran
//
wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
wTabFolder.setUnselectedCloseVisible(true);
Label hSpacer = new Label(shell, SWT.HORIZONTAL | SWT.SEPARATOR);
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/workflowexecutor/WorkflowExecutorDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/workflowexecutor/WorkflowExecutorDialog.java
index d6437b1..0741afb 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/workflowexecutor/WorkflowExecutorDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/transforms/workflowexecutor/WorkflowExecutorDialog.java
@@ -274,7 +274,6 @@ public class WorkflowExecutorDialog extends BaseTransformDialog implements ITran
//
wTabFolder = new CTabFolder(shell, SWT.BORDER);
props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB);
- wTabFolder.setSimple(false);
wTabFolder.setUnselectedCloseVisible(true);
Label hSpacer = new Label(shell, SWT.HORIZONTAL | SWT.SEPARATOR);