[BACKLOG-10562] Fix calls to extension points (#2897)

* [BACKLOG-10562] Call *BeforeSave/*AfterSave extension points on save

* [BACKLOG-10562] Call *BeforeClose/*AfterClose extension points on tab close

ui/src/org/pentaho/di/ui/spoon/JobFileListener.java

@@ -151,7 +151,23 @@ public boolean save( EngineMetaInterface meta, String fname, boolean export ) {
       lmeta = meta;
     }
 
-    return spoon.saveMeta( lmeta, fname );
+    try {
+      ExtensionPointHandler.callExtensionPoint( spoon.getLog(), KettleExtensionPoint.JobBeforeSave.id, lmeta );
+    } catch ( KettleException e ) {
+      // fails gracefully
+    }
+
+    boolean saveStatus = spoon.saveMeta( lmeta, fname );
+
+    if ( saveStatus ) {
+      try {
+        ExtensionPointHandler.callExtensionPoint( spoon.getLog(), KettleExtensionPoint.JobAfterSave.id, lmeta );
+      } catch ( KettleException e ) {
+        // fails gracefully
+      }
+    }
+
+    return saveStatus;
   }
 
   public void syncMetaName( EngineMetaInterface meta, String name ) {

ui/src/org/pentaho/di/ui/spoon/Spoon.java

@@ -1031,36 +1031,8 @@ public boolean closeFile( boolean force ) {
     boolean closed = true;
     EngineMetaInterface meta = getActiveMeta();
     if ( meta != null ) {
-
-      String beforeCloseId = null;
-      String afterCloseId = null;
-
-      if ( meta instanceof TransMeta ) {
-        beforeCloseId = KettleExtensionPoint.TransBeforeClose.id;
-        afterCloseId = KettleExtensionPoint.TransAfterClose.id;
-      } else if ( meta instanceof JobMeta ) {
-        beforeCloseId = KettleExtensionPoint.JobBeforeClose.id;
-        afterCloseId = KettleExtensionPoint.JobAfterClose.id;
-      }
-
-      if ( beforeCloseId != null ) {
-        try {
-          ExtensionPointHandler.callExtensionPoint( log, beforeCloseId, meta );
-        } catch ( KettleException e ) {
-          // fails gracefully but perhaps should return false?
-        }
-      }
-
       // If a transformation or job is the current active tab, close it
       closed = tabCloseSelected( force );
-
-      if ( closed && ( afterCloseId != null ) ) {
-        try {
-          ExtensionPointHandler.callExtensionPoint( log, afterCloseId, meta );
-        } catch ( KettleException e ) {
-          // fails gracefully but perhaps should return false?
-        }
-      }
     }
 
     return closed;

ui/src/org/pentaho/di/ui/spoon/TransFileListener.java

@@ -184,7 +184,7 @@ public boolean save( EngineMetaInterface meta, String fname, boolean export ) {
     }
 
     try {
-      ExtensionPointHandler.callExtensionPoint( spoon.getLog(), KettleExtensionPoint.TransBeforeClose.id, lmeta );
+      ExtensionPointHandler.callExtensionPoint( spoon.getLog(), KettleExtensionPoint.TransBeforeSave.id, lmeta );
     } catch ( KettleException e ) {
       // fails gracefully
     }
@@ -193,7 +193,7 @@ public boolean save( EngineMetaInterface meta, String fname, boolean export ) {
 
     if ( saveStatus ) {
       try {
-        ExtensionPointHandler.callExtensionPoint( spoon.getLog(), KettleExtensionPoint.TransAfterClose.id, lmeta );
+        ExtensionPointHandler.callExtensionPoint( spoon.getLog(), KettleExtensionPoint.TransAfterSave.id, lmeta );
       } catch ( KettleException e ) {
         // fails gracefully
       }

ui/src/org/pentaho/di/ui/spoon/delegates/SpoonTabsDelegate.java

@@ -38,6 +38,8 @@
 import org.pentaho.di.core.EngineMetaInterface;
 import org.pentaho.di.core.exception.KettleException;
 import org.pentaho.di.core.exception.KettleFileException;
+import org.pentaho.di.core.extension.ExtensionPointHandler;
+import org.pentaho.di.core.extension.KettleExtensionPoint;
 import org.pentaho.di.core.gui.SpoonInterface;
 import org.pentaho.di.core.vfs.KettleVFS;
 import org.pentaho.di.i18n.BaseMessages;
@@ -90,12 +92,15 @@ public boolean tabClose( TabItem item, boolean force ) throws KettleException {
     boolean canSave = true;
     for ( TabMapEntry entry : collection ) {
       if ( item.equals( entry.getTabItem() ) ) {
+        final TabItemInterface itemInterface = entry.getObject();
+        final Object managedObject = itemInterface.getManagedObject();
+
         if ( !force ) {
-          TabItemInterface itemInterface = entry.getObject();
-          if ( itemInterface.getManagedObject() != null
-            && AbstractMeta.class.isAssignableFrom( itemInterface.getManagedObject().getClass() ) ) {
-            canSave = !( (AbstractMeta) itemInterface.getManagedObject() ).hasMissingPlugins();
+          if ( managedObject != null
+            && AbstractMeta.class.isAssignableFrom( managedObject.getClass() ) ) {
+            canSave = !( (AbstractMeta) managedObject ).hasMissingPlugins();
           }
+
           if ( canSave ) {
             // Can we close this tab? Only allow users with create content perms to save
             if ( !itemInterface.canBeClosed() && createPerms ) {
@@ -113,29 +118,57 @@ public boolean tabClose( TabItem item, boolean force ) throws KettleException {
           }
         }
 
+        String beforeCloseId = null;
+        String afterCloseId = null;
+
+        if ( itemInterface instanceof TransGraph ) {
+          beforeCloseId = KettleExtensionPoint.TransBeforeClose.id;
+          afterCloseId = KettleExtensionPoint.TransAfterClose.id;
+        } else if ( itemInterface instanceof JobGraph ) {
+          beforeCloseId = KettleExtensionPoint.JobBeforeClose.id;
+          afterCloseId = KettleExtensionPoint.JobAfterClose.id;
+        }
+
+        if ( beforeCloseId != null ) {
+          try {
+            ExtensionPointHandler.callExtensionPoint( log, beforeCloseId, managedObject );
+          } catch ( KettleException e ) {
+            // prevent tab close
+            close = false;
+          }
+        }
+
         // Also clean up the log/history associated with this
         // transformation/job
         //
         if ( close ) {
-          if ( entry.getObject() instanceof TransGraph ) {
-            TransMeta transMeta = (TransMeta) entry.getObject().getManagedObject();
+          if ( itemInterface instanceof TransGraph ) {
+            TransMeta transMeta = (TransMeta) managedObject;
             spoon.delegates.trans.closeTransformation( transMeta );
             spoon.refreshTree();
             // spoon.refreshCoreObjects();
-          } else if ( entry.getObject() instanceof JobGraph ) {
-            JobMeta jobMeta = (JobMeta) entry.getObject().getManagedObject();
+          } else if ( itemInterface instanceof JobGraph ) {
+            JobMeta jobMeta = (JobMeta) managedObject;
             spoon.delegates.jobs.closeJob( jobMeta );
             spoon.refreshTree();
             // spoon.refreshCoreObjects();
-          } else if ( entry.getObject() instanceof SpoonBrowser ) {
+          } else if ( itemInterface instanceof SpoonBrowser ) {
             this.removeTab( entry );
             spoon.refreshTree();
-          } else if ( entry.getObject() instanceof Composite ) {
-            Composite comp = (Composite) entry.getObject();
+          } else if ( itemInterface instanceof Composite ) {
+            Composite comp = (Composite) itemInterface;
             if ( comp != null && !comp.isDisposed() ) {
               comp.dispose();
             }
           }
+
+          if ( afterCloseId != null ) {
+            try {
+              ExtensionPointHandler.callExtensionPoint( log, afterCloseId, managedObject );
+            } catch ( KettleException e ) {
+              // fails gracefully... what else could we do?
+            }
+          }
         }
 
         break;