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/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 64d95959b9 Auto-distributing doesn't activate the "Save" button #3102
new 240725852b Merge pull request #3106 from nadment/3102
64d95959b9 is described below
commit 64d95959b998028864f8472883a20b223a518b89
Author: Nicolas Adment <[email protected]>
AuthorDate: Mon Jul 24 22:06:11 2023 +0200
Auto-distributing doesn't activate the "Save" button #3102
---
ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java | 7 ++++++-
.../hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java | 10 ++++++++++
.../hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java | 15 ++++++++++++---
.../hopgui/perspective/dataorch/HopGuiAbstractGraph.java | 8 ++++++++
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
index 61e29a2b2c..7e51fa1975 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
@@ -111,7 +111,6 @@ import org.eclipse.swt.custom.StackLayout;
import org.eclipse.swt.events.ShellAdapter;
import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -959,6 +958,7 @@ public class HopGui
IHopFileTypeHandler activeFileTypeHandler = getActiveFileTypeHandler();
if (activeFileTypeHandler instanceof IGraphSnapAlignDistribute) {
((IGraphSnapAlignDistribute) activeFileTypeHandler).alignLeft();
+ activeFileTypeHandler.updateGui();
}
}
@@ -974,6 +974,7 @@ public class HopGui
IHopFileTypeHandler activeFileTypeHandler = getActiveFileTypeHandler();
if (activeFileTypeHandler instanceof IGraphSnapAlignDistribute) {
((IGraphSnapAlignDistribute) activeFileTypeHandler).alignRight();
+ activeFileTypeHandler.updateGui();
}
}
@@ -989,6 +990,7 @@ public class HopGui
IHopFileTypeHandler activeFileTypeHandler = getActiveFileTypeHandler();
if (activeFileTypeHandler instanceof IGraphSnapAlignDistribute) {
((IGraphSnapAlignDistribute) activeFileTypeHandler).alignTop();
+ activeFileTypeHandler.updateGui();
}
}
@@ -1004,6 +1006,7 @@ public class HopGui
IHopFileTypeHandler activeFileTypeHandler = getActiveFileTypeHandler();
if (activeFileTypeHandler instanceof IGraphSnapAlignDistribute) {
((IGraphSnapAlignDistribute) activeFileTypeHandler).alignBottom();
+ activeFileTypeHandler.updateGui();
}
}
@@ -1019,6 +1022,7 @@ public class HopGui
IHopFileTypeHandler activeFileTypeHandler = getActiveFileTypeHandler();
if (activeFileTypeHandler instanceof IGraphSnapAlignDistribute) {
((IGraphSnapAlignDistribute)
activeFileTypeHandler).distributeHorizontal();
+ activeFileTypeHandler.updateGui();
}
}
@@ -1034,6 +1038,7 @@ public class HopGui
IHopFileTypeHandler activeFileTypeHandler = getActiveFileTypeHandler();
if (activeFileTypeHandler instanceof IGraphSnapAlignDistribute) {
((IGraphSnapAlignDistribute) activeFileTypeHandler).distributeVertical();
+ activeFileTypeHandler.updateGui();
}
}
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 8eaa4bef6d..43e1d2b8b0 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
@@ -3601,6 +3601,11 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
return pipelineMeta;
}
+
+ /**
+ * Use method hasChanged()
+ */
+ @Deprecated
public boolean hasContentChanged() {
return pipelineMeta.hasChanged();
}
@@ -3667,6 +3672,11 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
return pipelineMeta.hasChanged();
}
+ @Override
+ public void setChanged() {
+ pipelineMeta.setChanged();
+ }
+
@Override
public synchronized void save() throws HopException {
try {
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 e5e1e22e60..978c51d60a 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
@@ -2860,12 +2860,17 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
}
CanvasFacade.setData(canvas, magnification, offset, workflowMeta);
}
-
+
@Override
public boolean hasChanged() {
return workflowMeta.hasChanged();
}
+ @Override
+ public void setChanged() {
+ workflowMeta.setChanged();
+ }
+
protected void newHop() {
List<ActionMeta> selection = workflowMeta.getSelectedActions();
if (selection == null || selection.size() < 2) {
@@ -3163,6 +3168,10 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
return workflowMeta;
}
+ /**
+ * Use method hasChanged()
+ */
+ @Deprecated
public boolean hasContentChanged() {
return workflowMeta.hasChanged();
}
@@ -3635,7 +3644,7 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
// Attach a listener to notify us that the pipeline has finished.
//
- workflow.addWorkflowFinishedListener(workflow ->
HopGuiWorkflowGraph.this.jobFinished());
+ workflow.addWorkflowFinishedListener(workflow ->
HopGuiWorkflowGraph.this.workflowFinished());
// Show the execution results views
//
@@ -3688,7 +3697,7 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
}
/** This gets called at the very end, when everything is done. */
- protected void jobFinished() {
+ protected void workflowFinished() {
// Do a final check to see if it all ended...
//
if (workflow != null && workflow.isInitialized() && workflow.isFinished())
{
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopGuiAbstractGraph.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopGuiAbstractGraph.java
index 14733dd3b0..d8b5b29f76 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopGuiAbstractGraph.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/dataorch/HopGuiAbstractGraph.java
@@ -102,6 +102,7 @@ public abstract class HopGuiAbstractGraph extends
DragViewZoomBase
}
public abstract boolean hasChanged();
+ public abstract void setChanged();
@Override
public void redraw() {
@@ -213,33 +214,40 @@ public abstract class HopGuiAbstractGraph extends
DragViewZoomBase
private void snapToGrid(int size) {
createSnapAlignDistribute().snapToGrid(size);
+ setChanged();
}
public void alignLeft() {
createSnapAlignDistribute().allignleft();
+ setChanged();
}
public void alignRight() {
createSnapAlignDistribute().allignright();
+ setChanged();
}
public void alignTop() {
createSnapAlignDistribute().alligntop();
+ setChanged();
}
public void alignBottom() {
createSnapAlignDistribute().allignbottom();
+ setChanged();
}
@GuiKeyboardShortcut(alt = true, key = SWT.ARROW_RIGHT)
@GuiOsxKeyboardShortcut(alt = true, key = SWT.ARROW_RIGHT)
public void distributeHorizontal() {
createSnapAlignDistribute().distributehorizontal();
+ setChanged();
}
@GuiOsxKeyboardShortcut(alt = true, key = SWT.ARROW_UP)
public void distributeVertical() {
createSnapAlignDistribute().distributevertical();
+ setChanged();
}
/**
