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

don't load default state from resources by default

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-02-20 17:08:17 +01:00
parent b9f9322666
commit 5a9487b15f
10 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
+2 -4
View File
@@ -35,10 +35,8 @@ import java.util.Map;
@State(
name = "DebuggerSettings",
storages = {
@Storage(
file = StoragePathMacros.APP_CONFIG + "/other.xml"
)}
defaultStateAsResource = true,
storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")
)
public class DebuggerSettings implements Cloneable, PersistentStateComponent<Element> {
private static final Logger LOG = Logger.getInstance(DebuggerSettings.class);
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import java.util.List;
@State(
name = "DefaultColorSchemesManager",
defaultStateAsResource = true,
storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")
)
public class DefaultColorSchemesManager implements PersistentStateComponent<Element> {
@@ -71,7 +72,6 @@ public class DefaultColorSchemesManager implements PersistentStateComponent<Elem
for (DefaultColorsScheme scheme : mySchemes) {
if (name.equals(scheme.getName())) return scheme;
}
return null;
}
}
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+1
View File
@@ -49,6 +49,7 @@ import java.util.*;
@State(
name = "RunManager",
defaultStateAsResource = true,
storages = @Storage(file = StoragePathMacros.WORKSPACE_FILE)
)
public class RunManagerImpl extends RunManagerEx implements PersistentStateComponent<Element>, NamedComponent, Disposable {
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
+1 -2
View File
@@ -281,8 +281,7 @@ public abstract class ComponentStoreImpl implements IComponentStore.Reloadable {
}
Class<T> stateClass = ComponentSerializationUtil.getStateClass(component.getClass());
T state = getDefaultState(component, name, stateClass);
T state = stateSpec.defaultStateAsResource() ? getDefaultState(component, name, stateClass) : null;
Storage[] storageSpecs = getComponentStorageSpecs(component, stateSpec, StateStorageOperation.READ);
for (Storage storageSpec : storageSpecs) {
StateStorage stateStorage = getStateStorageManager().getStateStorage(storageSpec);
platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
+2 -1
View File
@@ -62,7 +62,8 @@ import java.util.Set;
*/
@State(
name = "WindowManager",
storages = {@Storage(file = StoragePathMacros.APP_CONFIG + "/window.manager.xml", roamingType = RoamingType.DISABLED)}
defaultStateAsResource = true,
storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/window.manager.xml", roamingType = RoamingType.DISABLED)
)
public final class WindowManagerImpl extends WindowManagerEx implements NamedComponent, PersistentStateComponent<Element> {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.WindowManagerImpl");
platform/platform-resources/src/META-INF/PlatformExtensions.xml
-1
View File
@@ -167,7 +167,6 @@
serviceImplementation="com.intellij.openapi.editor.colors.impl.TextAttributeKeyDefaultsProviderImpl"/>
<applicationService serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"
serviceImplementation="com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl"/>
<exportable serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"/>
<applicationService serviceInterface="com.intellij.openapi.roots.ui.FileAppearanceService"
serviceImplementation="com.intellij.openapi.roots.ui.FileAppearanceServiceImpl"/>
platform/projectModel-api/src/com/intellij/openapi/components/State.java
+5
View File
@@ -36,6 +36,11 @@ public @interface State {
boolean reloadable() default true;
/**
* If true, default state will be loaded from resources (if exists)
*/
boolean defaultStateAsResource() default false;
String additionalExportFile() default "";
Class<? extends NameGetter> presentableName() default NameGetter.class;
resources/src/idea/ContextViewSettings.xml
-3
View File
@@ -1,3 +0,0 @@
<component>
<option name="AUTOSCROLL_TO_NEW_LOCALS" value="true" />
</component>
resources/src/idea/Debugger.xml
-19
View File
@@ -1,19 +0,0 @@
<component>
<exception_breakpoints>
<breakpoint_any>
<option name="ENABLED" value="false" />
<option name="SUSPEND_VM" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="false" />
<option name="CONDITION" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="LOG_MESSAGE" />
<option name="CLASS_FILTERS_ENABLED" value="false" />
<option name="INVERSE_CLASS_FILLTERS" value="false" />
<option name="NOTIFY_CAUGHT" value="false" />
<option name="NOTIFY_UNCAUGHT" value="true" />
</breakpoint_any>
</exception_breakpoints>
</component>
resources/src/idea/UsageViewSettings.xml
-3
View File
@@ -1,3 +0,0 @@
<component>
<option name="EXPORT_FILE_NAME" value="report.txt" />
</component>