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

NPE fix

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-02-16 11:15:43 +01:00
parent a0502e7ed3
commit fb8d49e6c0
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ide/ui/UISettings.java
+3 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.ide.ui;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.ExportableApplicationComponent;
@@ -159,8 +160,8 @@ public class UISettings implements PersistentStateComponent<UISettings>, Exporta
* @return UISettings instance or default values
*/
public static UISettings getShadowInstance() {
UISettings instance = getInstance();
return instance == null ? new UISettings() : instance;
Application application = ApplicationManager.getApplication();
return application != null ? getInstance() : new UISettings();
}
public void removeUISettingsListener(UISettingsListener listener){
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+2 -4
View File
@@ -499,8 +499,7 @@ public abstract class DialogWrapper {
}
private JPanel createButtons(Action[] actions, List<JButton> buttons) {
UISettings uiSettings = UISettings.getInstance();
if (uiSettings != null && !uiSettings.ALLOW_MERGE_BUTTONS) {
if (!UISettings.getShadowInstance().ALLOW_MERGE_BUTTONS) {
final List<Action> actionList = new ArrayList<Action>();
for (Action action : actions) {
actionList.add(action);
@@ -553,8 +552,7 @@ public abstract class DialogWrapper {
*/
protected JButton createJButtonForAction(Action action) {
JButton button;
UISettings uiSettings = UISettings.getInstance();
if (action instanceof OptionAction && uiSettings != null && uiSettings.ALLOW_MERGE_BUTTONS) {
if (action instanceof OptionAction && UISettings.getShadowInstance().ALLOW_MERGE_BUTTONS) {
final Action[] options = ((OptionAction)action).getOptions();
button = new JBOptionButton(action, options);
final JBOptionButton eachOptionsButton = (JBOptionButton)button;