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

we don't need to doAddComponent on reinit

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-10-07 11:45:18 +02:00
parent 50819fb5bd
commit 245b22d1b2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
+9 -5
View File
@@ -76,7 +76,7 @@ public abstract class ComponentStoreImpl implements IComponentStore.Reloadable {
@Override
public void run() {
if (component instanceof PersistentStateComponent) {
initPersistentComponent((PersistentStateComponent<?>)component, false);
initPersistentComponent((PersistentStateComponent<?>)component, false, false);
}
else {
initJdomExternalizable((JDOMExternalizable)component);
@@ -233,13 +233,17 @@ public abstract class ComponentStoreImpl implements IComponentStore.Reloadable {
}
private <T> String initPersistentComponent(@NotNull final PersistentStateComponent<T> component, final boolean reloadData) {
private <T> String initPersistentComponent(@NotNull final PersistentStateComponent<T> component, final boolean reloadData, boolean isReinit) {
State spec = getStateSpec(component);
final String name = spec.name();
ComponentRoamingManager.getInstance().setRoamingType(name, spec.roamingType());
doAddComponent(name, component);
if (optimizeTestLoading()) return name;
if (!isReinit) {
doAddComponent(name, component);
}
if (optimizeTestLoading()) {
return name;
}
Class<T> stateClass = getComponentStateClass(component);
@@ -424,7 +428,7 @@ public abstract class ComponentStoreImpl implements IComponentStore.Reloadable {
return false;
}
else {
initPersistentComponent(component, reloadData);
initPersistentComponent(component, reloadData, true);
return true;
}
}