MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-09 20:42:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

deprecate ExternalSystemTaskNotificationListener.onQueued.

Browse Source 
Swallow onStart/onEnd/onSuccess/onFailure/beforeCancel/onCancel, these events should be triggered by ES framework only (to avoid issues like IDEA-169463)
This commit is contained in:
Vladislav.Soroka
2017-03-14 13:09:24 +03:00
parent 301e4854ce
commit efe8abc7a8
10 changed files with 40 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListener.java
+12 -9
View File
@@ -15,20 +15,23 @@ public interface ExternalSystemTaskNotificationListener {
= ExtensionPointName.create("com.intellij.externalSystemTaskNotificationListener");
/**
* Notifies that task with the given id is queued for the execution.
* <p/>
* 'Queued' here means that intellij process-local codebase receives request to execute the target task and even has not been
* sent it to the slave gradle api process.
*
* @param id target task's id
* @param workingDir
* @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
*/
void onQueued(@NotNull ExternalSystemTaskId id, String workingDir);
/**
* Notifies that task with the given id is about to be started.
*
*
* @param id target task's id
* @param workingDir working directory
*/
default void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
onQueued(id, workingDir);
onStart(id);
}
/**
* @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
*/
void onStart(@NotNull ExternalSystemTaskId id);
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/task/ExternalSystemTaskNotificationListenerAdapter.java
+11 -1
View File
@@ -10,11 +10,21 @@ public abstract class ExternalSystemTaskNotificationListenerAdapter implements E
@NotNull public static final ExternalSystemTaskNotificationListener NULL_OBJECT = new ExternalSystemTaskNotificationListenerAdapter() { };
@Override
/**
* @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
*/
public void onQueued(@NotNull ExternalSystemTaskId id, String workingDir) {
}
@Override
public void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
onQueued(id, workingDir);
onStart(id);
}
/**
* @deprecated use {@link #onStart(ExternalSystemTaskId, String)}
*/
public void onStart(@NotNull ExternalSystemTaskId id) {
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/AbstractExternalSystemFacadeImpl.java
+4 -36
View File
@@ -210,14 +210,12 @@ public abstract class AbstractExternalSystemFacadeImpl<S extends ExternalSystemE
public void onQueued(@NotNull ExternalSystemTaskId id, String workingDir) {
}
@Override
public void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
}
@Override
public void onStart(@NotNull ExternalSystemTaskId id) {
try {
myManager.onStart(id);
}
catch (RemoteException e) {
// Ignore
}
}
@Override
@@ -242,52 +240,22 @@ public abstract class AbstractExternalSystemFacadeImpl<S extends ExternalSystemE
@Override
public void onEnd(@NotNull ExternalSystemTaskId id) {
try {
myManager.onEnd(id);
}
catch (RemoteException e) {
// Ignore
}
}
@Override
public void onSuccess(@NotNull ExternalSystemTaskId id) {
try {
myManager.onSuccess(id);
}
catch (RemoteException e) {
// Ignore
}
}
@Override
public void onFailure(@NotNull ExternalSystemTaskId id, @NotNull Exception ex) {
try {
myManager.onFailure(id, ex);
}
catch (RemoteException e) {
// Ignore
}
}
@Override
public void beforeCancel(@NotNull ExternalSystemTaskId id) {
try {
myManager.beforeCancel(id);
}
catch (RemoteException e) {
// Ignore
}
}
@Override
public void onCancel(@NotNull ExternalSystemTaskId id) {
try {
myManager.onCancel(id);
}
catch (RemoteException e) {
// Ignore
}
}
}
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java
+5
View File
@@ -131,6 +131,11 @@ public class ExternalSystemProcessingManager implements ExternalSystemTaskNotifi
@Override
public void onQueued(@NotNull ExternalSystemTaskId id, String workingDir) {
onStart(id, workingDir);
}
@Override
public void onStart(@NotNull ExternalSystemTaskId id, String workingDir) {
myTasksInProgress.put(id, System.currentTimeMillis() + TOO_LONG_EXECUTION_MS);
if (myAlarm.getActiveRequestCount() <= 0) {
myAlarm.addRequest(() -> update(), TOO_LONG_EXECUTION_MS);
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemResolveProjectTask.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class ExternalSystemResolveProjectTask extends AbstractExternalSystemTask
ExternalSystemProgressNotificationManagerImpl progressNotificationManager =
(ExternalSystemProgressNotificationManagerImpl)ServiceManager.getService(ExternalSystemProgressNotificationManager.class);
ExternalSystemTaskId id = getId();
progressNotificationManager.onQueued(id, myProjectPath);
progressNotificationManager.onStart(id, myProjectPath);
try {
DataNode<ProjectData> project = resolver.resolveProjectInfo(id, myProjectPath, myIsPreviewMode, settings);
if (project != null) {
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/ExternalSystemProgressNotificationManagerImpl.java
+2 -12
View File
@@ -67,25 +67,15 @@ public class ExternalSystemProgressNotificationManagerImpl extends RemoteObject
}
@Override
public void onQueued(@NotNull ExternalSystemTaskId id, @NotNull String workingDir) {
public void onStart(@NotNull ExternalSystemTaskId id, @NotNull String workingDir) {
for (Map.Entry<ExternalSystemTaskNotificationListener, Set<ExternalSystemTaskId>> entry : myListeners.entrySet()) {
final Set<ExternalSystemTaskId> ids = entry.getValue();
if (Collections.EMPTY_SET == ids || ids.contains(id)) {
entry.getKey().onQueued(id, workingDir);
entry.getKey().onStart(id, workingDir);
}
}
}
@Override
public void onStart(@NotNull ExternalSystemTaskId id) {
for (Map.Entry<ExternalSystemTaskNotificationListener, Set<ExternalSystemTaskId>> entry : myListeners.entrySet()) {
final Set<ExternalSystemTaskId> ids = entry.getValue();
if (Collections.EMPTY_SET == ids || ids.contains(id)) {
entry.getKey().onStart(id);
}
}
}
@Override
public void onStatusChange(@NotNull ExternalSystemTaskNotificationEvent event) {
for (Map.Entry<ExternalSystemTaskNotificationListener, Set<ExternalSystemTaskId>> entry : myListeners.entrySet()) {
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/RemoteExternalSystemProgressNotificationManager.java
+2 -8
View File
@@ -19,11 +19,7 @@ public interface RemoteExternalSystemProgressNotificationManager extends Remote
RemoteExternalSystemProgressNotificationManager NULL_OBJECT = new RemoteExternalSystemProgressNotificationManager() {
@Override
public void onQueued(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException {
}
@Override
public void onStart(@NotNull ExternalSystemTaskId id) {
public void onStart(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException {
}
@Override
@@ -55,9 +51,7 @@ public interface RemoteExternalSystemProgressNotificationManager extends Remote
}
};
void onQueued(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException;
void onStart(@NotNull ExternalSystemTaskId id) throws RemoteException;
void onStart(@NotNull ExternalSystemTaskId id, @NotNull String projectPath) throws RemoteException;
void onStatusChange(@NotNull ExternalSystemTaskNotificationEvent event) throws RemoteException;
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemProjectResolverWrapper.java
+1 -1
View File
@@ -15,7 +15,7 @@ import java.rmi.RemoteException;
/**
* Intercepts calls to the target {@link RemoteExternalSystemProjectResolver} and
* {@link ExternalSystemTaskNotificationListener#onQueued(ExternalSystemTaskId, String) updates 'queued' task status}.
* {@link ExternalSystemTaskNotificationListener#onStart(ExternalSystemTaskId, String) updates 'queued' task status}.
* <p/>
* Thread-safe.
*
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/remote/wrapper/ExternalSystemTaskManagerWrapper.java
+2 -1
View File
@@ -48,9 +48,10 @@ public class ExternalSystemTaskManagerWrapper<S extends ExternalSystemExecutionS
@NotNull String projectPath,
@Nullable S settings,
@Nullable String debuggerSetup) throws RemoteException, ExternalSystemException {
myProgressManager.onQueued(id, projectPath);
myProgressManager.onStart(id, projectPath);
try {
getDelegate().executeTasks(id, taskNames, projectPath, settings, debuggerSetup);
myProgressManager.onSuccess(id);
}
catch (ExternalSystemException e) {
myProgressManager.onFailure(id, e);
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
-1
View File
@@ -253,7 +253,6 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
myCancellationMap.putValue(resolverCtx.getExternalSystemTaskId(), new UnsupportedCancellationToken());
}
}
resolverCtx.getListener().onStart(resolverCtx.getExternalSystemTaskId());
allModels = buildActionExecutor.run();
if (allModels == null) {
throw new IllegalStateException("Unable to get project model for the project: " + resolverCtx.getProjectPath());