From 0d22ff54d431ead97a60d1e61a8d2b180d71f77a Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 29 Apr 2019 15:31:34 +0300 Subject: [PATCH] Build tw: `Completed successfully` message is too long, updated according to the mockup IDEA-209457 GitOrigin-RevId: a6aefea4849650936ef814612a8c97944119cff5 --- .../service/execution/ExternalSystemRunConfiguration.java | 2 +- .../openapi/externalSystem/util/ExternalSystemUtil.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java index c68a46388d05..4a0c8e7d7eb3 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java @@ -386,7 +386,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase i public void onSuccess(@NotNull ExternalSystemTaskId id) { if (progressListener != null) { progressListener.onEvent(new FinishBuildEventImpl( - id, null, System.currentTimeMillis(), "completed successfully", new SuccessResultImpl())); + id, null, System.currentTimeMillis(), "successful", new SuccessResultImpl())); } } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java index 112fe44365be..9b0febd5f9a5 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java @@ -511,16 +511,14 @@ public class ExternalSystemUtil { String title = ExternalSystemBundle.message("notification.project.refresh.fail.title", externalSystemId.getReadableName(), projectName); com.intellij.build.events.FailureResult failureResult = createFailureResult(title, e, externalSystemId, project); - String message = isPreviewMode ? "project preview creation failed" : "sync failed"; - finishSyncEventSupplier.set(() -> new FinishBuildEventImpl(id, null, System.currentTimeMillis(), message, failureResult)); + finishSyncEventSupplier.set(() -> new FinishBuildEventImpl(id, null, System.currentTimeMillis(), "failed", failureResult)); processHandler.notifyProcessTerminated(1); } @Override public void onSuccess(@NotNull ExternalSystemTaskId id) { - String message = isPreviewMode ? "project preview created" : "sync finished"; finishSyncEventSupplier.set( - () -> new FinishBuildEventImpl(id, null, System.currentTimeMillis(), message, new SuccessResultImpl())); + () -> new FinishBuildEventImpl(id, null, System.currentTimeMillis(), "successful", new SuccessResultImpl())); processHandler.notifyProcessTerminated(0); } @@ -619,7 +617,7 @@ public class ExternalSystemUtil { String message = "Sync finish event has not been received"; LOG.warn(message, exception); ServiceManager.getService(project, SyncViewManager.class).onEvent( - new FinishBuildEventImpl(resolveProjectTask.getId(), null, System.currentTimeMillis(), "sync failed", + new FinishBuildEventImpl(resolveProjectTask.getId(), null, System.currentTimeMillis(), "failed", new FailureResultImpl(new Exception(message, exception)))); } }