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

initComponent() simplified

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-05-16 13:37:54 +04:00
parent e90f6b3324
commit 907f014df4
3 changed files with 14 additions and 27 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
+11 -23
View File
@@ -19,7 +19,6 @@ import com.intellij.diagnostic.IdeErrorsDialog;
import com.intellij.diagnostic.PluginException;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationEx;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.components.*;
import com.intellij.openapi.components.impl.ComponentManagerImpl;
@@ -66,39 +65,28 @@ abstract class ComponentStoreImpl implements IComponentStore {
throw new UnsupportedOperationException("Method getDefaultsStorage is not supported in " + getClass());
}
public String initComponent(@NotNull final Object component, final boolean service) {
boolean isSerializable = component instanceof JDOMExternalizable ||
component instanceof PersistentStateComponent ||
component instanceof SettingsSavingComponent;
if (!isSerializable) return null;
public void initComponent(@NotNull final Object component, final boolean service) {
if (component instanceof SettingsSavingComponent) {
SettingsSavingComponent settingsSavingComponent = (SettingsSavingComponent)component;
mySettingsSavingComponents.add(settingsSavingComponent);
}
final String[] componentName = {null};
final Runnable r = new Runnable() {
boolean isSerializable = component instanceof JDOMExternalizable ||
component instanceof PersistentStateComponent;
if (!isSerializable) return;
ApplicationManagerEx.getApplicationEx().runReadAction(new Runnable() {
public void run() {
if (component instanceof PersistentStateComponent) {
componentName[0] = initPersistentComponent((PersistentStateComponent<?>)component, false);
initPersistentComponent((PersistentStateComponent<?>)component, false);
}
else if (component instanceof JDOMExternalizable) {
componentName[0] = initJdomExternalizable((JDOMExternalizable)component);
else {
initJdomExternalizable((JDOMExternalizable)component);
}
}
};
final ApplicationEx applicationEx = ApplicationManagerEx.getApplicationEx();
if (applicationEx.isUnitTestMode()) {
r.run(); // Todo
}
else {
applicationEx.runReadAction(r);
}
return componentName[0];
});
}
public boolean isSaving() {
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IComponentStore.java
+2 -3
View File
@@ -28,12 +28,11 @@ import java.util.List;
import java.util.Set;
public interface IComponentStore {
@Nullable
String initComponent(Object component, boolean service);
void initComponent(Object component, boolean service);
void reinitComponents(Set<String> componentNames, boolean reloadData);
boolean isReloadPossible(Set<String> componentNames);
void load() throws IOException, StateStorageException;
boolean isSaving();
platform/testFramework/src/com/intellij/mock/MockProjectStore.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class MockProjectStore implements IProjectStore {
}
@Override
public String initComponent(Object component, final boolean service) {
public void initComponent(Object component, final boolean service) {
throw new UnsupportedOperationException("Method initComponent is not yet implemented in " + getClass().getName());
}