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

cleanup and remove old storage other.xml (3 years is enough)

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-07-19 13:14:08 +02:00
parent 8cde1b600d
commit f8b6ef85dc
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PersistableCodeStyleSchemes.java
+4 -7
View File
@@ -18,14 +18,11 @@ import org.jetbrains.annotations.Nullable;
*/
@State(
name = "CodeStyleSchemeSettings",
storages = {
@Storage("code.style.schemes.xml"),
@Storage(value = "other.xml", deprecated = true)
},
storages = @Storage("code.style.schemes.xml"),
additionalExportFile = CodeStyleSchemesImpl.CODE_STYLES_DIR_PATH
)
public class PersistableCodeStyleSchemes extends CodeStyleSchemesImpl implements PersistentStateComponent<Element> {
public String CURRENT_SCHEME_NAME = CodeStyleSchemeImpl.DEFAULT_SCHEME_NAME;
public String CURRENT_SCHEME_NAME = CodeStyleScheme.DEFAULT_SCHEME_NAME;
public PersistableCodeStyleSchemes(@NotNull SchemeManagerFactory schemeManagerFactory) {
super(schemeManagerFactory);
@@ -40,7 +37,7 @@ public class PersistableCodeStyleSchemes extends CodeStyleSchemesImpl implements
@Override
public boolean accepts(@NotNull Accessor accessor, @NotNull Object bean) {
if ("CURRENT_SCHEME_NAME".equals(accessor.getName())) {
return !CodeStyleSchemeImpl.DEFAULT_SCHEME_NAME.equals(accessor.read(bean));
return !CodeStyleScheme.DEFAULT_SCHEME_NAME.equals(accessor.read(bean));
}
else {
return accessor.getValueClass().equals(String.class);
@@ -51,7 +48,7 @@ public class PersistableCodeStyleSchemes extends CodeStyleSchemesImpl implements
@Override
public void loadState(@NotNull Element state) {
CURRENT_SCHEME_NAME = CodeStyleSchemeImpl.DEFAULT_SCHEME_NAME;
CURRENT_SCHEME_NAME = CodeStyleScheme.DEFAULT_SCHEME_NAME;
XmlSerializer.deserializeInto(this, state);
CodeStyleScheme current = CURRENT_SCHEME_NAME == null ? null : mySchemeManager.findSchemeByName(CURRENT_SCHEME_NAME);
setCurrentScheme(current == null ? getDefaultScheme() : current);