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

project.getLocation() should not return null

Browse Source
This commit is contained in:
Alexey Pegov
2010-03-24 13:42:09 +03:00
parent 8db3c35217
commit 4d2d147116
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java
+13 -6
View File
@@ -75,6 +75,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject
private static int originalVersion = -1;
private StorageScheme myScheme = StorageScheme.DEFAULT;
private String myCachedLocation;
ProjectStoreImpl(final ProjectEx project) {
super(project);
@@ -198,6 +199,8 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject
LocalFileSystem.getInstance().refreshAndFindFileByPath(workspacePath);
stateStorageManager.addMacro(WS_FILE_MACRO, workspacePath);
}
myCachedLocation = null;
}
private static void useOldWsContent(final String filePath, final IFile ws) {
@@ -251,13 +254,17 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject
@Nullable
public String getLocation() {
if (myScheme == StorageScheme.DEFAULT) {
return getProjectFilePath();
}
else {
final VirtualFile baseDir = getProjectBaseDir();
return baseDir == null ? null : baseDir.getPath();
if (myCachedLocation == null) {
if (myScheme == StorageScheme.DEFAULT) {
myCachedLocation = getProjectFilePath();
}
else {
final VirtualFile baseDir = getProjectBaseDir();
myCachedLocation = baseDir == null ? null : baseDir.getPath();
}
}
return myCachedLocation;
}
@NotNull