This is an automated email from the ASF dual-hosted git repository. hansva pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/hop.git
commit 044ab597404b9a5564ad7a2c0a624ab132606ddb Merge: aa41858ced 279e9bd789 Author: Hans Van Akelyen <[email protected]> AuthorDate: Fri Apr 18 15:59:16 2025 +0200 Merge pull request #5104 from nadment/5088 Action to join parallel execution #5088 assemblies/plugins/pom.xml | 6 + docs/hop-user-manual/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/workflow/actions/join.adoc | 29 +++ .../src/main/java/org/apache/hop/core/gui/IGc.java | 1 + .../main/java/org/apache/hop/core/gui/SvgGc.java | 115 +++++------- .../java/org/apache/hop/workflow/Workflow.java | 24 ++- .../org/apache/hop/workflow/WorkflowPainter.java | 3 +- .../org/apache/hop/workflow/action/ActionBase.java | 5 + .../org/apache/hop/workflow/action/ActionMeta.java | 6 +- .../org/apache/hop/workflow/action/IAction.java | 7 + plugins/actions/join/pom.xml | 32 ++++ plugins/actions/join/src/assembly/assembly.xml | 50 +++++ .../hop/workflow/actions/join/ActionJoin.java | 154 ++++++++++++++++ .../workflow/actions/join/ActionJoinDialog.java | 139 ++++++++++++++ plugins/actions/join/src/main/resources/join.svg | 9 + .../join/messages/messages_de_DE.properties | 20 ++ .../join/messages/messages_en_US.properties | 25 +++ .../join/messages/messages_es_AR.properties | 20 ++ .../join/messages/messages_es_ES.properties | 18 ++ .../join/messages/messages_fr_FR.properties | 17 ++ .../join/messages/messages_it_IT.properties | 20 ++ .../join/messages/messages_ja_JP.properties | 20 ++ .../join/messages/messages_ko_KR.properties | 20 ++ .../join/messages/messages_nl_NL.properties | 20 ++ .../join/messages/messages_no_NO.properties | 19 ++ .../join/messages/messages_pl_PL.properties | 19 ++ .../join/messages/messages_pt_BR.properties | 20 ++ .../join/messages/messages_pt_PT.properties | 19 ++ .../join/messages/messages_zh_CN.properties | 19 ++ .../actions/join/src/main/resources/version.xml | 20 ++ .../join/src/main/samples/actions/join-action.hwf | 205 +++++++++++++++++++++ .../hop/workflow/actions/join/ActionJoinTest.java | 31 ++++ plugins/actions/pom.xml | 1 + .../org/apache/hop/ui/core/gui/GuiResource.java | 6 + .../hopgui/file/workflow/HopGuiWorkflowGraph.java | 3 +- .../org/apache/hop/ui/hopgui/shared/SwtGc.java | 119 +++++------- ui/src/main/resources/ui/images/waiting.svg | 9 + 37 files changed, 1088 insertions(+), 163 deletions(-)
