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

Android-Gradle: use external project notifications for project sync messages

Browse Source
This commit is contained in:
Vladislav.Soroka
2014-04-07 14:33:00 +04:00
parent feb9b635d8
commit f299a3b5e2
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationManager.java
+19 -6
View File
@@ -167,6 +167,15 @@ public class ExternalSystemNotificationManager {
});
}
public void openMessageView(@NotNull final ProjectSystemId externalSystemId, @NotNull final NotificationSource notificationSource) {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
prepareMessagesView(externalSystemId, notificationSource, true);
}
});
}
public void clearNotifications(@NotNull final NotificationSource notificationSource,
@NotNull final ProjectSystemId externalSystemId) {
clearNotifications(null, notificationSource, externalSystemId);
@@ -256,7 +265,11 @@ public class ExternalSystemNotificationManager {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
final NewErrorTreeViewPanel errorTreeView = prepareMessagesView(externalSystemId, notificationData);
boolean activate =
notificationData.getNotificationCategory() == NotificationCategory.ERROR ||
notificationData.getNotificationCategory() == NotificationCategory.WARNING;
final NewErrorTreeViewPanel errorTreeView =
prepareMessagesView(externalSystemId, notificationData.getNotificationSource(), activate);
final GroupingElement groupingElement = errorTreeView.getErrorViewStructure().getGroupingElement(groupName, null, virtualFile);
final NavigatableMessageElement navigatableMessageElement;
if (notificationData.hasLinks()) {
@@ -293,9 +306,9 @@ public class ExternalSystemNotificationManager {
@NotNull
private NewErrorTreeViewPanel prepareMessagesView(@NotNull final ProjectSystemId externalSystemId,
@NotNull final NotificationData notificationData) {
@NotNull final NotificationSource notificationSource,
boolean activateView) {
final NewErrorTreeViewPanel errorTreeView;
final NotificationSource notificationSource = notificationData.getNotificationSource();
final String contentDisplayName = getContentDisplayName(notificationSource, externalSystemId);
final Pair<NotificationSource, ProjectSystemId> contentIdPair = Pair.create(notificationSource, externalSystemId);
Content targetContent = findContent(contentIdPair, contentDisplayName);
@@ -316,7 +329,7 @@ public class ExternalSystemNotificationManager {
messageView.getContentManager().setSelectedContent(targetContent);
final ToolWindow tw = ToolWindowManager.getInstance(myProject).getToolWindow(ToolWindowId.MESSAGES_WINDOW);
if (tw != null && !tw.isActive()) {
if (activateView && tw != null && !tw.isActive()) {
tw.activate(null, false);
}
return errorTreeView;
@@ -336,8 +349,8 @@ public class ExternalSystemNotificationManager {
}
@NotNull
private static String getContentDisplayName(@NotNull final NotificationSource notificationSource,
@NotNull final ProjectSystemId externalSystemId) {
public static String getContentDisplayName(@NotNull final NotificationSource notificationSource,
@NotNull final ProjectSystemId externalSystemId) {
final String contentDisplayName;
switch (notificationSource) {
case PROJECT_SYNC:
platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
+1 -1
View File
@@ -16,7 +16,7 @@
serviceImplementation="com.intellij.openapi.externalSystem.service.project.ExternalLibraryPathTypeMapperImpl"/>
<applicationService serviceImplementation="com.intellij.openapi.externalSystem.service.project.ProjectStructureHelper"/>
<applicationService serviceImplementation="com.intellij.openapi.externalSystem.service.internal.ExternalSystemProcessingManager"/>
<projectService serviceImplementation="com.intellij.openapi.externalSystem.service.notification.ExternalSystemIdeNotificationManager"/>
<projectService serviceImplementation="com.intellij.openapi.externalSystem.service.notification.ExternalSystemNotificationManager"/>
<!--Project structure management services-->
<applicationService serviceImplementation="com.intellij.openapi.externalSystem.service.project.manage.ProjectDataManager"/>