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

AppCode:Project: conflicting component names prevented XcodeMetaData save its state (OC-4617)

Browse Source
This commit is contained in:
Anton Makeev
2012-07-16 12:02:27 +02:00
parent ea2b2745e4
commit c021b0c139
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java
+1 -1
View File
@@ -30,7 +30,7 @@ import java.util.Collections;
import java.util.List;
@State(name = "XcodeMetaData", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE, scheme = StorageScheme.DEFAULT)})
@State(name = "ExecutionTargetManager", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE, scheme = StorageScheme.DEFAULT)})
public class ExecutionTargetManagerImpl extends ExecutionTargetManager implements ProjectComponent, PersistentStateComponent<Element> {
@NotNull private final Project myProject;
@NotNull private final Object myActiveTargetLock = new Object();
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
+10 -2
View File
@@ -160,7 +160,7 @@ abstract class ComponentStoreImpl implements IComponentStore {
private String initJdomExternalizable(@NotNull JDOMExternalizable component) {
final String componentName = ComponentManagerImpl.getComponentName(component);
myComponents.put(componentName, component);
doAddComponent(componentName, component);
if (optimizeTestLoading()) return componentName;
@@ -188,6 +188,14 @@ abstract class ComponentStoreImpl implements IComponentStore {
return componentName;
}
private void doAddComponent(String componentName, Object component) {
if (myComponents.containsKey(componentName)) {
LOG.error("Conflicting component name '" + componentName + "': "
+ myComponents.get(componentName).getClass() + " and " + component.getClass());
}
myComponents.put(componentName, component);
}
private void loadJdomDefaults(@NotNull final Object component, final String componentName) {
try {
StateStorage defaultsStorage = getDefaultsStorage();
@@ -250,7 +258,7 @@ abstract class ComponentStoreImpl implements IComponentStore {
roamingManager.setRoamingType(name, roamingTypeFromComponent);
}
myComponents.put(name, component);
doAddComponent(name, component);
if (optimizeTestLoading()) return name;
Class<T> stateClass = getComponentStateClass(component);