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

Fix exception trying to use Messages before Application has been initialized (IDEA-196469)

Browse Source
This commit is contained in:
Dmitry Jemerov
2018-08-20 17:09:12 +02:00
parent 334675ec02
commit ecfae530d1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/ui/Messages.java
+1 -1
View File
@@ -224,7 +224,7 @@ public class Messages {
}
public static boolean canShowMacSheetPanel() {
return SystemInfo.isMac && !isApplicationInUnitTestOrHeadless() && Registry.is("ide.mac.message.dialogs.as.sheets");
return SystemInfo.isMac && ApplicationManager.getApplication() != null && !isApplicationInUnitTestOrHeadless() && Registry.is("ide.mac.message.dialogs.as.sheets");
}
public static boolean isMacSheetEmulation() {
platform/platform-api/src/com/intellij/openapi/ui/messages/MessagesService.java
+11 -1
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.ui.messages;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
@@ -93,6 +94,15 @@ public interface MessagesService {
Function<List<String>, String> lineJoiner);
static MessagesService getInstance() {
if (ApplicationManager.getApplication() != null) {
return ServiceManager.getService(MessagesService.class);
}
}
try {
return (MessagesService) MessagesService.class.getClassLoader().loadClass("com.intellij.ui.messages.MessagesServiceImpl").newInstance();
}
catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
}