Using AfterBuildActionHook rather than TaskListener

onepiec1 · Jun 2, 2019 · cee89d4 · cee89d4
1 parent 95dc440
commit cee89d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...y/gradle.htmlui/test/unit/src/org/netbeans/modules/gradle/htmlui/CreateArchetypeTest.java b/...y/gradle.htmlui/test/unit/src/org/netbeans/modules/gradle/htmlui/CreateArchetypeTest.java
@@ -33,11 +33,11 @@
 import org.netbeans.api.project.ui.OpenProjects;
 import org.netbeans.junit.NbModuleSuite;
 import org.netbeans.junit.NbTestCase;
+import org.netbeans.modules.gradle.spi.actions.AfterBuildActionHook;
 import org.netbeans.spi.project.ActionProvider;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.filesystems.LocalFileSystem;
-import org.openide.util.TaskListener;
 import org.openide.util.lookup.Lookups;
 
 public class CreateArchetypeTest extends NbTestCase {
@@ -136,7 +136,7 @@ public void testCreateFromArchetype() throws Exception {
 
     protected void invokeCommand(ActionProvider actions, String cmd, Project prj) throws IllegalArgumentException, InterruptedException {
         CountDownLatch waiter = new CountDownLatch(1);
-        TaskListener notifier = (t) -> {
+        AfterBuildActionHook notifier = (action, context, res, out) -> {
             waiter.countDown();
         };
         actions.invokeAction(cmd, Lookups.fixed(prj, notifier));

diff --git a/groovy/gradle/arch.xml b/groovy/gradle/arch.xml
@@ -878,7 +878,7 @@ publishPlugins&lt;/args&gt;
          When calling 
          <a href="@org-netbeans-modules-projectapi@/org/netbeans/spi/project/ActionProvider.html">
          ActionProvider</a><code>.invokeAction(name, lookup)</code>
-         an instance of <a href="@org-openide-util@/org/openide/util/TaskListener.html">TaskListener</a>
+         an instance of <a href="@TOP@/org/netbeans/modules/gradle/spi/actions/AfterBuildActionHook.html">AfterBuildActionHook</a>
          can be placed into <code>lookup</code>. It is then notified when the
          execution of the action is finished. Useful when writing tests.
      </p>

diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java b/groovy/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
@@ -85,7 +85,6 @@
 import org.openide.util.BaseUtilities;
 import org.openide.util.ContextAwareAction;
 import org.openide.util.NbBundle.Messages;
-import org.openide.util.TaskListener;
 import org.openide.util.actions.Presenter;
 import org.openide.util.lookup.Lookups;
 import org.openide.util.lookup.ProxyLookup;
@@ -251,8 +250,8 @@ private static void invokeProjectAction(final Project project, final ActionMappi
                     prj.reloadProject(true, maxQualily, reloadArgs);
                 }
                 project.getLookup().lookup(AfterBuildActionHook.class).afterAction(action, outerCtx, task.result(), out1);
-                for (TaskListener l : context.lookupAll(TaskListener.class)) {
-                    l.taskFinished(t);
+                for (AfterBuildActionHook l : context.lookupAll(AfterBuildActionHook.class)) {
+                    l.afterAction(action, outerCtx, task.result(), out1);
                 }
             });
         }