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
The following commit(s) were added to refs/heads/main by this push:
new 98f3066d73 Small clean up workflow/pipeline code #6261 (#6262)
98f3066d73 is described below
commit 98f3066d73ba76cece352ec29c89f20b12d53a94
Author: Nicolas Adment <[email protected]>
AuthorDate: Mon Dec 29 11:48:21 2025 +0100
Small clean up workflow/pipeline code #6261 (#6262)
---
.../java/org/apache/hop/base/AbstractMeta.java | 10 +-
.../java/org/apache/hop/pipeline/PipelineMeta.java | 154 +++++++++------------
.../java/org/apache/hop/workflow/WorkflowMeta.java | 93 +++++--------
.../org/apache/hop/workflow/WorkflowPainter.java | 2 +-
.../hopgui/file/pipeline/HopGuiPipelineGraph.java | 10 +-
.../hopgui/file/workflow/HopGuiWorkflowGraph.java | 47 ++-----
6 files changed, 121 insertions(+), 195 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/base/AbstractMeta.java
b/engine/src/main/java/org/apache/hop/base/AbstractMeta.java
index 05998d089f..ea932b5ccc 100644
--- a/engine/src/main/java/org/apache/hop/base/AbstractMeta.java
+++ b/engine/src/main/java/org/apache/hop/base/AbstractMeta.java
@@ -1067,14 +1067,13 @@ public abstract class AbstractMeta
maxUndo = Const.MAX_UNDO;
clearUndo();
clearChanged();
- setChanged(false);
}
@Override
public void clearChanged() {
changedNotes = false;
- for (int i = 0; i < nrNotes(); i++) {
- getNote(i).setChanged(false);
+ for (NotePadMeta note : notes) {
+ note.setChanged(false);
}
changedFlag.clearChanged();
fireContentChangedListeners(false);
@@ -1125,10 +1124,7 @@ public abstract class AbstractMeta
@Override
public boolean hasChanged() {
- if (changedFlag.hasChanged()) {
- return true;
- }
- return haveNotesChanged();
+ return changedFlag.hasChanged() || haveNotesChanged();
}
/**
diff --git a/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
b/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
index 4c30058e92..3315f1ec0f 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
@@ -192,7 +192,7 @@ public class PipelineMeta extends AbstractMeta
}
/**
- * Compares two pipeline on name and filename. The comparison algorithm is
as follows:<br>
+ * Compares two pipelines on name and filename. The comparison algorithm is
as follows:<br>
*
* <ol>
* <li>The first pipeline's filename is checked first; if it has none, the
pipeline is generated
@@ -670,12 +670,10 @@ public class PipelineMeta extends AbstractMeta
* @return The hop or null if no hop was found.
*/
public PipelineHopMeta findPipelineHopFrom(TransformMeta fromTransform) {
- int i;
- for (i = 0; i < nrPipelineHops(); i++) {
- PipelineHopMeta hi = getPipelineHop(i);
- if (hi.getFromTransform() != null
- && hi.getFromTransform().equals(fromTransform)) { // return the first
- return hi;
+ for (PipelineHopMeta hop : hops) {
+ if (hop.getFromTransform() != null
+ && hop.getFromTransform().equals(fromTransform)) { // return the
first
+ return hop;
}
}
return null;
@@ -719,14 +717,13 @@ public class PipelineMeta extends AbstractMeta
*/
public PipelineHopMeta findPipelineHop(
TransformMeta from, TransformMeta to, boolean disabledToo) {
- for (int i = 0; i < nrPipelineHops(); i++) {
- PipelineHopMeta hi = getPipelineHop(i);
- if ((hi.isEnabled() || disabledToo)
- && hi.getFromTransform() != null
- && hi.getToTransform() != null
- && hi.getFromTransform().equals(from)
- && hi.getToTransform().equals(to)) {
- return hi;
+ for (PipelineHopMeta hop : hops) {
+ if ((hop.isEnabled() || disabledToo)
+ && hop.getFromTransform() != null
+ && hop.getToTransform() != null
+ && hop.getFromTransform().equals(from)
+ && hop.getToTransform().equals(to)) {
+ return hop;
}
}
return null;
@@ -739,12 +736,10 @@ public class PipelineMeta extends AbstractMeta
* @return The hop or null if no hop was found.
*/
public PipelineHopMeta findPipelineHopTo(TransformMeta toTransform) {
- int i;
- for (i = 0; i < nrPipelineHops(); i++) {
- PipelineHopMeta hi = getPipelineHop(i);
- if (hi.getToTransform() != null
- && hi.getToTransform().equals(toTransform)) { // Return the first!
- return hi;
+ for (PipelineHopMeta hop : hops) {
+ if (hop.getToTransform() != null
+ && hop.getToTransform().equals(toTransform)) { // Return the first!
+ return hop;
}
}
return null;
@@ -841,7 +836,7 @@ public class PipelineMeta extends AbstractMeta
}
/**
- * Find the the number of informational transforms for a certain transform.
+ * Find the number of informational transforms for a certain transform.
*
* @param transformMeta The transform
* @return The number of informational transforms found.
@@ -853,18 +848,17 @@ public class PipelineMeta extends AbstractMeta
int count = 0;
- for (int i = 0; i < nrPipelineHops(); i++) { // Look at all the hops
-
- PipelineHopMeta hi = getPipelineHop(i);
- if (hi == null || hi.getToTransform() == null) {
+ // Look at all the hops
+ for (PipelineHopMeta hop : hops) {
+ if (hop == null || hop.getToTransform() == null) {
LogChannel.GENERAL.logError(
BaseMessages.getString(PKG,
"PipelineMeta.Log.DestinationOfHopCannotBeNull"));
}
- if (hi != null
- && hi.getToTransform() != null
- && hi.isEnabled()
- && hi.getToTransform().equals(transformMeta)
- && isTransformInformative(transformMeta, hi.getFromTransform())) {
+ if (hop != null
+ && hop.getToTransform() != null
+ && hop.isEnabled()
+ && hop.getToTransform().equals(transformMeta)
+ && isTransformInformative(transformMeta, hop.getFromTransform())) {
// Check if this previous transform isn't informative
(StreamValueLookup)
// We don't want fields from this stream to show up!
count++;
@@ -896,11 +890,10 @@ public class PipelineMeta extends AbstractMeta
*/
public IRowMeta getPrevInfoFields(IVariables variables, TransformMeta
transformMeta)
throws HopTransformException {
- for (int i = 0; i < nrPipelineHops(); i++) { // Look at all the hops
- PipelineHopMeta hi = getPipelineHop(i);
-
- if (hi.isEnabled() && hi.getToTransform().equals(transformMeta)) {
- TransformMeta infoTransform = hi.getFromTransform();
+ // Look at all the hops
+ for (PipelineHopMeta hop : hops) {
+ if (hop.isEnabled() && hop.getToTransform().equals(transformMeta)) {
+ TransformMeta infoTransform = hop.getFromTransform();
if (isTransformInformative(transformMeta, infoTransform)) {
IRowMeta row = getPrevTransformFields(variables, infoTransform);
return getThisTransformFields(variables, infoTransform,
transformMeta, row);
@@ -922,10 +915,10 @@ public class PipelineMeta extends AbstractMeta
previousTransformCache.get(getTransformMetaCacheKey(transformMeta,
true));
if (prevTransforms == null) {
prevTransforms = new ArrayList<>();
- for (int i = 0; i < nrPipelineHops(); i++) { // Look at all the hops
- PipelineHopMeta hopMeta = getPipelineHop(i);
- if (hopMeta.isEnabled() &&
hopMeta.getToTransform().equals(transformMeta)) {
- prevTransforms.add(hopMeta.getFromTransform());
+ // Look at all the hops
+ for (PipelineHopMeta hop : hops) {
+ if (hop.isEnabled() && hop.getToTransform().equals(transformMeta)) {
+ prevTransforms.add(hop.getFromTransform());
}
}
}
@@ -979,9 +972,8 @@ public class PipelineMeta extends AbstractMeta
public List<TransformMeta> findNextTransforms(
TransformMeta transformMeta, boolean includeDisabled) {
List<TransformMeta> nextTransforms = new ArrayList<>();
- for (int i = 0; i < nrPipelineHops(); i++) { // Look at all the hops
-
- PipelineHopMeta hop = getPipelineHop(i);
+ // Look at all the hops
+ for (PipelineHopMeta hop : hops) {
if ((hop.isEnabled() || includeDisabled) &&
hop.getFromTransform().equals(transformMeta)) {
nextTransforms.add(hop.getToTransform());
}
@@ -1035,14 +1027,12 @@ public class PipelineMeta extends AbstractMeta
* @return true if the transform is part of a hop.
*/
public boolean partOfPipelineHop(TransformMeta transformMeta) {
- int i;
- for (i = 0; i < nrPipelineHops(); i++) {
- PipelineHopMeta hi = getPipelineHop(i);
- if (hi.getFromTransform() == null || hi.getToTransform() == null) {
+ for (PipelineHopMeta hop : hops) {
+ if (hop.getFromTransform() == null || hop.getToTransform() == null) {
return false;
}
- if (hi.getFromTransform().equals(transformMeta)
- || hi.getToTransform().equals(transformMeta)) {
+ if (hop.getFromTransform().equals(transformMeta)
+ || hop.getToTransform().equals(transformMeta)) {
return true;
}
}
@@ -2024,14 +2014,14 @@ public class PipelineMeta extends AbstractMeta
changedTransforms = false;
changedHops = false;
- for (int i = 0; i < nrTransforms(); i++) {
- getTransform(i).setChanged(false);
- if (getTransform(i).getTransformPartitioningMeta() != null) {
- getTransform(i).getTransformPartitioningMeta().hasChanged(false);
+ for (TransformMeta transform : transforms) {
+ transform.setChanged(false);
+ if (transform.getTransformPartitioningMeta() != null) {
+ transform.getTransformPartitioningMeta().hasChanged(false);
}
}
- for (int i = 0; i < nrPipelineHops(); i++) {
- getPipelineHop(i).setChanged(false);
+ for (PipelineHopMeta hop : hops) {
+ hop.setChanged(false);
}
super.clearChanged();
@@ -2052,12 +2042,12 @@ public class PipelineMeta extends AbstractMeta
return true;
}
- for (int i = 0; i < nrTransforms(); i++) {
- if (getTransform(i).hasChanged()) {
+ for (TransformMeta transform : transforms) {
+ if (transform.hasChanged()) {
return true;
}
- if (getTransform(i).getTransformPartitioningMeta() != null
- && getTransform(i).getTransformPartitioningMeta().hasChanged()) {
+ if (transform.getTransformPartitioningMeta() != null
+ && transform.getTransformPartitioningMeta().hasChanged()) {
return true;
}
}
@@ -2074,9 +2064,8 @@ public class PipelineMeta extends AbstractMeta
return true;
}
- for (int i = 0; i < nrPipelineHops(); i++) {
- PipelineHopMeta hi = getPipelineHop(i);
- if (hi.hasChanged()) {
+ for (PipelineHopMeta hop : hops) {
+ if (hop.hasChanged()) {
return true;
}
}
@@ -2188,14 +2177,11 @@ public class PipelineMeta extends AbstractMeta
/** Mark all transforms in the pipeline as selected. */
public void selectAll() {
- int i;
- for (i = 0; i < nrTransforms(); i++) {
- TransformMeta transformMeta = getTransform(i);
- transformMeta.setSelected(true);
+ for (TransformMeta transform : transforms) {
+ transform.setSelected(true);
}
- for (i = 0; i < nrNotes(); i++) {
- NotePadMeta ni = getNote(i);
- ni.setSelected(true);
+ for (NotePadMeta note : getNotes()) {
+ note.setSelected(true);
}
setChanged();
@@ -2204,14 +2190,11 @@ public class PipelineMeta extends AbstractMeta
/** Clear the selection of all transforms. */
public void unselectAll() {
- int i;
- for (i = 0; i < nrTransforms(); i++) {
- TransformMeta transformMeta = getTransform(i);
- transformMeta.setSelected(false);
+ for (TransformMeta transform : transforms) {
+ transform.setSelected(false);
}
- for (i = 0; i < nrNotes(); i++) {
- NotePadMeta ni = getNote(i);
- ni.setSelected(false);
+ for (NotePadMeta note : getNotes()) {
+ note.setSelected(false);
}
}
@@ -2228,7 +2211,7 @@ public class PipelineMeta extends AbstractMeta
points.add(new Point(p.x, p.y)); // explicit copy of location
}
- return points.toArray(new Point[points.size()]);
+ return points.toArray(new Point[0]);
}
/**
@@ -2244,7 +2227,7 @@ public class PipelineMeta extends AbstractMeta
points.add(new Point(p.x, p.y)); // explicit copy of location
}
- return points.toArray(new Point[points.size()]);
+ return points.toArray(new Point[0]);
}
/**
@@ -2411,8 +2394,7 @@ public class PipelineMeta extends AbstractMeta
// Normal transforms
//
List<TransformMeta> previousTransforms =
findPreviousTransforms(startTransform, false);
- for (int i = 0; i < previousTransforms.size(); i++) {
- TransformMeta transformMeta = previousTransforms.get(i);
+ for (TransformMeta transformMeta : previousTransforms) {
if (transformMeta.equals(transformToFind)) {
loopCache.put(key, true);
return true;
@@ -2428,8 +2410,7 @@ public class PipelineMeta extends AbstractMeta
// Info transforms
List<TransformMeta> infoTransforms =
findPreviousTransforms(startTransform, true);
- for (int i = 0; i < infoTransforms.size(); i++) {
- TransformMeta transformMeta = infoTransforms.get(i);
+ for (TransformMeta transformMeta : infoTransforms) {
if (transformMeta.equals(transformToFind)) {
loopCache.put(key, true);
return true;
@@ -2748,11 +2729,10 @@ public class PipelineMeta extends AbstractMeta
*/
public String getSqlStatementsString(IVariables variables) throws
HopTransformException {
StringBuilder sql = new StringBuilder();
- List<SqlStatement> stats = getSqlStatements(variables);
- for (int i = 0; i < stats.size(); i++) {
- SqlStatement stat = stats.get(i);
- if (!stat.hasError() && stat.hasSql()) {
- sql.append(stat.getSql());
+ List<SqlStatement> statements = getSqlStatements(variables);
+ for (SqlStatement statement : statements) {
+ if (!statement.hasError() && statement.hasSql()) {
+ sql.append(statement.getSql());
}
}
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 54ea897961..dd0f28aeaa 100644
--- a/engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java
+++ b/engine/src/main/java/org/apache/hop/workflow/WorkflowMeta.java
@@ -215,17 +215,16 @@ public class WorkflowMeta extends AbstractMeta
* @return the start
*/
public ActionMeta getStart() {
- for (int i = 0; i < nrActions(); i++) {
- ActionMeta cge = getAction(i);
- if (cge.isStart()) {
- return cge;
+ for (ActionMeta action : workflowActions) {
+ if (action.isStart()) {
+ return action;
}
}
return null;
}
/**
- * Compares two workflow on name, filename, etc. The comparison algorithm is
as follows:<br>
+ * Compares two workflows on name, filename, etc. The comparison algorithm
is as follows:<br>
*
* <ol>
* <li>The first workflow's filename is checked first; if it has none, the
workflow is created.
@@ -341,8 +340,7 @@ public class WorkflowMeta extends AbstractMeta
changedActions = false;
changedHops = false;
- for (int i = 0; i < nrActions(); i++) {
- ActionMeta action = getAction(i);
+ for (ActionMeta action : workflowActions) {
action.setChanged(false);
}
for (WorkflowHopMeta hop : workflowHops) {
@@ -359,14 +357,7 @@ public class WorkflowMeta extends AbstractMeta
*/
@Override
public boolean hasChanged() {
- if (super.hasChanged()) {
- return true;
- }
-
- if (haveActionsChanged()) {
- return true;
- }
- return haveWorkflowHopsChanged();
+ return super.hasChanged() || haveActionsChanged() ||
haveWorkflowHopsChanged();
}
/**
@@ -791,8 +782,7 @@ public class WorkflowMeta extends AbstractMeta
* @return The ActionMeta or null if nothing was found!
*/
public ActionMeta findAction(String name) {
- for (int i = 0; i < nrActions(); i++) {
- ActionMeta action = getAction(i);
+ for (ActionMeta action : workflowActions) {
if (action.getName().equalsIgnoreCase(name)) {
return action;
}
@@ -1176,14 +1166,11 @@ public class WorkflowMeta extends AbstractMeta
/** Select all. */
public void selectAll() {
- int i;
- for (i = 0; i < nrActions(); i++) {
- ActionMeta action = getAction(i);
+ for (ActionMeta action : workflowActions) {
action.setSelected(true);
}
- for (i = 0; i < nrNotes(); i++) {
- NotePadMeta ni = getNote(i);
- ni.setSelected(true);
+ for (NotePadMeta note : getNotes()) {
+ note.setSelected(true);
}
setChanged();
notifyObservers("refreshGraph");
@@ -1191,14 +1178,11 @@ public class WorkflowMeta extends AbstractMeta
/** Unselect all. */
public void unselectAll() {
- int i;
- for (i = 0; i < nrActions(); i++) {
- ActionMeta action = getAction(i);
+ for (ActionMeta action : workflowActions) {
action.setSelected(false);
}
- for (i = 0; i < nrNotes(); i++) {
- NotePadMeta ni = getNote(i);
- ni.setSelected(false);
+ for (NotePadMeta note : getNotes()) {
+ note.setSelected(false);
}
}
@@ -1210,8 +1194,7 @@ public class WorkflowMeta extends AbstractMeta
public Point getMaximum() {
int maxx = 0;
int maxy = 0;
- for (int i = 0; i < nrActions(); i++) {
- ActionMeta action = getAction(i);
+ for (ActionMeta action : workflowActions) {
Point loc = action.getLocation();
if (loc.x > maxx) {
maxx = loc.x;
@@ -1220,14 +1203,13 @@ public class WorkflowMeta extends AbstractMeta
maxy = loc.y;
}
}
- for (int i = 0; i < nrNotes(); i++) {
- NotePadMeta ni = getNote(i);
- Point loc = ni.getLocation();
- if (loc.x + ni.width > maxx) {
- maxx = loc.x + ni.width;
+ for (NotePadMeta note : getNotes()) {
+ Point loc = note.getLocation();
+ if (loc.x + note.width > maxx) {
+ maxx = loc.x + note.width;
}
- if (loc.y + ni.height > maxy) {
- maxy = loc.y + ni.height;
+ if (loc.y + note.height > maxy) {
+ maxy = loc.y + note.height;
}
}
@@ -1242,9 +1224,8 @@ public class WorkflowMeta extends AbstractMeta
public Point getMinimum() {
int minx = Integer.MAX_VALUE;
int miny = Integer.MAX_VALUE;
- for (int i = 0; i < nrActions(); i++) {
- ActionMeta actionMeta = getAction(i);
- Point loc = actionMeta.getLocation();
+ for (ActionMeta action : workflowActions) {
+ Point loc = action.getLocation();
if (loc.x < minx) {
minx = loc.x;
}
@@ -1252,9 +1233,8 @@ public class WorkflowMeta extends AbstractMeta
miny = loc.y;
}
}
- for (int i = 0; i < nrNotes(); i++) {
- NotePadMeta notePadMeta = getNote(i);
- Point loc = notePadMeta.getLocation();
+ for (NotePadMeta note : getNotes()) {
+ Point loc = note.getLocation();
if (loc.x < minx) {
minx = loc.x;
}
@@ -1346,9 +1326,9 @@ public class WorkflowMeta extends AbstractMeta
* @return the action copy
*/
public ActionMeta findStart() {
- for (int i = 0; i < nrActions(); i++) {
- if (getAction(i).isStart()) {
- return getAction(i);
+ for (ActionMeta actionMeta : workflowActions) {
+ if (actionMeta.isStart()) {
+ return actionMeta;
}
}
return null;
@@ -1571,9 +1551,8 @@ public class WorkflowMeta extends AbstractMeta
return true;
}
- for (int i = 0; i < nrActions(); i++) {
- ActionMeta action = getAction(i);
- if (action.hasChanged()) {
+ for (ActionMeta actionMeta : workflowActions) {
+ if (actionMeta.hasChanged()) {
return true;
}
}
@@ -1590,10 +1569,9 @@ public class WorkflowMeta extends AbstractMeta
return true;
}
- for (WorkflowHopMeta hi : workflowHops) {
- // Look at all the hops
-
- if (hi.hasChanged()) {
+ // Look at all the hops
+ for (WorkflowHopMeta hop : workflowHops) {
+ if (hop.hasChanged()) {
return true;
}
}
@@ -1813,11 +1791,8 @@ public class WorkflowMeta extends AbstractMeta
*/
public List<ResourceReference> getResourceDependencies(IVariables variables)
{
List<ResourceReference> resourceReferences = new ArrayList<>();
- ActionMeta copy = null;
- IAction action = null;
- for (int i = 0; i < workflowActions.size(); i++) {
- copy = workflowActions.get(i); // get the action copy
- action = copy.getAction();
+ for (ActionMeta actionMeta : workflowActions) {
+ IAction action = actionMeta.getAction();
resourceReferences.addAll(action.getResourceDependencies(variables,
this));
}
diff --git a/engine/src/main/java/org/apache/hop/workflow/WorkflowPainter.java
b/engine/src/main/java/org/apache/hop/workflow/WorkflowPainter.java
index 5ee7ce74bf..60ea1d2977 100644
--- a/engine/src/main/java/org/apache/hop/workflow/WorkflowPainter.java
+++ b/engine/src/main/java/org/apache/hop/workflow/WorkflowPainter.java
@@ -97,7 +97,7 @@ public class WorkflowPainter extends
BasePainter<WorkflowHopMeta, ActionMeta> {
gc.setBackground(EColor.BACKGROUND);
gc.fillRectangle(0, 0, area.x, area.y);
- // Draw the pipeline onto the image
+ // Draw the workflow onto the image
//
gc.setAlpha(255);
gc.setTransform((float) offset.x, (float) offset.y, magnification);
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
index 6d2996a148..b72760a155 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
@@ -2629,8 +2629,7 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
boolean hasLoop = false;
- for (int i = 0; i < pipelineMeta.nrPipelineHops(); i++) {
- PipelineHopMeta hop = pipelineMeta.getPipelineHop(i);
+ for (PipelineHopMeta hop : pipelineMeta.getPipelineHops()) {
if (list.contains(hop.getFromTransform()) &&
list.contains(hop.getToTransform())) {
PipelineHopMeta before = hop.clone();
@@ -5127,6 +5126,8 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
toolBarWidgets.enableToolbarItem(
TOOLBAR_ITEM_REDO_ID, pipelineMeta.viewNextUndo() != null);
+ // Enable/disable the execution toolbar buttons
+ //
boolean running = isRunning();
boolean paused = running && pipeline.isPaused();
toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_START, !running ||
paused);
@@ -5136,7 +5137,7 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
hopGui.setUndoMenu(pipelineMeta);
hopGui.handleFileCapabilities(fileType,
pipelineMeta.hasChanged(), running, paused);
- // Enable the align/distribute toolbar menus if one or more
transforms are selected.
+ // Enable the align/distribute menus if one or more transforms
are selected.
//
super.enableSnapAlignDistributeMenuItems(
fileType, !pipelineMeta.getSelectedTransforms().isEmpty());
@@ -5148,7 +5149,8 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
HopGuiExtensionPoint.HopGuiPipelineGraphUpdateGui.id,
this);
} catch (Exception xe) {
- LogChannel.UI.logError("Error handling extension point
'HopGuiFileOpenDialog'", xe);
+ LogChannel.UI.logError(
+ "Error handling extension point
'HopGuiPipelineGraphUpdateGui'", xe);
}
perspective.updateTabItem(this);
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 0c4cf36960..6a62eca7f4 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
@@ -196,21 +196,6 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
public static final String TOOLBAR_ITEM_UNDO_ID =
"HopGuiWorkflowGraph-ToolBar-10100-Undo";
public static final String TOOLBAR_ITEM_REDO_ID =
"HopGuiWorkflowGraph-ToolBar-10110-Redo";
- public static final String TOOLBAR_ITEM_SNAP_TO_GRID =
- "HopGuiWorkflowGraph-ToolBar-10190-Snap-To-Grid";
- public static final String TOOLBAR_ITEM_ALIGN_LEFT =
- "HopGuiWorkflowGraph-ToolBar-10200-Align-Left";
- public static final String TOOLBAR_ITEM_ALIGN_RIGHT =
- "HopGuiWorkflowGraph-ToolBar-10210-Align-Right";
- public static final String TOOLBAR_ITEM_ALIGN_TOP =
- "HopGuiWorkflowGraph-ToolBar-10250-Align-Ttop";
- public static final String TOOLBAR_ITEM_ALIGN_BOTTOM =
- "HopGuiWorkflowGraph-ToolBar-10260-Align-Bottom";
- public static final String TOOLBAR_ITEM_DISTRIBUTE_HORIZONTALLY =
- "HopGuiWorkflowGraph-ToolBar-10300-Distribute-Horizontally";
- public static final String TOOLBAR_ITEM_DISTRIBUTE_VERTICALLY =
- "HopGuiWorkflowGraph-ToolBar-10310-Distribute-Vertically";
-
public static final String TOOLBAR_ITEM_SHOW_EXECUTION_RESULTS =
"HopGuiWorkflowGraph-ToolBar-10400-Execution-Results";
@@ -1318,25 +1303,25 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
// Are we creating a new hop with the middle button or pressing SHIFT?
//
- ActionMeta actionCopy = workflowMeta.getAction(real.x, real.y, iconSize);
+ ActionMeta actionMeta = workflowMeta.getAction(real.x, real.y, iconSize);
endHopLocation = new Point(real.x, real.y);
- if (actionCopy != null
- && ((startHopAction != null && !startHopAction.equals(actionCopy))
- || (endHopAction != null && !endHopAction.equals(actionCopy)))) {
+ if (actionMeta != null
+ && ((startHopAction != null && !startHopAction.equals(actionMeta))
+ || (endHopAction != null && !endHopAction.equals(actionMeta)))) {
if (hopCandidate == null) {
// See if the transform accepts input. If not, we can't create a new
hop...
//
if (startHopAction != null) {
- if (!actionCopy.isStart()) {
- hopCandidate = new WorkflowHopMeta(startHopAction, actionCopy);
+ if (!actionMeta.isStart()) {
+ hopCandidate = new WorkflowHopMeta(startHopAction, actionMeta);
endHopLocation = null;
} else {
- noInputAction = actionCopy;
+ noInputAction = actionMeta;
toolTip.setText("The start action can only be used at the start
of a Workflow");
- showToolTip(new org.eclipse.swt.graphics.Point(real.x, real.y));
+ showToolTip(new org.eclipse.swt.graphics.Point(event.x,
event.y));
}
} else if (endHopAction != null) {
- hopCandidate = new WorkflowHopMeta(actionCopy, endHopAction);
+ hopCandidate = new WorkflowHopMeta(actionMeta, endHopAction);
endHopLocation = null;
}
}
@@ -3329,20 +3314,8 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
toolBarWidgets.enableToolbarItem(
TOOLBAR_ITEM_REDO_ID, workflowMeta.viewNextUndo() != null);
- // Enable/disable the align/distribute toolbar buttons
+ // Enable/disable the execution toolbar buttons
//
- boolean selectedAction =
!workflowMeta.getSelectedActions().isEmpty();
- toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_SNAP_TO_GRID,
selectedAction);
-
- boolean selectedActions =
workflowMeta.getSelectedActions().size() > 1;
- toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_ALIGN_LEFT,
selectedActions);
- toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_ALIGN_RIGHT,
selectedActions);
- toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_ALIGN_TOP,
selectedActions);
- toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_ALIGN_BOTTOM,
selectedActions);
- toolBarWidgets.enableToolbarItem(
- TOOLBAR_ITEM_DISTRIBUTE_HORIZONTALLY, selectedActions);
-
toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_DISTRIBUTE_VERTICALLY,
selectedActions);
-
boolean running = isRunning() && !workflow.isStopped();
toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_START, !running);
toolBarWidgets.enableToolbarItem(TOOLBAR_ITEM_STOP, running);
