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 131dfaabc9 The Save button is sometimes disabled #5974 (#6229)
131dfaabc9 is described below
commit 131dfaabc9c139c041c9d4746f3aab937e1657ca
Author: Nicolas Adment <[email protected]>
AuthorDate: Tue Dec 23 14:35:43 2025 +0100
The Save button is sometimes disabled #5974 (#6229)
---
.../hopgui/file/pipeline/HopGuiPipelineGraph.java | 2 +-
.../delegates/HopGuiPipelineHopDelegate.java | 2 +-
.../hopgui/file/workflow/HopGuiWorkflowGraph.java | 32 ++++++----------------
3 files changed, 10 insertions(+), 26 deletions(-)
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 3acdeafb58..6d2996a148 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
@@ -1587,7 +1587,7 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
} else {
noInputTransform = transformMeta;
toolTip.setText(
- "This transform doesn't pass any output to other transforms.
(except perhaps for targetted output)");
+ "This transform doesn't pass any output to other transforms.
(except perhaps for targeted output)");
showToolTip(new org.eclipse.swt.graphics.Point(real.x, real.y));
}
}
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineHopDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineHopDelegate.java
index 0cb7c00040..2dd0e7398c 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineHopDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineHopDelegate.java
@@ -78,7 +78,7 @@ public class HopGuiPipelineHopDelegate {
new int[] {pipelineMeta.indexOfPipelineHop(pipelineHopMeta)});
}
- pipelineGraph.redraw();
+ pipelineGraph.updateGui();
}
}
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 4221cfb1ac..0c4cf36960 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
@@ -1434,36 +1434,20 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
// If there is one green link: make this one red! (or
// vice-versa)
if (nr == 1) {
- ActionMeta jge =
workflowMeta.findNextAction(hopCandidate.getFromAction(), 0);
- WorkflowHopMeta other =
workflowMeta.findWorkflowHop(hopCandidate.getFromAction(), jge);
+ ActionMeta actionMeta =
workflowMeta.findNextAction(hopCandidate.getFromAction(), 0);
+ WorkflowHopMeta other =
+ workflowMeta.findWorkflowHop(hopCandidate.getFromAction(),
actionMeta);
if (other != null) {
hopCandidate.setEvaluation(!other.isEvaluation());
}
}
}
- if (checkIfHopAlreadyExists(workflowMeta, hopCandidate)) {
- boolean cancel = false;
- workflowMeta.addWorkflowHop(hopCandidate);
- WorkflowHopMeta theHopCandidate = hopCandidate;
- if (workflowMeta.hasLoop(hopCandidate.getToAction())) {
- workflowMeta.removeWorkflowHop(theHopCandidate);
- startHopAction = null;
- MessageBox mb = new MessageBox(hopGui.getActiveShell(), SWT.OK |
SWT.ICON_WARNING);
- mb.setMessage(BaseMessages.getString(PKG,
"WorkflowGraph.Dialog.HopCausesLoop.Message"));
- mb.setText(BaseMessages.getString(PKG,
"WorkflowGraph.Dialog.HopCausesLoop.Title"));
- mb.open();
- cancel = true;
- }
- if (!cancel) {
- hopGui.undoDelegate.addUndoNew(
- workflowMeta,
- new WorkflowHopMeta[] {hopCandidate},
- new int[] {workflowMeta.indexOfWorkflowHop(hopCandidate)});
- }
- clearSettings();
- redraw();
- }
+ // Stop drawing the hop candidate
+ startHopAction = null;
+
+ workflowHopDelegate.newHop(workflowMeta, hopCandidate);
+ clearSettings();
}
}