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 2021/03/01 21:21:45 UTC

[incubator-hop] branch master updated: Fix workflow entry > action

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 9fcc507  Fix workflow entry > action
     new da854fd  Merge pull request #657 from nadment/HOP-TRANSLATE2
9fcc507 is described below

commit 9fcc507edb7634d4bf6a2c3eb89913d8e78bf01c
Author: nadment <na...@gmail.com>
AuthorDate: Mon Mar 1 22:10:20 2021 +0100

    Fix workflow entry > action
---
 engine/src/main/java/org/apache/hop/resource/ResourceUtil.java        | 4 ++--
 engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java        | 2 +-
 .../actions/deleteresultfilenames/src/doc/deleteresultfilenames.adoc  | 2 +-
 .../main/java/org/apache/hop/debug/action/ActionDebugLevelDialog.java | 2 +-
 .../apache/hop/ui/workflow/dialog/messages/messages_en_US.properties  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java b/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
index 59f335a..976f1af 100644
--- a/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
+++ b/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
@@ -38,7 +38,7 @@ public class ResourceUtil {
   private static final Class<?> PKG = ResourceUtil.class; // For Translator
 
   /**
-   * Serializes the referenced resource export interface (Workflow, Pipeline, Mapping, Transform, Workflow Entry, etc) to a ZIP
+   * Serializes the referenced resource export interface (Workflow, Pipeline, Mapping, Transform, Action, etc) to a ZIP
    * file.
    *
    * @param zipFilename             The ZIP file to put the content in
@@ -56,7 +56,7 @@ public class ResourceUtil {
   }
 
   /**
-   * Serializes the referenced resource export interface (Workflow, Pipeline, Mapping, Transform, Workflow Entry, etc) to a ZIP
+   * Serializes the referenced resource export interface (Workflow, Pipeline, Mapping, Transform, Action, etc) to a ZIP
    * file.
    *
    * @param zipFilename             The ZIP file to put the content in
diff --git a/engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java b/engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java
index c9f6120..48f0997 100644
--- a/engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java
+++ b/engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java
@@ -1646,7 +1646,7 @@ public class WorkflowMeta extends AbstractMeta implements Cloneable, Comparable<
   }
 
   /**
-   * Check all actions within the workflow. Each Workflow Entry has the opportunity to check their own settings.
+   * Check all actions within the workflow. Each Workflow Action has the opportunity to check their own settings.
    *
    * @param remarks       List of CheckResult remarks inserted into by each Action
    * @param only_selected true if you only want to check the selected workflows
diff --git a/plugins/actions/deleteresultfilenames/src/doc/deleteresultfilenames.adoc b/plugins/actions/deleteresultfilenames/src/doc/deleteresultfilenames.adoc
index 20c1b74..0c89c94 100644
--- a/plugins/actions/deleteresultfilenames/src/doc/deleteresultfilenames.adoc
+++ b/plugins/actions/deleteresultfilenames/src/doc/deleteresultfilenames.adoc
@@ -21,7 +21,7 @@ under the License.
 
 == Description
 
-Use this action to delete all the filenames that are in the result files list of the last workflow entry.
+Use this action to delete all the filenames that are in the result files list of the last workflow action.
 
 == Options
 
diff --git a/plugins/misc/debug/src/main/java/org/apache/hop/debug/action/ActionDebugLevelDialog.java b/plugins/misc/debug/src/main/java/org/apache/hop/debug/action/ActionDebugLevelDialog.java
index a137ec6..2f5e570 100644
--- a/plugins/misc/debug/src/main/java/org/apache/hop/debug/action/ActionDebugLevelDialog.java
+++ b/plugins/misc/debug/src/main/java/org/apache/hop/debug/action/ActionDebugLevelDialog.java
@@ -87,7 +87,7 @@ public class ActionDebugLevelDialog extends Dialog {
     formLayout.marginWidth = Const.FORM_MARGIN;
     formLayout.marginHeight = Const.FORM_MARGIN;
 
-    shell.setText( "Workflow entry debug Level" );
+    shell.setText( "Workflow action debug Level" );
     shell.setLayout( formLayout );
 
     // The name
diff --git a/ui/src/main/resources/org/apache/hop/ui/workflow/dialog/messages/messages_en_US.properties b/ui/src/main/resources/org/apache/hop/ui/workflow/dialog/messages/messages_en_US.properties
index 718efd1..effcee0 100644
--- a/ui/src/main/resources/org/apache/hop/ui/workflow/dialog/messages/messages_en_US.properties
+++ b/ui/src/main/resources/org/apache/hop/ui/workflow/dialog/messages/messages_en_US.properties
@@ -82,7 +82,7 @@ WorkflowExecutionConfigurationDialog.ParamsColumn.Value=Value
 WorkflowDialog.Draft_WorkflowStatus.Label=Draft
 WorkflowDialog.Extendeddescription.Label=Extended description\: 
 WorkflowDialog.LogConnection.Tooltip=Separate database connection that logs the actions of this workflow
-WorkflowDialog.LogTableType.Action=Workflow Entry
+WorkflowDialog.LogTableType.Action=Workflow Action
 WorkflowExecutionConfigurationDialog.Params.Label=Parameters
 WorkflowDialog.UseLogField.Tooltip=Use a separate logfield to store logging statements?
 WorkflowExecutionConfigurationDialog.SafeMode.Label=Enable safe mode