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

performance: DCL added

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-04-12 13:48:56 +04:00
parent d9d90af438
commit 068ee4372b
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/BaseFileConfigurableStoreImpl.java
+7
View File
@@ -61,6 +61,7 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
myVersion = ProjectManagerImpl.CURRENT_FORMAT_VERSION;
}
@Override
protected void load(@NotNull final Element rootElement) throws IOException {
super.load(rootElement);
@@ -73,6 +74,7 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
}
}
@Override
@NotNull
protected Element save() {
final Element root = super.save();
@@ -80,16 +82,19 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
return root;
}
@Override
public XmlElementStorage.StorageData clone() {
return new BaseStorageData(this);
}
@Override
protected int computeHash() {
int result = super.computeHash();
result = result*31 + myVersion;
return result;
}
@Override
@Nullable
public Set<String> getDifference(final XmlElementStorage.StorageData storageData, PathMacroSubstitutor substitutor) {
final BaseStorageData data = (BaseStorageData)storageData;
@@ -105,6 +110,7 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
return ourConversionProblemsStorage;
}
@Override
public void load() throws IOException, StateStorageException {
getMainStorageData(); //load it
}
@@ -118,6 +124,7 @@ abstract class BaseFileConfigurableStoreImpl extends ComponentStoreImpl {
return myDefaultsStateStorage;
}
@Override
public StateStorageManager getStateStorageManager() {
if (myStateStorageManager == null) {
myStateStorageManager = createStateStorageManager();
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class FileBasedStorage extends XmlElementStorage {
protected final String myRootElementName;
private static boolean myConfigDirectoryRefreshed = false;
private volatile VirtualFile myCachedVirtualFile;
private volatile VirtualFile myCachedVirtualFile;
public FileBasedStorage(@Nullable TrackingPathMacroSubstitutor pathMacroManager,
StreamProvider streamProvider,
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
+24 -6
View File
@@ -77,7 +77,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
private ProjectManagerImpl myManager;
private IProjectStore myComponentStore;
private volatile IProjectStore myComponentStore;
private MyProjectManagerListener myProjectManagerListener;
@@ -129,6 +129,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
}
}
@Override
protected void bootstrapPicoContainer() {
Extensions.instantiateArea(PluginManager.AREA_IDEA_PROJECT, this, null);
super.bootstrapPicoContainer();
@@ -153,22 +154,27 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
return myDelegate;
}
@Override
public Object getComponentKey() {
return IComponentStore.class;
}
@Override
public Class getComponentImplementation() {
return getDelegate().getComponentImplementation();
}
@Override
public Object getComponentInstance(final PicoContainer container) throws PicoInitializationException, PicoIntrospectionException {
return getDelegate().getComponentInstance(container);
}
@Override
public void verify(final PicoContainer container) throws PicoIntrospectionException {
getDelegate().verify(container);
}
@Override
public void accept(final PicoVisitor visitor) {
visitor.visitComponentAdapter(this);
getDelegate().accept(visitor);
@@ -179,11 +185,16 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
@NotNull
@Override
public synchronized IProjectStore getStateStore() {
if (myComponentStore == null) {
myComponentStore = (IProjectStore)getPicoContainer().getComponentInstance(IComponentStore.class);
public IProjectStore getStateStore() {
IProjectStore componentStore = myComponentStore;
if (componentStore != null) return componentStore;
synchronized (this) {
componentStore = myComponentStore;
if (componentStore == null) {
myComponentStore = componentStore = (IProjectStore)getPicoContainer().getComponentInstance(IComponentStore.class);
}
return componentStore;
}
return myComponentStore;
}
@Override
@@ -218,6 +229,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
}
}
@Override
@NotNull
public String getProjectFilePath() {
return getStateStore().getProjectFilePath();
@@ -271,6 +283,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
return isDisposed() ? null : getStateStore().getLocation();
}
@Override
@Nullable
public VirtualFile getWorkspaceFile() {
return getStateStore().getWorkspaceFile();
@@ -430,17 +443,20 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
}
private class MyProjectManagerListener extends ProjectManagerAdapter {
@Override
public void projectOpened(Project project) {
LOG.assertTrue(project == ProjectImpl.this);
ProjectImpl.this.projectOpened();
}
@Override
public void projectClosed(Project project) {
LOG.assertTrue(project == ProjectImpl.this);
ProjectImpl.this.projectClosed();
}
}
@Override
protected MutablePicoContainer createPicoContainer() {
return Extensions.getArea(this).getPicoContainer();
}
@@ -467,7 +483,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
for (Iterator it = macros2invalidate.iterator(); it.hasNext();) {
final String macro = (String)it.next();
final String value = pathMacros.getValue(macro);
if ((null == value || value.trim().length() == 0) && !pathMacros.isIgnoredMacroName(macro)) {
if ((value == null || value.trim().isEmpty()) && !pathMacros.isIgnoredMacroName(macro)) {
it.remove();
}
}
@@ -490,6 +506,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
}
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
stateStore.reinitComponents(components, true);
}
@@ -506,6 +523,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx {
}
}
@NonNls
@Override
public String toString() {
return "Project" +