[incubator-hop] branch master updated: HOP-2114: Cannot delete selected note with menu Edit > Delete in workflow or pipeline. (#381)

[hansva]

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 ae77d69  HOP-2114: Cannot delete selected note with menu Edit > Delete 
in workflow or pipeline. (#381)
ae77d69 is described below

commit ae77d69bca98076ea7277c4fc74b675055cd3a4c
Author: Mark Hall <mh...@waikato.ac.nz>
AuthorDate: Mon Nov 16 20:26:10 2020 +1300

    HOP-2114: Cannot delete selected note with menu Edit > Delete in workflow 
or pipeline. (#381)
---
 .../hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java       | 10 +++++++---
 .../pipeline/delegates/HopGuiPipelineTransformDelegate.java    |  3 +++
 2 files changed, 10 insertions(+), 3 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 199b86d..4e5ba90 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
@@ -2684,7 +2684,7 @@ public class HopGuiPipelineGraph extends 
HopGuiAbstractGraph
 
   public void delSelected( TransformMeta transformMeta ) {
     List<TransformMeta> selection = pipelineMeta.getSelectedTransforms();
-    if ( currentTransform == null && transformMeta == null && 
selection.isEmpty() ) {
+    if ( currentTransform == null && transformMeta == null && 
selection.isEmpty() && pipelineMeta.getSelectedNotes().isEmpty() ) {
       return; // nothing to do
     }
     if ( transformMeta != null && selection.size() == 0 ) {
@@ -2699,8 +2699,12 @@ public class HopGuiPipelineGraph extends 
HopGuiAbstractGraph
       }
     }
 
-    pipelineTransformDelegate.delTransforms( pipelineMeta, selection );
-    notePadDelegate.deleteNotes( pipelineMeta, pipelineMeta.getSelectedNotes() 
);
+    if ( selection.size() > 0 ) {
+      pipelineTransformDelegate.delTransforms(pipelineMeta, selection);
+    }
+    if ( pipelineMeta.getSelectedNotes().size() > 0 ) {
+      notePadDelegate.deleteNotes( pipelineMeta, 
pipelineMeta.getSelectedNotes() );
+    }
   }
 
   public void editDescription( TransformMeta transformMeta ) {
diff --git 
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
 
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
index 168fca7..22dad87 100644
--- 
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
+++ 
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineTransformDelegate.java
@@ -438,6 +438,9 @@ public class HopGuiPipelineTransformDelegate {
   }
 
   public void delTransforms( PipelineMeta pipelineMeta, List<TransformMeta> 
transforms ) {
+    if ( transforms == null || transforms.size() == 0 ) {
+      return; // nothing to do
+    }
     try {
       ExtensionPointHandler.callExtensionPoint( hopGui.getLog(), 
HopExtensionPoint.PipelineBeforeDeleteTransforms.id, transforms );
     } catch ( HopException e ) {