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

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-08-15 14:03:14 +04:00
parent 57f3711621
commit 9aa52a1f48
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
+14 -9
View File
@@ -94,18 +94,25 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
private void initNonReadSettings() {
final LanguageCodeStyleSettingsProvider[] providers = Extensions.getExtensions(LanguageCodeStyleSettingsProvider.EP_NAME);
for (final LanguageCodeStyleSettingsProvider provider : providers) {
if (!myCommonSettingsMap.containsKey(provider.getLanguage())) {
Language target = provider.getLanguage();
if (!myCommonSettingsMap.containsKey(target)) {
CommonCodeStyleSettings initialSettings = provider.getDefaultCommonSettings();
if (initialSettings != null) {
initialSettings.copyNonDefaultValuesFrom(myParentSettings);
initialSettings.setRootSettings(myParentSettings);
initialSettings.importOldIndentOptions(myParentSettings);
registerCommonSettings(provider.getLanguage(), initialSettings);
init(initialSettings, target);
}
}
}
}
private void init(CommonCodeStyleSettings initialSettings, Language target) {
initialSettings.setRootSettings(myParentSettings);
initialSettings.importOldIndentOptions(myParentSettings);
registerCommonSettings(target, initialSettings);
initialSettings.getRootSettings(); // check it's not null
}
private void initCommonSettingsMap() {
myCommonSettingsMap = new LinkedHashMap<Language, CommonCodeStyleSettings>();
myUnknownSettingsMap = new LinkedHashMap<String, Content>();
@@ -119,7 +126,7 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
public CommonCodeStyleSettingsManager clone(@NotNull CodeStyleSettings parentSettings) {
CommonCodeStyleSettingsManager settingsManager = new CommonCodeStyleSettingsManager(parentSettings);
if (myCommonSettingsMap != null && myCommonSettingsMap.size() > 0) {
if (myCommonSettingsMap != null && !myCommonSettingsMap.isEmpty()) {
settingsManager.initCommonSettingsMap();
for (Map.Entry<Language, CommonCodeStyleSettings> entry : myCommonSettingsMap.entrySet()) {
CommonCodeStyleSettings clonedSettings = entry.getValue().clone(parentSettings);
@@ -138,7 +145,7 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
if (o instanceof Element) {
final Element commonSettingsElement = (Element)o;
final String languageId = commonSettingsElement.getAttributeValue(LANGUAGE_ATTR);
if (languageId != null && languageId.length() > 0) {
if (languageId != null && !languageId.isEmpty()) {
Language target = Language.findLanguageByID(languageId);
boolean isKnownLanguage = target != null;
if (isKnownLanguage) {
@@ -147,9 +154,7 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
CommonCodeStyleSettings settings = provider.getDefaultCommonSettings();
if (settings != null) {
settings.readExternal(commonSettingsElement);
settings.setRootSettings(myParentSettings);
settings.importOldIndentOptions(myParentSettings);
registerCommonSettings(target, settings);
init(settings, target);
}
}
else {