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

IDEA-CR-21230 IDEA-173144 thread safe getCodeStyleSettings

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-05-19 17:33:00 +02:00
parent 644960f8b8
commit 1f9bf62ee9
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemeImpl.java
+31 -17
View File
@@ -35,6 +35,8 @@ public class CodeStyleSchemeImpl extends ExternalizableSchemeAdapter implements
private final boolean myIsDefault;
private volatile CodeStyleSettings myCodeStyleSettings;
private final Object lock = new Object();
CodeStyleSchemeImpl(@NotNull String name, String parentSchemeName, @NotNull SchemeDataHolder<? super CodeStyleSchemeImpl> dataHolder) {
setName(name);
myDataHolder = dataHolder;
@@ -79,26 +81,31 @@ public class CodeStyleSchemeImpl extends ExternalizableSchemeAdapter implements
@Override
@NotNull
public CodeStyleSettings getCodeStyleSettings() {
SchemeDataHolder<? super CodeStyleSchemeImpl> dataHolder = myDataHolder;
if (dataHolder == null) {
return myCodeStyleSettings;
CodeStyleSettings settings = myCodeStyleSettings;
if (settings != null) {
return settings;
}
myDataHolder = null;
CodeStyleSettings settings = init(myParentSchemeName == null ? null : CodeStyleSchemesImpl.getSchemeManager().findSchemeByName(myParentSchemeName), dataHolder.read());
dataHolder.updateDigest(this);
myParentSchemeName = null;
synchronized (lock) {
SchemeDataHolder<? super CodeStyleSchemeImpl> dataHolder = myDataHolder;
if (dataHolder == null) {
return myCodeStyleSettings;
}
myDataHolder = null;
settings = init(myParentSchemeName == null ? null : CodeStyleSchemesImpl.getSchemeManager().findSchemeByName(myParentSchemeName), dataHolder.read());
dataHolder.updateDigest(this);
myParentSchemeName = null;
}
return settings;
}
boolean isInitialized() {
return myDataHolder == null;
}
public void setCodeStyleSettings(@NotNull CodeStyleSettings codeStyleSettings) {
myCodeStyleSettings = codeStyleSettings;
myParentSchemeName = null;
myDataHolder = null;
synchronized (lock) {
myCodeStyleSettings = codeStyleSettings;
myParentSchemeName = null;
myDataHolder = null;
}
}
@Override
@@ -114,20 +121,27 @@ public class CodeStyleSchemeImpl extends ExternalizableSchemeAdapter implements
@Nullable
@Override
public SchemeState getSchemeState() {
return isInitialized() ? SchemeState.POSSIBLY_CHANGED : SchemeState.UNCHANGED;
synchronized (lock) {
return myDataHolder == null ? SchemeState.POSSIBLY_CHANGED : SchemeState.UNCHANGED;
}
}
@Override
@NotNull
public Element writeScheme() {
if (myDataHolder == null) {
SchemeDataHolder<? super CodeStyleSchemeImpl> dataHolder;
synchronized (lock) {
dataHolder = myDataHolder;
}
if (dataHolder == null) {
Element newElement = new Element("code_scheme");
newElement.setAttribute("name", getName());
myCodeStyleSettings.writeExternal(newElement);
return newElement;
}
else {
return myDataHolder.read();
return dataHolder.read();
}
}
}