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/11/30 10:28:26 UTC
[incubator-hop] branch master updated: HOP-2152
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 f86525c HOP-2152
new e552b4a Merge pull request #425 from nadment/HOP-2152
f86525c is described below
commit f86525cda6f9d46e517346a46a9efe3cb9ec7ab3
Author: nadment <na...@gmail.com>
AuthorDate: Mon Nov 30 00:30:55 2020 +0100
HOP-2152
---
.../apache/hop/core/extension/HopExtensionPoint.java | 18 +++++++++---------
engine/src/main/java/org/apache/hop/run/HopRun.java | 2 +-
.../pipeline/delegates/HopGuiPipelineRunDelegate.java | 4 ++--
.../ui/hopgui/file/workflow/HopGuiWorkflowGraph.java | 2 +-
.../workflow/delegates/HopGuiWorkflowRunDelegate.java | 4 ++--
.../dataorch/HopDataOrchestrationPerspective.java | 4 ++--
.../dialog/PipelineExecutionConfigurationDialog.java | 4 ++--
.../pipelineexecutor/PipelineExecutorDialog.java | 2 +-
.../workflowexecutor/WorkflowExecutorDialog.java | 2 +-
.../actions/pipeline/ActionPipelineDialog.java | 2 +-
.../actions/workflow/ActionWorkflowDialog.java | 2 +-
.../dialog/WorkflowExecutionConfigurationDialog.java | 2 +-
12 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/extension/HopExtensionPoint.java b/core/src/main/java/org/apache/hop/core/extension/HopExtensionPoint.java
index c622adf..04c3403 100644
--- a/core/src/main/java/org/apache/hop/core/extension/HopExtensionPoint.java
+++ b/core/src/main/java/org/apache/hop/core/extension/HopExtensionPoint.java
@@ -55,13 +55,13 @@ public enum HopExtensionPoint {
PipelineBeforeDeleteTransforms( "Pipeline transforms about to be deleted" ),
HopGuiPipelineMetaExecutionStart( "Hop GUI initiates the execution of a pipeline (PipelineMeta)" ),
- HopUiPipelineExecutionConfiguration( "Right before Hop UI configuration of Pipeline to be executed takes place" ),
- HopUiPipelineBeforeStart( "Right before the Pipeline is started" ),
+ HopGuiPipelineExecutionConfiguration( "Right before Hop UI configuration of Pipeline to be executed takes place" ),
+ HopGuiPipelineBeforeStart( "Right before the Pipeline is started" ),
- HopUiWorkflowBeforeStart( "Right before the workflow is started" ),
+ HopGuiWorkflowBeforeStart( "Right before the workflow is started" ),
RunConfigurationSelection( "Check when run configuration is selected" ),
RunConfigurationIsRemote( "Check when run configuration is pointing to a remote server" ),
- HopUiRunConfiguration( "Send the run configuration" ),
+ HopGuiRunConfiguration( "Send the run configuration" ),
WorkflowStart( "A workflow starts" ),
WorkflowFinish( "A workflow finishes" ),
@@ -85,9 +85,9 @@ public enum HopExtensionPoint {
WorkflowGraphMouseDoubleClick( "A left or right button was double-clicked in a workflow" ),
WorkflowDialogShowRetrieveLogTableFields( "Show or retrieve the contents of the fields of a log channel on the log channel composite" ),
- WorkflowMetaLoaded( "Job metadata was loaded" ),
- HopUiWorkflowMetaExecutionStart( "Hop UI initiates the execution of a workflow (WorkflowMeta)" ),
- HopUiJobExecutionConfiguration( "Right before Hop UI configuration of workflow to be executed takes place" ),
+ WorkflowMetaLoaded( "Workflow metadata was loaded" ),
+ HopGuiWorkflowMetaExecutionStart( "Hop UI initiates the execution of a workflow (WorkflowMeta)" ),
+ HopGuiWorkflowExecutionConfiguration( "Right before Hop UI configuration of workflow to be executed takes place" ),
DatabaseConnected( "A connection to a database was made" ),
DatabaseDisconnected( "A connection to a database was terminated" ),
@@ -107,8 +107,8 @@ public enum HopExtensionPoint {
HopServerShutdown( "Right before the Hop webserver will shut down" ),
HopGuiFileOpenDialog( "Allows you to modify the file dialog before it's shown. If you want to show your own, set doIt to false (" ),
- HopGuiNewPipelineTab( "Determine the tab name of a Pipeline (HopGuiPipelineGraph)" ),
- HopGuiNewJobTab( "Determine the tab name of a workflow (HopGuiJobGraph)" ),
+ HopGuiNewPipelineTab( "Determine the tab name of a pipeline (HopGuiPipelineGraph)" ),
+ HopGuiNewWorkflowTab( "Determine the tab name of a workflow (HopGuiJobGraph)" ),
HopGuiMetadataObjectCreateBeforeDialog("A new metadata object is created. Before showing the dialog"),
HopGuiMetadataObjectCreated("A new metadata object is created"),
diff --git a/engine/src/main/java/org/apache/hop/run/HopRun.java b/engine/src/main/java/org/apache/hop/run/HopRun.java
index a779e45..497b835 100644
--- a/engine/src/main/java/org/apache/hop/run/HopRun.java
+++ b/engine/src/main/java/org/apache/hop/run/HopRun.java
@@ -251,7 +251,7 @@ public class HopRun implements Runnable, IHasHopMetadataProvider {
// Certain Hop plugins rely on this. Meh.
//
- ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopUiWorkflowBeforeStart.id, new Object[] { configuration, null, workflowMeta, null } );
+ ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopGuiWorkflowBeforeStart.id, new Object[] { configuration, null, workflowMeta, null } );
// Before running, do we print the options?
//
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineRunDelegate.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineRunDelegate.java
index 0133a5e..42d776b 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineRunDelegate.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineRunDelegate.java
@@ -211,10 +211,10 @@ public class HopGuiPipelineRunDelegate {
pipelineMeta.setClearingLog( executionConfiguration.isClearingLog() );
ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopGuiPipelineMetaExecutionStart.id, pipelineMeta );
- ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopUiPipelineExecutionConfiguration.id, executionConfiguration );
+ ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopGuiPipelineExecutionConfiguration.id, executionConfiguration );
try {
- ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopUiPipelineBeforeStart.id, new Object[] { executionConfiguration, pipelineMeta, pipelineMeta } );
+ ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopGuiPipelineBeforeStart.id, new Object[] { executionConfiguration, pipelineMeta, pipelineMeta } );
} catch ( HopException e ) {
log.logError( e.getMessage(), pipelineMeta.getFilename() );
return null;
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 6b8041d..1fe7c8b 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
@@ -3255,7 +3255,7 @@ public class HopGuiWorkflowGraph extends HopGuiAbstractGraph
// Allow plugins to change the workflow metadata
//
- ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopUiWorkflowMetaExecutionStart.id, workflowMeta );
+ ExtensionPointHandler.callExtensionPoint( log, HopExtensionPoint.HopGuiWorkflowMetaExecutionStart.id, workflowMeta );
workflow = WorkflowEngineFactory.createWorkflowEngine( executionConfiguration.getRunConfiguration(), hopGui.getMetadataProvider(), runWorkflowMeta, hopGuiLoggingObject );
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 9ea57ce..75b844d 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
@@ -97,10 +97,10 @@ public class HopGuiWorkflowRunDelegate {
workflowGraph.workflowLogDelegate.addJobLog();
- ExtensionPointHandler.callExtensionPoint( LogChannel.UI, HopExtensionPoint.HopUiJobExecutionConfiguration.id, executionConfiguration );
+ ExtensionPointHandler.callExtensionPoint( LogChannel.UI, HopExtensionPoint.HopGuiWorkflowExecutionConfiguration.id, executionConfiguration );
try {
- ExtensionPointHandler.callExtensionPoint( LogChannel.UI, HopExtensionPoint.HopUiPipelineBeforeStart.id, new Object[] { executionConfiguration, workflowMeta, workflowMeta } );
+ ExtensionPointHandler.callExtensionPoint( LogChannel.UI, HopExtensionPoint.HopGuiPipelineBeforeStart.id, new Object[] { executionConfiguration, workflowMeta, workflowMeta } );
} catch ( HopException e ) {
LogChannel.UI.logError( e.getMessage(), workflowMeta.getFilename() );
return;
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopDataOrchestrationPerspective.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopDataOrchestrationPerspective.java
index 12d046c..2a69113 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopDataOrchestrationPerspective.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopDataOrchestrationPerspective.java
@@ -416,9 +416,9 @@ public class HopDataOrchestrationPerspective implements IHopPerspective {
tabSelectionIndex = tabSelectionHistory.size() - 1;
try {
- ExtensionPointHandler.callExtensionPoint( hopGui.getLog(), HopExtensionPoint.HopGuiNewJobTab.id, jobGraph );
+ ExtensionPointHandler.callExtensionPoint( hopGui.getLog(), HopExtensionPoint.HopGuiNewWorkflowTab.id, jobGraph );
} catch ( Exception e ) {
- throw new HopException( "Error calling extension point plugin for plugin id " + HopExtensionPoint.HopGuiNewPipelineTab.id + " trying to handle a new workflow tab", e );
+ throw new HopException( "Error calling extension point plugin for plugin id " + HopExtensionPoint.HopGuiNewWorkflowTab.id + " trying to handle a new workflow tab", e );
}
jobGraph.setFocus();
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java
index 23c6e49..7a0712c 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java
@@ -194,9 +194,9 @@ public class PipelineExecutionConfigurationDialog extends ConfigurationDialog {
}
try {
- ExtensionPointHandler.callExtensionPoint( LogChannel.UI, HopExtensionPoint.HopUiRunConfiguration.id, wRunConfiguration );
+ ExtensionPointHandler.callExtensionPoint( LogChannel.UI, HopExtensionPoint.HopGuiRunConfiguration.id, wRunConfiguration );
} catch ( HopException e ) {
- hopGui.getLog().logError( "Error calling extension point with ID '" + HopExtensionPoint.HopUiRunConfiguration.id + "'", e );
+ hopGui.getLog().logError( "Error calling extension point with ID '" + HopExtensionPoint.HopGuiRunConfiguration.id + "'", e );
}
// If we don't have a run configuration from history or from a plugin,
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 94d7811..dae06b5 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
@@ -400,7 +400,7 @@ public class PipelineExecutorDialog extends BaseTransformDialog implements ITran
List<String> runConfigurations = metadataProvider.getSerializer( PipelineRunConfiguration.class ).listObjectNames();
try {
- ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopUiRunConfiguration.id, new Object[] { runConfigurations, PipelineMeta.XML_TAG } );
+ ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopGuiRunConfiguration.id, new Object[] { runConfigurations, PipelineMeta.XML_TAG } );
} catch ( HopException e ) {
// Ignore errors
}
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 587b56c..85e4b77 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
@@ -390,7 +390,7 @@ public class WorkflowExecutorDialog extends BaseTransformDialog implements ITran
List<String> runConfigurations = metadataProvider.getSerializer( WorkflowRunConfiguration.class ).listObjectNames();
try {
- ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopUiRunConfiguration.id, new Object[] { runConfigurations, WorkflowMeta.XML_TAG } );
+ ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopGuiRunConfiguration.id, new Object[] { runConfigurations, WorkflowMeta.XML_TAG } );
} catch ( HopException e ) {
// Ignore errors
}
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/actions/pipeline/ActionPipelineDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/actions/pipeline/ActionPipelineDialog.java
index 7b8977b..6eed36a 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/actions/pipeline/ActionPipelineDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/actions/pipeline/ActionPipelineDialog.java
@@ -296,7 +296,7 @@ public class ActionPipelineDialog extends ActionBaseDialog implements IActionDia
List<String> runConfigurations = this.getMetadataProvider().getSerializer( PipelineRunConfiguration.class).listObjectNames();
try {
- ExtensionPointHandler.callExtensionPoint(HopGui.getInstance().getLog(), HopExtensionPoint.HopUiRunConfiguration.id, new Object[]{runConfigurations, PipelineMeta.XML_TAG});
+ ExtensionPointHandler.callExtensionPoint(HopGui.getInstance().getLog(), HopExtensionPoint.HopGuiRunConfiguration.id, new Object[]{runConfigurations, PipelineMeta.XML_TAG});
} catch (HopException e) {
// Ignore errors
}
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/actions/workflow/ActionWorkflowDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/actions/workflow/ActionWorkflowDialog.java
index 56ced51..c2ea284 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/actions/workflow/ActionWorkflowDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/actions/workflow/ActionWorkflowDialog.java
@@ -303,7 +303,7 @@ public class ActionWorkflowDialog extends ActionBaseDialog implements IActionDia
List<String> runConfigurations = this.getMetadataProvider().getSerializer( WorkflowRunConfiguration.class ).listObjectNames();
try {
- ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopUiRunConfiguration.id, new Object[] { runConfigurations, WorkflowMeta.XML_TAG } );
+ ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopGuiRunConfiguration.id, new Object[] { runConfigurations, WorkflowMeta.XML_TAG } );
} catch ( HopException e ) {
// Ignore errors
}
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
index 055cd6f..67afba7 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
@@ -228,7 +228,7 @@ public class WorkflowExecutionConfigurationDialog extends ConfigurationDialog {
wRunConfiguration.getComboWidget().setToolTipText( BaseMessages.getString( PKG, "WorkflowExecutionConfigurationDialog.VerifyRunConfigurationName.Warning" ) );
}
try {
- ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopUiRunConfiguration.id, wRunConfiguration );
+ ExtensionPointHandler.callExtensionPoint( HopGui.getInstance().getLog(), HopExtensionPoint.HopGuiRunConfiguration.id, wRunConfiguration );
} catch ( HopException e ) {
// Ignore errors
}