This is an automated email from the ASF dual-hosted git repository.
mcasters 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 e4d0dba HOP-2843 - Remove an unsightly border on Windows - Rename
some prefix 'job' to 'workflow'
new abf52da Merge pull request #785 from nadment/HOP-2843
e4d0dba is described below
commit e4d0dbaebe0075eca46988757568499b3caf0325
Author: nadment <[email protected]>
AuthorDate: Fri Apr 30 21:48:21 2021 +0200
HOP-2843
- Remove an unsightly border on Windows
- Rename some prefix 'job' to 'workflow'
---
.../delegates/HopGuiPipelineGridDelegate.java | 5 +-
.../delegates/HopGuiPipelineLogDelegate.java | 5 +-
.../hopgui/file/workflow/HopGuiWorkflowGraph.java | 2 +-
.../delegates/HopGuiWorkflowGridDelegate.java | 2 +-
.../delegates/HopGuiWorkflowLogDelegate.java | 58 +++++++++++-----------
.../delegates/HopGuiWorkflowRunDelegate.java | 10 ++--
6 files changed, 40 insertions(+), 42 deletions(-)
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
index 975c8a5..0cc10fe 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
@@ -282,8 +282,7 @@ public class HopGuiPipelineGridDelegate {
toolbar =
new ToolBar(
- pipelineGridComposite,
- SWT.BORDER | SWT.WRAP | SWT.SHADOW_OUT | SWT.LEFT |
SWT.HORIZONTAL);
+ pipelineGridComposite, SWT.WRAP | SWT.LEFT | SWT.HORIZONTAL);
FormData fdToolBar = new FormData();
fdToolBar.left = new FormAttachment(0, 0);
fdToolBar.top = new FormAttachment(0, 0);
@@ -385,7 +384,7 @@ public class HopGuiPipelineGridDelegate {
copyColumn.setAlignment(SWT.RIGHT);
columns.add(copyColumn);
- List<IEngineMetric> usedMetrics = new
ArrayList(engineMetrics.getMetricsList());
+ List<IEngineMetric> usedMetrics = new
ArrayList<>(engineMetrics.getMetricsList());
Collections.sort(
usedMetrics, (o1, o2) ->
o1.getDisplayPriority().compareTo(o2.getDisplayPriority()));
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
index 9195aac..1415850 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
@@ -110,7 +110,7 @@ public class HopGuiPipelineLogDelegate {
toolbar.setLayoutData(fd);
pipelineLogText =
- new Text(pipelineLogComposite, SWT.READ_ONLY | SWT.MULTI |
SWT.V_SCROLL | SWT.H_SCROLL);
+ new Text(pipelineLogComposite, SWT.READ_ONLY | SWT.BORDER | SWT.MULTI
| SWT.V_SCROLL | SWT.H_SCROLL);
hopGui.getProps().setLook(pipelineLogText);
FormData fdText = new FormData();
fdText.left = new FormAttachment(0, 0);
@@ -159,8 +159,7 @@ public class HopGuiPipelineLogDelegate {
private void addToolBar() {
toolbar =
new ToolBar(
- pipelineLogComposite,
- SWT.BORDER | SWT.WRAP | SWT.SHADOW_OUT | SWT.LEFT |
SWT.HORIZONTAL);
+ pipelineLogComposite, SWT.WRAP | SWT.LEFT | SWT.HORIZONTAL);
FormData fdToolBar = new FormData();
fdToolBar.left = new FormAttachment(0, 0);
fdToolBar.top = new FormAttachment(0, 0);
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
index 7274405..7c3cd56 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
@@ -3411,7 +3411,7 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
tabItemSelection = extraViewTabFolder.getSelection();
}
- workflowLogDelegate.addJobLog();
+ workflowLogDelegate.addWorkflowLog();
workflowGridDelegate.addWorkflowGrid();
if (tabItemSelection != null) {
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
index 96161e8..fbff9bd 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
@@ -165,7 +165,7 @@ public class HopGuiWorkflowGridDelegate {
};
tim.schedule( timtask, 10L, 2000L ); // refresh every 2 seconds...
- workflowGraph.workflowLogDelegate.getJobLogTab().addDisposeListener(
disposeEvent -> tim.cancel() );
+ workflowGraph.workflowLogDelegate.getWorkflowLogTab().addDisposeListener(
disposeEvent -> tim.cancel() );
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
index da07716..696cab1 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
@@ -56,13 +56,13 @@ public class HopGuiWorkflowLogDelegate {
private HopGui hopGui;
private HopGuiWorkflowGraph workflowGraph;
- private CTabItem jobLogTab;
+ private CTabItem workflowLogTab;
- public Text jobLogText;
+ private Text workflowLogText;
/** The number of lines in the log tab */
// private int textSize;
- private Composite jobLogComposite;
+ private Composite workflowLogComposite;
private ToolBar toolbar;
private GuiToolbarWidgets toolBarWidgets;
@@ -75,28 +75,28 @@ public class HopGuiWorkflowLogDelegate {
this.workflowGraph = workflowGraph;
}
- public void addJobLog() {
+ public void addWorkflowLog() {
// First, see if we need to add the extra view...
//
if (workflowGraph.extraViewComposite == null ||
workflowGraph.extraViewComposite.isDisposed()) {
workflowGraph.addExtraView();
} else {
- if (jobLogTab != null && !jobLogTab.isDisposed()) {
+ if (workflowLogTab != null && !workflowLogTab.isDisposed()) {
// just set this one active and get out...
//
- workflowGraph.extraViewTabFolder.setSelection(jobLogTab);
+ workflowGraph.extraViewTabFolder.setSelection(workflowLogTab);
return;
}
}
// Add a pipelineLogTab : display the logging...
//
- jobLogTab = new CTabItem(workflowGraph.extraViewTabFolder, SWT.NONE);
- jobLogTab.setImage(GuiResource.getInstance().getImageShowLog());
- jobLogTab.setText(BaseMessages.getString(PKG,
"WorkflowGraph.LogTab.Name"));
+ workflowLogTab = new CTabItem(workflowGraph.extraViewTabFolder, SWT.NONE);
+ workflowLogTab.setImage(GuiResource.getInstance().getImageShowLog());
+ workflowLogTab.setText(BaseMessages.getString(PKG,
"WorkflowGraph.LogTab.Name"));
- jobLogComposite = new Composite(workflowGraph.extraViewTabFolder,
SWT.NONE);
- jobLogComposite.setLayout(new FormLayout());
+ workflowLogComposite = new Composite(workflowGraph.extraViewTabFolder,
SWT.NONE);
+ workflowLogComposite.setLayout(new FormLayout());
addToolBar();
@@ -106,20 +106,20 @@ public class HopGuiWorkflowLogDelegate {
fd.right = new FormAttachment(100, 0);
toolbar.setLayoutData(fd);
- jobLogText = new Text(jobLogComposite, SWT.READ_ONLY | SWT.MULTI |
SWT.V_SCROLL | SWT.H_SCROLL);
- hopGui.getProps().setLook(jobLogText);
+ workflowLogText = new Text(workflowLogComposite, SWT.READ_ONLY |
SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+ hopGui.getProps().setLook(workflowLogText);
FormData fdText = new FormData();
fdText.left = new FormAttachment(0, 0);
fdText.right = new FormAttachment(100, 0);
fdText.top = new FormAttachment((Control) toolbar, 0);
fdText.bottom = new FormAttachment(100, 0);
- jobLogText.setLayoutData(fdText);
+ workflowLogText.setLayoutData(fdText);
// add a CR to avoid fontStyle from getting lost on macos HOP-2583
if (OsHelper.isMac()) {
- jobLogText.setText(Const.CR);
+ workflowLogText.setText(Const.CR);
}
- logBrowser = new HopGuiLogBrowser(jobLogText, workflowGraph);
+ logBrowser = new HopGuiLogBrowser(workflowLogText, workflowGraph);
logBrowser.installLogSniffer();
// If the workflow is closed, we should dispose of all the logging
information in the buffer and
@@ -132,9 +132,9 @@ public class HopGuiWorkflowLogDelegate {
}
});
- jobLogTab.setControl(jobLogComposite);
+ workflowLogTab.setControl(workflowLogComposite);
- workflowGraph.extraViewTabFolder.setSelection(jobLogTab);
+ workflowGraph.extraViewTabFolder.setSelection(workflowLogTab);
}
/**
@@ -154,7 +154,7 @@ public class HopGuiWorkflowLogDelegate {
private void addToolBar() {
toolbar =
new ToolBar(
- jobLogComposite, SWT.BORDER | SWT.WRAP | SWT.SHADOW_OUT | SWT.LEFT
| SWT.HORIZONTAL);
+ workflowLogComposite, SWT.WRAP | SWT.LEFT | SWT.HORIZONTAL);
FormData fdToolBar = new FormData();
fdToolBar.left = new FormAttachment(0, 0);
fdToolBar.top = new FormAttachment(0, 0);
@@ -169,12 +169,12 @@ public class HopGuiWorkflowLogDelegate {
}
public void clearLog() {
- if (jobLogText != null && !jobLogText.isDisposed()) {
+ if (workflowLogText != null && !workflowLogText.isDisposed()) {
// add a CR to avoid fontStyle from getting lost on macos HOP-2583
if (OsHelper.isMac()) {
- jobLogText.setText(Const.CR);
+ workflowLogText.setText(Const.CR);
} else {
- jobLogText.setText("");
+ workflowLogText.setText("");
}
}
}
@@ -196,7 +196,7 @@ public class HopGuiWorkflowLogDelegate {
toolTip =
"i18n:org.apache.hop.ui.hopgui:WorkflowLog.Button.ShowErrorLines",
image = "ui/images/filter.svg")
public void showErrors() {
- String all = jobLogText.getText();
+ String all = workflowLogText.getText();
ArrayList<String> err = new ArrayList<>();
int i = 0;
@@ -253,8 +253,8 @@ public class HopGuiWorkflowLogDelegate {
}
/** @return the workflow log tab */
- public CTabItem getJobLogTab() {
- return jobLogTab;
+ public CTabItem getWorkflowLogTab() {
+ return workflowLogTab;
}
@GuiToolbarElement(
@@ -276,14 +276,14 @@ public class HopGuiWorkflowLogDelegate {
}
public boolean hasSelectedText() {
- return jobLogText != null
- && !jobLogText.isDisposed()
- && StringUtils.isNotEmpty(jobLogText.getSelectionText());
+ return workflowLogText != null
+ && !workflowLogText.isDisposed()
+ && StringUtils.isNotEmpty(workflowLogText.getSelectionText());
}
public void copySelected() {
if (hasSelectedText()) {
-
workflowGraph.workflowClipboardDelegate.toClipboard(jobLogText.getSelectionText());
+
workflowGraph.workflowClipboardDelegate.toClipboard(workflowLogText.getSelectionText());
}
}
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowRunDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowRunDelegate.java
index 2592ba5..18cfe35 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowRunDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowRunDelegate.java
@@ -52,7 +52,7 @@ public class HopGuiWorkflowRunDelegate {
* This contains a map between the name of a workflow and the WorkflowMeta
object. If the workflow has no
* name it will be mapped under a number [1], [2] etc.
*/
- private List<WorkflowMeta> jobMap;
+ private List<WorkflowMeta> workflowMap;
/**
* @param hopGui
@@ -64,7 +64,7 @@ public class HopGuiWorkflowRunDelegate {
workflowExecutionConfiguration = new WorkflowExecutionConfiguration();
workflowExecutionConfiguration.setGatheringMetrics( true );
- jobMap = new ArrayList<>();
+ workflowMap = new ArrayList<>();
}
public void executeWorkflow( IVariables variables, WorkflowMeta
workflowMeta, String startActionName ) throws HopException {
@@ -88,7 +88,7 @@ public class HopGuiWorkflowRunDelegate {
if ( !workflowMeta.isShowDialog() || dialog.open() ) {
- workflowGraph.workflowLogDelegate.addJobLog();
+ workflowGraph.workflowLogDelegate.addWorkflowLog();
ExtensionPointHandler.callExtensionPoint( LogChannel.UI,
workflowGraph.getVariables(),
HopExtensionPoint.HopGuiWorkflowExecutionConfiguration.id,
executionConfiguration );
@@ -176,13 +176,13 @@ public class HopGuiWorkflowRunDelegate {
* @return value of workflowMap
*/
public List<WorkflowMeta> getWorkflowMap() {
- return jobMap;
+ return workflowMap;
}
/**
* @param jobMap The workflowMap to set
*/
public void setWorkflowMap( List<WorkflowMeta> jobMap ) {
- this.jobMap = jobMap;
+ this.workflowMap = jobMap;
}
}
