[incubator-hop] branch master updated: HOP-3189: switch back to message and small cleanup

[ha...@apache.org]

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 f24010f  HOP-3189: switch back to message and small cleanup
     new 8362861  Merge pull request #1011 from hansva/master
f24010f is described below

commit f24010fd80f19ef71b29451f7fd732924c1dd738
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Tue Aug 24 10:08:01 2021 +0200

    HOP-3189: switch back to message and small cleanup
---
 .../hop/workflow/actions/abort/ActionAbort.java    | 11 +++-----
 .../workflow/actions/abort/ActionAbortDialog.java  | 31 ++++++----------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java
index 5afd7c4..170c19f 100644
--- a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java
+++ b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java
@@ -31,12 +31,7 @@ import org.apache.hop.workflow.action.validator.ActionValidatorUtils;
 
 import java.util.List;
 
-/**
- * Action type to abort a workflow.
- *
- * @author Samatar
- * @since 12-02-2007
- */
+/** Action type to abort a workflow. */
 @Action(
     id = "ABORT",
     name = "i18n::ActionAbort.Name",
@@ -47,7 +42,8 @@ import java.util.List;
 public class ActionAbort extends ActionBase implements Cloneable, IAction {
   private static final Class<?> PKG = ActionAbort.class; // For Translator
 
-  @HopMetadataProperty private String messageAbort;
+  @HopMetadataProperty(key = "message")
+  private String messageAbort;
 
   public ActionAbort(String name, String description) {
     super(name, description);
@@ -63,6 +59,7 @@ public class ActionAbort extends ActionBase implements Cloneable, IAction {
     this.messageAbort = other.messageAbort;
   }
 
+  @Override
   public Object clone() {
     return new ActionAbort(this);
   }
diff --git a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
index 1aee03f..a325699 100644
--- a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
+++ b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbortDialog.java
@@ -22,38 +22,23 @@ import org.apache.hop.core.util.Utils;
 import org.apache.hop.core.variables.IVariables;
 import org.apache.hop.i18n.BaseMessages;
 import org.apache.hop.ui.core.dialog.BaseDialog;
-import org.apache.hop.workflow.WorkflowMeta;
-import org.apache.hop.workflow.action.IAction;
-import org.apache.hop.workflow.action.IActionDialog;
 import org.apache.hop.ui.core.gui.WindowProperty;
 import org.apache.hop.ui.core.widget.TextVar;
-import org.apache.hop.ui.workflow.dialog.WorkflowDialog;
-import org.apache.hop.ui.workflow.action.ActionDialog;
 import org.apache.hop.ui.pipeline.transform.BaseTransformDialog;
+import org.apache.hop.ui.workflow.action.ActionDialog;
+import org.apache.hop.ui.workflow.dialog.WorkflowDialog;
+import org.apache.hop.workflow.WorkflowMeta;
+import org.apache.hop.workflow.action.IAction;
+import org.apache.hop.workflow.action.IActionDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This dialog allows you to edit a Action Abort object.
- *
- * @author Samatar
- * @since 10-03-2007
- */
+import org.eclipse.swt.widgets.*;
+
+/** This dialog allows you to edit a Action Abort object. */
 public class ActionAbortDialog extends ActionDialog implements IActionDialog {
   private static final Class<?> PKG = ActionAbortDialog.class; // For Translator