From 8dd0125546e61e860d072460d99b6b5dc120fb1f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 17 Feb 2012 11:56:44 +0100 Subject: [PATCH 1/9] Cleanup and document Project interface and implementations --- .../com/intellij/openapi/project/Project.java | 89 +++++-- .../src/com/intellij/mock/MockProject.java | 7 +- .../impl/ConversionServiceImpl.java | 8 +- .../openapi/command/impl/DummyProject.java | 7 +- .../impl/stores/FileBasedStorage.java | 18 +- .../components/impl/stores/IProjectStore.java | 10 +- .../impl/stores/ProjectStoreImpl.java | 226 +++++++++--------- .../openapi/project/impl/ProjectImpl.java | 69 ++++-- .../wm/impl/PlatformFrameTitleBuilder.java | 3 +- .../src/messages/IdeBundle.properties | 2 +- .../com/intellij/mock/MockProjectStore.java | 34 +-- 11 files changed, 278 insertions(+), 195 deletions(-) diff --git a/platform/core-api/src/com/intellij/openapi/project/Project.java b/platform/core-api/src/com/intellij/openapi/project/Project.java index b05098b9c086..1a562fbf6b47 100644 --- a/platform/core-api/src/com/intellij/openapi/project/Project.java +++ b/platform/core-api/src/com/intellij/openapi/project/Project.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,38 +22,97 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; - /** * Project interface class. */ public interface Project extends ComponentManager, AreaInstance { @NonNls String DIRECTORY_STORE_FOLDER = ".idea"; - @Nullable - VirtualFile getProjectFile(); - - @Nullable - VirtualFile getWorkspaceFile(); - - @NotNull - String getProjectFilePath(); - - @Nullable - VirtualFile getBaseDir(); - @NotNull @NonNls String getName(); + /** + *

Returns a project base directory - a parent directory of a .ipr file or .idea directory.
+ * Returns null for default project.

+ * + *

Please note that returned file is always de-referenced, so you have to use use {@linkplain #getBasePath()} + * if it's desired to keep symlinks in original path.

+ * + * @return project base directory, or null for default project + * todo: check usages + */ + @Nullable + VirtualFile getBaseDir(); + + /** + * Returns a system-dependent path to a project base directory (see {@linkplain #getBaseDir()}).
+ * Returns null for default project. + * + * @return a path to a project base directory, or empty string for default project + */ + @Nullable + @NonNls + String getBasePath(); + + /** + *

Returns project descriptor file: + *

+ * Returns null for default project.

+ * + *

Please note that returned file is always de-referenced, so you have to use use {@linkplain #getProjectFilePath()} + * if it's desired to keep symlinks in original path.

+ * + * @return project descriptor file, or null for default project + */ + @Nullable + VirtualFile getProjectFile(); + + /** + * Returns a system-dependent path to project descriptor file (see {@linkplain #getProjectFile()}).
+ * Returns empty string ("") for default project. + * + * @return project descriptor file, or empty string for default project + */ + @NotNull + @NonNls + String getProjectFilePath(); + + /** + * Returns presentable project path: + * {@linkplain #getProjectFilePath()} for file-based projects, {@linkplain #getLocation()} for directory-based ones. + * + * @return presentable project path + * todo: check usages + */ @Nullable @NonNls String getPresentableUrl(); + /** + *

Returns a workspace file: + *

+ * Returns null for default project. + * + * @return workspace file, or null for default project + */ + @Nullable + VirtualFile getWorkspaceFile(); + @NotNull @NonNls String getLocationHash(); - + /** + * @deprecated please use {@linkplain #getPresentableUrl()} or {@linkplain #getBasePath()} (to remove in IDEA 13). + * todo: remove usages + */ @Nullable @NonNls String getLocation(); diff --git a/platform/core-impl/src/com/intellij/mock/MockProject.java b/platform/core-impl/src/com/intellij/mock/MockProject.java index 86d618118281..e06167f2ae0a 100644 --- a/platform/core-impl/src/com/intellij/mock/MockProject.java +++ b/platform/core-impl/src/com/intellij/mock/MockProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -117,6 +117,11 @@ public class MockProject extends MockComponentManager implements Project { return null; } + @Override + public String getBasePath() { + return null; + } + @Override public void save() { } diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java index 9702c5bf0c67..7b1a93ef7733 100644 --- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -295,7 +295,9 @@ public class ConversionServiceImpl extends ConversionService { @NotNull public ConversionResult convertModule(@NotNull final Project project, @NotNull final File moduleFile) { final IProjectStore stateStore = ((ProjectImpl)project).getStateStore(); - String projectPath = FileUtil.toSystemDependentName(stateStore.getLocation()); + final String url = stateStore.getPresentableUrl(); + assert url != null : project; + final String projectPath = FileUtil.toSystemDependentName(url); if (!isConversionNeeded(projectPath, moduleFile)) { return ConversionResultImpl.CONVERSION_NOT_NEEDED; @@ -322,7 +324,7 @@ public class ConversionServiceImpl extends ConversionService { } } context.saveFiles(Collections.singletonList(moduleFile)); - Messages.showInfoMessage(project, IdeBundle.message("message.your.module.was.succesfully.converted.br.old.version.was.saved.to.0", backupFile.getAbsolutePath()), + Messages.showInfoMessage(project, IdeBundle.message("message.your.module.was.successfully.converted.br.old.version.was.saved.to.0", backupFile.getAbsolutePath()), IdeBundle.message("dialog.title.convert.module")); return new ConversionResultImpl(runners); } diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java index c8587a70e4c3..156c0dbaa2e0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,6 +86,11 @@ public class DummyProject extends UserDataHolderBase implements Project { return null; } + @Override + public String getBasePath() { + return null; + } + public void save() { } diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java index 1edab5c1bf5a..356244d76a30 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ package com.intellij.openapi.components.impl.stores; - import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; @@ -28,7 +27,7 @@ import com.intellij.openapi.components.TrackingPathMacroSubstitutor; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.StreamProvider; import com.intellij.openapi.util.JDOMUtil; -import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileAdapter; @@ -78,6 +77,7 @@ public class FileBasedStorage extends XmlElementStorage { syncRefreshPathRecursively(PathManager.getConfigPath(true), "componentVersions"); } finally { + //noinspection AssignmentToStaticFieldFromInstanceMethod myConfigDirectoryRefreshed = true; } } @@ -125,10 +125,6 @@ public class FileBasedStorage extends XmlElementStorage { } } - private static boolean isOptionsFile(final String filePath) { - return FileUtil.isAncestor(new File(PathManager.getOptionsPath()), new File(filePath), false); - } - protected MySaveSession createSaveSession(final MyExternalizationSession externalizationSession) { return new FileSaveSession(externalizationSession); } @@ -162,7 +158,7 @@ public class FileBasedStorage extends XmlElementStorage { protected void doSave() throws StateStorageException { if (!myBlockSavingTheContent) { - if (ApplicationManager.getApplication().isUnitTestMode() && myFile != null && myFile.getPath().startsWith("$")) { + if (ApplicationManager.getApplication().isUnitTestMode() && myFile != null && StringUtil.startsWithChar(myFile.getPath(), '$')) { throw new StateStorageException("It seems like some macros were not expanded for path: " + myFile.getPath()); } @@ -228,9 +224,8 @@ public class FileBasedStorage extends XmlElementStorage { return StorageUtil.getVirtualFile(myFile); } - - public IFile getFile() { - return myFile; + public File getFile() { + return new File(myFile.getPath()); } @Nullable @@ -254,6 +249,7 @@ public class FileBasedStorage extends XmlElementStorage { } } + @Nullable private Document processReadException(final Exception e) { myBlockSavingTheContent = isProjectOrModuleFile(); if (!ApplicationManager.getApplication().isUnitTestMode() && !ApplicationManager.getApplication().isHeadlessEnvironment()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java index 376c64a10ff1..abc3fbe30928 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,6 @@ import java.io.IOException; import java.util.Set; public interface IProjectStore extends IComponentStore { - - boolean checkVersion(); void setProjectFilePath(final String filePath); @@ -40,6 +38,12 @@ public interface IProjectStore extends IComponentStore { @Nullable VirtualFile getProjectBaseDir(); + @Nullable + String getProjectBasePath(); + + /** + * @deprecated please use {@linkplain #getPresentableUrl()} or {@linkplain #getProjectBasePath()} (to remove in IDEA 13). + */ @Nullable String getLocation(); diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java index fc45c3d4d4b1..9032270e62a5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,8 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.ReadonlyStatusHandler; -import com.intellij.openapi.vfs.VfsUtil; -import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vfs.*; import com.intellij.util.containers.OrderedSet; import com.intellij.util.io.fs.FileSystem; import com.intellij.util.io.fs.IFile; @@ -46,7 +44,6 @@ import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.io.*; import java.lang.annotation.Annotation; @@ -57,30 +54,31 @@ import java.util.Set; class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProjectStore { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.components.impl.stores.ProjectStoreImpl"); + @NonNls private static final String OLD_PROJECT_SUFFIX = "_old."; @NonNls static final String OPTION_WORKSPACE = "workspace"; - - protected ProjectImpl myProject; - @NonNls static final String PROJECT_FILE_MACRO = "PROJECT_FILE"; @NonNls static final String WS_FILE_MACRO = "WORKSPACE_FILE"; @NonNls private static final String PROJECT_CONFIG_DIR = "PROJECT_CONFIG_DIR"; - static final String PROJECT_FILE_STORAGE = "$" + PROJECT_FILE_MACRO + "$"; - static final String WS_FILE_STORAGE = "$" + WS_FILE_MACRO + "$"; - static final String DEFAULT_STATE_STORAGE = PROJECT_FILE_STORAGE; + @NonNls static final String PROJECT_FILE_STORAGE = "$" + PROJECT_FILE_MACRO + "$"; + @NonNls static final String WS_FILE_STORAGE = "$" + WS_FILE_MACRO + "$"; + @NonNls static final String DEFAULT_STATE_STORAGE = PROJECT_FILE_STORAGE; static final Storage DEFAULT_STORAGE_ANNOTATION = new MyStorage(); private static int originalVersion = -1; + protected ProjectImpl myProject; private StorageScheme myScheme = StorageScheme.DEFAULT; private String myCachedLocation; + private String myPresentableUrl; ProjectStoreImpl(final ProjectImpl project) { super(project); myProject = project; } + @Override public boolean checkVersion() { final ApplicationNamesInfo appNamesInfo = ApplicationNamesInfo.getInstance(); if (originalVersion >= 0 && originalVersion < ProjectManagerImpl.CURRENT_FORMAT_VERSION) { @@ -130,10 +128,10 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject private void backup(final VirtualFile projectDir, final VirtualFile vile) throws IOException { final String oldName = vile.getNameWithoutExtension() + OLD_PROJECT_SUFFIX + vile.getExtension(); - VirtualFile oldFile = projectDir.findOrCreateChildData(this, oldName); - VfsUtil.saveText(oldFile, VfsUtil.loadText(vile)); + final VirtualFile oldFile = projectDir.findOrCreateChildData(this, oldName); + assert oldFile != null : projectDir + ", " + oldName; + VfsUtil.saveText(oldFile, VfsUtilCore.loadText(vile)); } - }); } @@ -147,6 +145,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject return true; } + @Override public TrackingPathMacroSubstitutor[] getSubstitutors() { return new TrackingPathMacroSubstitutor[] {getStateStorageManager().getMacroSubstitutor()}; } @@ -161,79 +160,77 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject return myProject; } + @Override public void setProjectFilePath(final String filePath) { if (filePath == null) { return; } - final IFile iFile = FileSystem.FILE_SYSTEM.createFile(filePath); final StateStorageManager stateStorageManager = getStateStorageManager(); - - if (!isIprPath(iFile)) { - final IFile dir_store = - iFile.isDirectory() - ? iFile.getChild(Project.DIRECTORY_STORE_FOLDER) - : iFile.getParentFile().getChild(Project.DIRECTORY_STORE_FOLDER); - FileBasedStorage.syncRefreshPathRecursively(dir_store.getPath(), null); + final File file = new File(filePath); + if (!isIprPath(file)) { + final File dirStore = file.isDirectory() ? new File(file, Project.DIRECTORY_STORE_FOLDER) + : new File(file.getParentFile(), Project.DIRECTORY_STORE_FOLDER); + FileBasedStorage.syncRefreshPathRecursively(dirStore.getPath(), null); myScheme = StorageScheme.DIRECTORY_BASED; + stateStorageManager.addMacro(PROJECT_FILE_MACRO, new File(dirStore, "misc.xml").getPath()); - stateStorageManager.addMacro(PROJECT_FILE_MACRO, dir_store.getChild("misc.xml").getPath()); - final IFile ws = dir_store.getChild("workspace.xml"); + final File ws = new File(dirStore, "workspace.xml"); stateStorageManager.addMacro(WS_FILE_MACRO, ws.getPath()); - if (!ws.exists() && !iFile.isDirectory()) { + if (!ws.exists() && !file.isDirectory()) { useOldWsContent(filePath, ws); } - stateStorageManager.addMacro(PROJECT_CONFIG_DIR, dir_store.getPath()); - } else { + stateStorageManager.addMacro(PROJECT_CONFIG_DIR, dirStore.getPath()); + } + else { + LocalFileSystem.getInstance().refreshAndFindFileByPath(filePath); + myScheme = StorageScheme.DEFAULT; stateStorageManager.addMacro(PROJECT_FILE_MACRO, filePath); - LocalFileSystem.getInstance().refreshAndFindFileByPath(filePath); - - int lastDot = filePath.lastIndexOf("."); - final String filePathWithoutExt = lastDot > 0 ? filePath.substring(0, lastDot) : filePath; - String workspacePath = filePathWithoutExt + WorkspaceFileType.DOT_DEFAULT_EXTENSION; - + final String workspacePath = composeWsPath(filePath); LocalFileSystem.getInstance().refreshAndFindFileByPath(workspacePath); stateStorageManager.addMacro(WS_FILE_MACRO, workspacePath); } myCachedLocation = null; - } - - private static boolean isIprPath(final IFile file) { - return file.getName().indexOf(".") > 0 && ProjectFileType.DEFAULT_EXTENSION.equals(FileUtil.getExtension(file.getName())); + myPresentableUrl = null; } - private static void useOldWsContent(final String filePath, final IFile ws) { - int lastDot = filePath.lastIndexOf("."); + private static boolean isIprPath(final File file) { + final String name = file.getName(); + return name.indexOf(".") > 0 && ProjectFileType.DEFAULT_EXTENSION.equals(FileUtil.getExtension(name)); + } + + private static String composeWsPath(String filePath) { + final int lastDot = filePath.lastIndexOf("."); final String filePathWithoutExt = lastDot > 0 ? filePath.substring(0, lastDot) : filePath; - String workspacePath = filePathWithoutExt + WorkspaceFileType.DOT_DEFAULT_EXTENSION; - IFile oldWs = FileSystem.FILE_SYSTEM.createFile(workspacePath); + return filePathWithoutExt + WorkspaceFileType.DOT_DEFAULT_EXTENSION; + } + + private static void useOldWsContent(final String filePath, final File ws) { + final File oldWs = new File(composeWsPath(filePath)); if (oldWs.exists()) { try { - final InputStream is = oldWs.openInputStream(); - final byte[] bytes; - + final InputStream is = new FileInputStream(oldWs); try { - bytes = FileUtil.loadBytes(is, (int)oldWs.length()); + final byte[] bytes = FileUtil.loadBytes(is, (int)oldWs.length()); + + final OutputStream os = new FileOutputStream(ws); + try { + os.write(bytes); + } + finally { + os.close(); + } } finally { is.close(); } - - final OutputStream os = ws.openOutputStream(); - try { - os.write(bytes); - } - finally { - os.close(); - } - } catch (IOException e) { LOG.error(e); @@ -241,24 +238,37 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } } - @Nullable + @Override public VirtualFile getProjectBaseDir() { - final VirtualFile projectFile = getProjectFile(); - if (projectFile != null) return myScheme == StorageScheme.DEFAULT ? projectFile.getParent() : projectFile.getParent().getParent(); + if (myProject.isDefault()) return null; + + final String path = getProjectBasePath(); + if (path == null) return null; + + return LocalFileSystem.getInstance().findFileByPath(path); + } + + @Override + public String getProjectBasePath() { + if (myProject.isDefault()) return null; + + final String path = getProjectFilePath(); + if (!StringUtil.isEmptyOrSpaces(path)) { + return myScheme == StorageScheme.DEFAULT ? new File(path).getParent() : new File(path).getParentFile().getParent(); + } //we are not yet initialized completely ("open directory", etc) final StateStorage s = getStateStorageManager().getFileStateStorage(PROJECT_FILE_STORAGE); if (!(s instanceof FileBasedStorage)) return null; final FileBasedStorage storage = (FileBasedStorage)s; - final IFile file = storage.getFile(); + final File file = storage.getFile(); if (file == null) return null; - return LocalFileSystem.getInstance() - .findFileByIoFile(myScheme == StorageScheme.DEFAULT ? file.getParentFile() : file.getParentFile().getParentFile()); + return myScheme == StorageScheme.DEFAULT ? file.getParent() : file.getParentFile().getParent(); } - @Nullable + @Override public String getLocation() { if (myCachedLocation == null) { if (myScheme == StorageScheme.DEFAULT) { @@ -274,79 +284,70 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } @NotNull + @Override public String getProjectName() { if (myScheme == StorageScheme.DIRECTORY_BASED) { final VirtualFile baseDir = getProjectBaseDir(); - assert baseDir != null : "project file: " + (getProjectFile() == null ? "[NULL]" : getProjectFile().getPath()); + assert baseDir != null : "project file: " + getProjectFile(); final VirtualFile ideaDir = baseDir.findChild(".idea"); if (ideaDir != null && ideaDir.isValid()) { final VirtualFile nameFile = ideaDir.findChild(".name"); if (nameFile != null && nameFile.isValid()) { - BufferedReader in = null; try { - in = new BufferedReader(new InputStreamReader(nameFile.getInputStream(), "UTF-8")); - final String name = in.readLine(); - if (name != null && name.length() > 0) return name.trim(); - } - catch (IOException e) { - // ignore - } - finally { - if (in != null) { - try { - in.close(); - } - catch (IOException e) { - // ignore + BufferedReader in = new BufferedReader(new InputStreamReader(nameFile.getInputStream(), "UTF-8")); + try { + final String name = in.readLine(); + if (name != null && name.length() > 0) { + return name.trim(); } } + finally { + in.close(); + } } + catch (IOException ignored) { } } } - return baseDir.getName().replace(":", ""); } - - String temp = getProjectFileName(); - FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(temp); - if (fileType instanceof ProjectFileType) { - temp = temp.substring(0, temp.length() - fileType.getDefaultExtension().length()-1); + else { + String temp = getProjectFileName(); + FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(temp); + if (fileType instanceof ProjectFileType) { + temp = temp.substring(0, temp.length() - fileType.getDefaultExtension().length()-1); + } + final int i = temp.lastIndexOf(File.separatorChar); + if (i >= 0) { + temp = temp.substring(i + 1, temp.length() - i + 1); + } + return temp; } - final int i = temp.lastIndexOf(File.separatorChar); - if (i >= 0) { - temp = temp.substring(i + 1, temp.length() - i + 1); - } - return temp; } @NotNull + @Override public StorageScheme getStorageScheme() { return myScheme; } - @Nullable + @Override public String getPresentableUrl() { if (myProject.isDefault()) return null; - if (myScheme == StorageScheme.DIRECTORY_BASED) { - final VirtualFile baseDir = getProjectBaseDir(); - return baseDir != null ? baseDir.getPresentableUrl() : null; - } - else { - if (myProject.isDefault()) return null; - final FileBasedStorage storage = (FileBasedStorage)getStateStorageManager().getFileStateStorage(PROJECT_FILE_STORAGE); - assert storage != null; - return storage.getFilePath().replace('/', File.separatorChar); + if (myPresentableUrl == null) { + final String url = myScheme == StorageScheme.DIRECTORY_BASED ? getProjectBasePath() : getProjectFilePath(); + myPresentableUrl = url != null ? FileUtil.toSystemDependentName(url) : url; } + return myPresentableUrl; } + @Override public void loadProject() throws IOException, JDOMException, InvalidDataException, StateStorageException { - //load(); myProject.init(); } - @Nullable + @Override public VirtualFile getProjectFile() { if (myProject.isDefault()) return null; final FileBasedStorage storage = (FileBasedStorage)getStateStorageManager().getFileStateStorage(PROJECT_FILE_STORAGE); @@ -354,7 +355,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject return storage.getVirtualFile(); } - @Nullable + @Override public VirtualFile getWorkspaceFile() { if (myProject.isDefault()) return null; final FileBasedStorage storage = (FileBasedStorage)getStateStorageManager().getFileStateStorage(WS_FILE_STORAGE); @@ -362,6 +363,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject return storage.getVirtualFile(); } + @Override public void loadProjectFromTemplate(final ProjectImpl defaultProject) { final StateStorage stateStorage = getStateStorageManager().getFileStateStorage(DEFAULT_STATE_STORAGE); @@ -379,6 +381,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } @NotNull + @Override public String getProjectFileName() { final FileBasedStorage storage = (FileBasedStorage)getStateStorageManager().getFileStateStorage(PROJECT_FILE_STORAGE); assert storage != null; @@ -386,20 +389,22 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } @NotNull + @Override public String getProjectFilePath() { if (myProject.isDefault()) return ""; - final FileBasedStorage storage = (FileBasedStorage)getStateStorageManager().getFileStateStorage(PROJECT_FILE_STORAGE); assert storage != null; return storage.getFilePath(); } + @Override protected XmlElementStorage getMainStorage() { final XmlElementStorage storage = (XmlElementStorage)getStateStorageManager().getFileStateStorage(DEFAULT_STATE_STORAGE); assert storage != null; return storage; } + @Override protected StateStorageManager createStateStorageManager() { return new ProjectStateStorageManager(PathMacroManager.getInstance(getComponentManager()).createTrackingSubstitutor(), myProject); } @@ -424,7 +429,6 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } static class WsStorageData extends ProjectStorageData { - WsStorageData(final String rootElementName, final Project project) { super(rootElementName, project); } @@ -449,6 +453,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject protected void load(@NotNull final Element root) throws IOException { final String v = root.getAttributeValue(VERSION_OPTION); + //noinspection AssignmentToStaticFieldFromInstanceMethod originalVersion = v != null ? Integer.parseInt(v) : 0; if (originalVersion != ProjectManagerImpl.CURRENT_FORMAT_VERSION) { @@ -466,12 +471,12 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } } + @Override protected SaveSessionImpl createSaveSession() throws StateStorageException { return new ProjectSaveSession(); } protected class ProjectSaveSession extends SaveSessionImpl { - ProjectSaveSession() throws StateStorageException { } @@ -533,7 +538,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject List readonlyFiles = new ArrayList(); - if (((ProjectImpl)myProject).isToSaveProjectName()) { + if (myProject.isToSaveProjectName()) { final VirtualFile baseDir = getProjectBaseDir(); if (baseDir != null && baseDir.isValid()) { filesToSave.add(FileSystem.FILE_SYSTEM @@ -627,14 +632,15 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } }; - @Nullable + @Override protected StateStorageChooser getDefaultStateStorageChooser() { return myStateStorageChooser; } @NotNull - protected Storage[] getComponentStorageSpecs(@NotNull final PersistentStateComponent persistentStateComponent, final StateStorageOperation operation) throws - StateStorageException { + @Override + protected Storage[] getComponentStorageSpecs(@NotNull final PersistentStateComponent persistentStateComponent, + final StateStorageOperation operation) throws StateStorageException { Storage[] result = super.getComponentStorageSpecs(persistentStateComponent, operation); if (operation == StateStorageOperation.READ) { @@ -647,6 +653,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject return result; } + @SuppressWarnings("ClassExplicitlyAnnotation") private static class MyStorage implements Storage { public String id() { return "___Default___"; @@ -716,7 +723,6 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject } } - return true; } } diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java index 8d3c6c24b150..5280652f8858 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,6 @@ import java.io.IOException; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; - public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { private static final Logger LOG = Logger.getInstance("#com.intellij.project.impl.ProjectImpl"); private static final String PLUGIN_SETTINGS_ERROR = "Plugin Settings Error"; @@ -103,10 +102,14 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { myOptimiseTestLoadSpeed = isOptimiseTestLoadSpeed; myManager = manager; + myName = isDefault() ? TEMPLATE_PROJECT_NAME : projectName == null ? getStateStore().getProjectName() : projectName; - if (!isDefault() && projectName != null && getStateStore().getStorageScheme().equals(StorageScheme.DIRECTORY_BASED)) myOldName = ""; // new project + if (!isDefault() && projectName != null && getStateStore().getStorageScheme().equals(StorageScheme.DIRECTORY_BASED)) { + myOldName = ""; // new project + } } + @Override public void setProjectName(@NotNull String projectName) { if (!projectName.equals(myName)) { myOldName = myName; @@ -175,6 +178,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } @NotNull + @Override public synchronized IProjectStore getStateStore() { if (myComponentStore == null) { myComponentStore = (IProjectStore)getPicoContainer().getComponentInstance(IComponentStore.class); @@ -196,10 +200,12 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { getStateStore().initComponent(component, service); } + @Override public boolean isOpen() { return ProjectManagerEx.getInstanceEx().isProjectOpened(this); } + @Override public boolean isInitialized() { return isOpen() && !isDisposed() && StartupManagerEx.getInstanceEx(this).startupActivityPassed(); } @@ -217,40 +223,49 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { return getStateStore().getProjectFilePath(); } - - @Nullable + @Override public VirtualFile getProjectFile() { return getStateStore().getProjectFile(); } - @Nullable + @Override public VirtualFile getBaseDir() { return getStateStore().getProjectBaseDir(); } + @Override + public String getBasePath() { + return getStateStore().getProjectBasePath(); + } + @NotNull + @Override public String getName() { return myName; } - @Nullable @NonNls + @Override public String getPresentableUrl() { + if (myName == null) return null; // not yet initialized return getStateStore().getPresentableUrl(); } @NotNull @NonNls + @Override public String getLocationHash() { String str = getPresentableUrl(); if (str == null) str = getName(); - final String prefix = getStateStore().getStorageScheme() == StorageScheme.DIRECTORY_BASED? "" : getName(); + final String prefix = getStateStore().getStorageScheme() == StorageScheme.DIRECTORY_BASED ? "" : getName(); return prefix + Integer.toHexString(str.hashCode()); } + @SuppressWarnings("deprecation") @Nullable @NonNls + @Override public String getLocation() { if (myName == null) return null; // was called before initialized return isDisposed() ? null : getStateStore().getLocation(); @@ -261,15 +276,17 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { return getStateStore().getWorkspaceFile(); } + @Override public boolean isOptimiseTestLoadSpeed() { return myOptimiseTestLoadSpeed; } + @Override public void setOptimiseTestLoadSpeed(final boolean optimiseTestLoadSpeed) { myOptimiseTestLoadSpeed = optimiseTestLoadSpeed; } - + @Override public void init() { long start = System.currentTimeMillis(); // ProfilingUtil.startCPUProfiling(); @@ -297,6 +314,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { return false; } + @Override public void save() { if (ApplicationManagerEx.getApplicationEx().isDoNotSave()) return; //no need to save @@ -327,11 +345,14 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } catch (PluginException e) { PluginManager.disablePlugin(e.getPluginId().getIdString()); - Notifications.Bus.notify(new Notification(PLUGIN_SETTINGS_ERROR, "Unable to save plugin settings!", - "

The plugin " + e.getPluginId() + " failed to save settings and has been disabled. Please restart" + - ApplicationNamesInfo.getInstance().getFullProductName() + "

" + - (ApplicationManagerEx.getApplicationEx().isInternal() ? "

" + StringUtil.getThrowableText(e) + "

": ""), - NotificationType.ERROR), NotificationDisplayType.BALLOON, this); + Notification notification = new Notification( + PLUGIN_SETTINGS_ERROR, + "Unable to save plugin settings!", + "

The plugin " + e.getPluginId() + " failed to save settings and has been disabled. Please restart" + + ApplicationNamesInfo.getInstance().getFullProductName() + "

" + + (ApplicationManagerEx.getApplicationEx().isInternal() ? "

" + StringUtil.getThrowableText(e) + "

" : ""), + NotificationType.ERROR); + Notifications.Bus.notify(notification, this); LOG.info("Unable to save plugin settings",e); } catch (IOException e) { @@ -344,6 +365,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } } + @Override public synchronized void dispose() { ApplicationEx application = ApplicationManagerEx.getApplicationEx(); assert application.isWriteAccessAllowed(); // dispose must be under write action @@ -382,7 +404,6 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } } } - private void projectClosed() { List components = new ArrayList(Arrays.asList(getComponents(ProjectComponent.class))); @@ -397,6 +418,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } } + @Override public T[] getExtensions(final ExtensionPointName extensionPointName) { return Extensions.getArea(this).getExtensionPoint(extensionPointName).getExtensions(); } @@ -423,10 +445,12 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { return Extensions.getArea(this).getPicoContainer(); } + @Override public boolean isDefault() { return false; } + @Override public void checkUnknownMacros(final boolean showDialog) { final IProjectStore stateStore = getStateStore(); @@ -472,7 +496,7 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { }); } else { - if (Messages.showYesNoDialog(this, "Component could not be reloaded. Reload project?", "Configuration changed", + if (Messages.showYesNoDialog(this, "Component could not be reloaded. Reload project?", "Configuration Changed", Messages.getQuestionIcon()) == 0) { ProjectManagerEx.getInstanceEx().reloadProject(this); } @@ -483,13 +507,12 @@ public class ProjectImpl extends ComponentManagerImpl implements ProjectEx { } @Override - public String toString() { - return "Project" - + (isDisposed() ? " (Disposed" + (temporarilyDisposed ? " temporarily" : "") + ")" - :isDefault() ? "" : " '" + getLocation()+"'") - + (isDefault() ? " (Default)" : "") - + " " + myName - ; + public String toString() { + return "Project" + + (isDisposed() ? " (Disposed" + (temporarilyDisposed ? " temporarily" : "") + ")" + : isDefault() ? "" : " '" + getPresentableUrl() + "'") + + (isDefault() ? " (Default)" : "") + + " " + myName; } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java index cf824c6cf6f6..468e749a9597 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ public class PlatformFrameTitleBuilder extends FrameTitleBuilder { return project.getName() + " - [" + FileUtil.getLocationRelativeToUserHome(baseDir.getPresentableUrl()) + "]"; } + return project.getName(); } diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 77fc75407f13..f4f0d19b1e0c 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -708,7 +708,7 @@ prompt.select.module.file.to.import=Select {0} module file (.iml) to import message.module.file.has.an.older.format.do.you.want.to.convert.it=Module file has an older format. Do you want to convert it? dialog.title.convert.module=Convert Module error.message.cannot.modify.file.0=Cannot modify file ''{0}'' -message.your.module.was.succesfully.converted.br.old.version.was.saved.to.0=Your module was successfully converted.
\ +message.your.module.was.successfully.converted.br.old.version.was.saved.to.0=Your module was successfully converted.
\ Old version was saved to ''{0}'' label.select.module.type=Module type: error.please.specify.path.to.module.file=Please specify path to {0} module file (.iml) diff --git a/platform/testFramework/src/com/intellij/mock/MockProjectStore.java b/platform/testFramework/src/com/intellij/mock/MockProjectStore.java index 8efc9ba48ed6..af32d43cdc3b 100644 --- a/platform/testFramework/src/com/intellij/mock/MockProjectStore.java +++ b/platform/testFramework/src/com/intellij/mock/MockProjectStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,10 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; -import java.util.Collection; -import java.util.List; import java.util.Set; -import java.util.TreeSet; /** * @author peter @@ -64,10 +61,14 @@ public class MockProjectStore implements IProjectStore { } @Override - @Nullable public VirtualFile getProjectBaseDir() { throw new UnsupportedOperationException("Method getProjectBaseDir is not yet implemented in " + getClass().getName()); - }//------ This methods should be got rid of + } + + @Override + public String getProjectBasePath() { + throw new UnsupportedOperationException("Method getProjectBasePath is not yet implemented in " + getClass().getName()); + } @Override public String getLocation() { @@ -117,18 +118,7 @@ public class MockProjectStore implements IProjectStore { @Override @NotNull public String getProjectFilePath() { - return null; - } - - public void setUsedMacros(@NotNull Collection macros) { - } - - public Set getMacroTrackingSet() { - return new TreeSet(); - } - - public void initStore() { - throw new UnsupportedOperationException("Method initStore is not yet implemented in " + getClass().getName()); + throw new UnsupportedOperationException("Method getProjectFilePath is not yet implemented in " + getClass().getName()); } @Override @@ -149,20 +139,12 @@ public class MockProjectStore implements IProjectStore { throw new UnsupportedOperationException("Method load is not yet implemented in " + getClass().getName()); } - public Collection getUsedMacros() { - throw new UnsupportedOperationException("Method getUsedMacros not implemented in " + getClass()); - } - @Override @NotNull public SaveSession startSave() throws IOException { throw new UnsupportedOperationException("Method startSave not implemented in " + getClass()); } - public List getAllStorageFilesToSave(final boolean includingSubStructures) { - throw new UnsupportedOperationException("Method getAllStorageFilesToSave is not yet implemented in " + getClass().getName()); - } - @Override @Nullable public String getPresentableUrl() { From 3fbcc7c19fd0675ce7461bc99871f5bd4bb3ad7b Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 20 Feb 2012 15:08:21 +0100 Subject: [PATCH 2/9] Cleanup --- .../intellij/openapi/project/ProjectUtil.java | 15 ++--- .../ide/projectView/impl/ProjectViewImpl.java | 58 +------------------ .../com/intellij/ide/impl/ProjectUtil.java | 35 ++++++----- .../intellij/openapi/util/io/FileUtil.java | 8 +-- 4 files changed, 32 insertions(+), 84 deletions(-) diff --git a/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java b/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java index cd22a9b403f6..f17e68759dcb 100644 --- a/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * @author max - */ package com.intellij.openapi.project; import com.intellij.ide.DataManager; @@ -40,16 +36,17 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; +/** + * @author max + */ public class ProjectUtil { @NonNls public static final String DIRECTORY_BASED_PROJECT_DIR = ".idea"; - private ProjectUtil() { - } + private ProjectUtil() { } @Nullable public static String getProjectLocationString(@NotNull final Project project) { - String projectPath = project.getLocation(); - return FileUtil.getLocationRelativeToUserHome(projectPath); + return FileUtil.getLocationRelativeToUserHome(project.getBasePath()); } public static String calcRelativeToProjectPath(final VirtualFile file, final Project project, final boolean includeFilePath) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index 1f18a4de9dcd..73589cae29d7 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; @@ -61,7 +60,6 @@ import com.intellij.openapi.ui.SimpleToolWindowPanel; import com.intellij.openapi.ui.SplitterProportionsData; import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.openapi.util.*; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; @@ -75,6 +73,7 @@ import com.intellij.openapi.wm.impl.content.ToolWindowContentUi; import com.intellij.psi.*; import com.intellij.psi.impl.file.PsiDirectoryFactory; import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.ui.AutoScrollFromSourceHandler; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.GuiUtils; @@ -157,7 +156,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo @Deprecated static final String PROJECT_VIEW_DATA_CONSTANT = DATA_KEY.getName(); private DefaultActionGroup myActionGroup; - private final Runnable myTreeChangeListener; private String mySavedPaneId = ProjectViewPane.ID; private String mySavedPaneSubId; //private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png"); @@ -200,11 +198,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo Disposer.register(myProject, this); myFileEditorManager = fileEditorManager; - myTreeChangeListener = new Runnable() { - public void run() { - updateToolWindowTitle(); - } - }; myConnection = project.getMessageBus().connect(); myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { @@ -474,15 +467,13 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo createToolbarActions(); updateTitleActions(); - newPane.setTreeChangeListener(myTreeChangeListener); myAutoScrollToSourceHandler.install(newPane.myTree); IdeFocusManager.getInstance(myProject).requestFocus(newPane.getComponentToFocus(), false); - updateToolWindowTitle(); newPane.restoreExpandedPaths(); if (selectedPsiElement != null) { - final VirtualFile virtualFile = PsiUtilBase.getVirtualFile(selectedPsiElement); + final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(selectedPsiElement); if (virtualFile != null && ((ProjectViewSelectInTarget)newPane.createSelectInTarget()).isSubIdSelectable(newSubId, new SelectInContext() { @NotNull public Project getProject() { @@ -754,49 +745,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo return myCurrentViewId; } - private void updateToolWindowTitle() { - if (true) return; - ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject); - ToolWindow toolWindow = toolWindowManager == null ? null : toolWindowManager.getToolWindow(ToolWindowId.PROJECT_VIEW); - if (toolWindow == null) return; - String title = null; - final AbstractProjectViewPane pane = getCurrentProjectViewPane(); - if (pane != null) { - final DefaultMutableTreeNode selectedNode = pane.getSelectedNode(); - if (selectedNode != null) { - final Object o = selectedNode.getUserObject(); - if (o instanceof ProjectViewNode) { - title = ((ProjectViewNode)o).getTitle(); - } - } - } - if (title == null) { - if (true) return; - - final PsiElement element = (PsiElement)myDataProvider.getData(LangDataKeys.PSI_ELEMENT.getName()); - if (element != null) { - PsiFile file = element.getContainingFile(); - if (file != null) { - title = FileUtil.getLocationRelativeToUserHome(file.getVirtualFile().getPresentableUrl()); - } - else if (element instanceof PsiDirectory) { - title = PsiDirectoryFactory.getInstance(myProject).getQualifiedName((PsiDirectory) element, true); - } - else { - title = element.toString(); - } - } - else { - title = ""; - if (myProject != null) { - title = FileUtil.getLocationRelativeToUserHome(myProject.getPresentableUrl()); - } - } - } - - toolWindow.setTitle(title); - } - public PsiElement getParentOfCurrentSelection() { final AbstractProjectViewPane viewPane = getCurrentProjectViewPane(); if (viewPane == null) { diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java index f304cf85b715..1e1dfef7ea35 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,14 +18,12 @@ package com.intellij.ide.impl; import com.intellij.CommonBundle; import com.intellij.ide.GeneralSettings; import com.intellij.ide.IdeBundle; -import com.intellij.ide.highlighter.InternalFileType; import com.intellij.ide.highlighter.ProjectFileType; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.StorageScheme; import com.intellij.openapi.components.impl.stores.IProjectStore; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ex.ProjectEx; @@ -53,13 +51,12 @@ import java.io.IOException; public class ProjectUtil { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.impl.ProjectUtil"); - private ProjectUtil() { - } + private ProjectUtil() { } public static void updateLastProjectLocation(final String projectFilePath) { File lastProjectLocation = new File(projectFilePath); if (lastProjectLocation.isFile()) { - lastProjectLocation = lastProjectLocation.getParentFile(); //for directory based project storages + lastProjectLocation = lastProjectLocation.getParentFile(); // for directory-based project storage } if (lastProjectLocation == null) { // the immediate parent of the ipr file return; @@ -205,19 +202,23 @@ public class ProjectUtil { if (confirmOpenNewProject == GeneralSettings.OPEN_PROJECT_ASK) { if (isNewProject) { int exitCode = Messages.showYesNoDialog(IdeBundle.message("prompt.open.project.in.new.frame"), - IdeBundle.message("title.new.project"), - IdeBundle.message("button.existingframe"), - IdeBundle.message("button.newframe"), - Messages.getQuestionIcon(), new ProjectNewWindowDoNotAskOption()); + IdeBundle.message("title.new.project"), + IdeBundle.message("button.existingframe"), + IdeBundle.message("button.newframe"), + Messages.getQuestionIcon(), + new ProjectNewWindowDoNotAskOption()); return exitCode == 0 ? GeneralSettings.OPEN_PROJECT_SAME_WINDOW : GeneralSettings.OPEN_PROJECT_NEW_WINDOW; } else { int exitCode = Messages.showYesNoCancelDialog(IdeBundle.message("prompt.open.project.in.new.frame"), - IdeBundle.message("title.open.project"), - IdeBundle.message("button.existingframe"), IdeBundle.message("button.newframe"), - CommonBundle.getCancelButtonText(), Messages.getQuestionIcon(), - new ProjectNewWindowDoNotAskOption()); - return exitCode == 0 ? GeneralSettings.OPEN_PROJECT_SAME_WINDOW : exitCode == 1 ? GeneralSettings.OPEN_PROJECT_NEW_WINDOW : Messages.CANCEL; + IdeBundle.message("title.open.project"), + IdeBundle.message("button.existingframe"), + IdeBundle.message("button.newframe"), + CommonBundle.getCancelButtonText(), + Messages.getQuestionIcon(), + new ProjectNewWindowDoNotAskOption()); + return exitCode == 0 ? GeneralSettings.OPEN_PROJECT_SAME_WINDOW : + exitCode == 1 ? GeneralSettings.OPEN_PROJECT_NEW_WINDOW : Messages.CANCEL; } } return confirmOpenNewProject; @@ -265,6 +266,10 @@ public class ProjectUtil { } } + /** + * @deprecated use {@linkplain com.intellij.openapi.project.ProjectUtil#isProjectOrWorkspaceFile(com.intellij.openapi.vfs.VirtualFile)} (to remove in IDEA 13) + */ + @SuppressWarnings("UnusedDeclaration") public static boolean isProjectOrWorkspaceFile(final VirtualFile file) { return com.intellij.openapi.project.ProjectUtil.isProjectOrWorkspaceFile(file); } diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index 2140094c72dc..96aef7f4b09a 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -1290,17 +1290,15 @@ public class FileUtil { public static String getLocationRelativeToUserHome(final String path) { if (path == null) return null; - String _path = path; - - if (SystemInfo.isLinux || SystemInfo.isMac) { + if (SystemInfo.isUnix) { final File projectDir = new File(path); final File userHomeDir = new File(SystemProperties.getUserHome()); if (isAncestor(userHomeDir, projectDir, true)) { - _path = "~/" + getRelativePath(userHomeDir, projectDir); + return "~/" + getRelativePath(userHomeDir, projectDir); } } - return _path; + return path; } public static boolean isHashBangLine(CharSequence firstCharsIfText, String marker) { From 6390969c3c6cbfd07b52b1293cb4f460d3fce5a4 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 20 Feb 2012 16:02:48 +0100 Subject: [PATCH 3/9] Funniest typo so far :) --- bin/scripts/unix/idea.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh index 6b63c1264612..0da33fa5eb4f 100755 --- a/bin/scripts/unix/idea.sh +++ b/bin/scripts/unix/idea.sh @@ -8,7 +8,7 @@ OS_TYPE="`uname -s`" # --------------------------------------------------------------------- -# Locate a JDK installation directory which will be used to ruin the IDE. +# Locate a JDK installation directory which will be used to run the IDE. # Try (in order): @@product_uc@@_JDK, JDK_HOME, JAVA_HOME, "java" in PATH. # --------------------------------------------------------------------- if [ -n "$@@product_uc@@_JDK" -a -x "$@@product_uc@@_JDK/bin/java" ]; then From 6f30544354d1f7382e70012c666748824fe4fefb Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 20 Feb 2012 18:50:12 +0100 Subject: [PATCH 4/9] Project API usages corrected (part 1) --- .../com/intellij/openapi/project/Project.java | 3 +-- .../src/com/intellij/analysis/AnalysisScope.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/platform/core-api/src/com/intellij/openapi/project/Project.java b/platform/core-api/src/com/intellij/openapi/project/Project.java index 1a562fbf6b47..bb57840075f1 100644 --- a/platform/core-api/src/com/intellij/openapi/project/Project.java +++ b/platform/core-api/src/com/intellij/openapi/project/Project.java @@ -83,10 +83,9 @@ public interface Project extends ComponentManager, AreaInstance { /** * Returns presentable project path: - * {@linkplain #getProjectFilePath()} for file-based projects, {@linkplain #getLocation()} for directory-based ones. + * {@linkplain #getProjectFilePath()} for file-based projects, {@linkplain #getBasePath()} for directory-based ones. * * @return presentable project path - * todo: check usages */ @Nullable @NonNls diff --git a/platform/lang-api/src/com/intellij/analysis/AnalysisScope.java b/platform/lang-api/src/com/intellij/analysis/AnalysisScope.java index 2358db74dd8e..8d0539de8f66 100644 --- a/platform/lang-api/src/com/intellij/analysis/AnalysisScope.java +++ b/platform/lang-api/src/com/intellij/analysis/AnalysisScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -429,15 +429,13 @@ public class AnalysisScope { return AnalysisScopeBundle.message("scope.module.list", modules, Integer.valueOf(myModules.size())); case PROJECT: - return AnalysisScopeBundle.message("scope.project", pathToName(myProject.getPresentableUrl())); + return AnalysisScopeBundle.message("scope.project", myProject.getName()); case FILE: - final VirtualFile virtualFile = ((PsiFileSystemItem)myElement).getVirtualFile(); - LOG.assertTrue(virtualFile != null); - return AnalysisScopeBundle.message("scope.file", virtualFile.getPresentableUrl()); + return AnalysisScopeBundle.message("scope.file", getPresentableUrl((PsiFileSystemItem)myElement)); case DIRECTORY: - return AnalysisScopeBundle.message("scope.directory", ((PsiFileSystemItem)myElement).getVirtualFile().getPresentableUrl()); + return AnalysisScopeBundle.message("scope.directory", getPresentableUrl((PsiFileSystemItem)myElement)); case VIRTUAL_FILES: return AnalysisScopeBundle.message("scope.virtual.files"); @@ -446,6 +444,12 @@ public class AnalysisScope { return ""; } + private static String getPresentableUrl(final PsiFileSystemItem element) { + final VirtualFile virtualFile = element.getVirtualFile(); + assert virtualFile != null : element; + return virtualFile.getPresentableUrl(); + } + public String getShortenName(){ switch (myType) { case CUSTOM: From f1fa76e361e182de0c3e66f577360a58457505b0 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 20 Feb 2012 20:27:49 +0100 Subject: [PATCH 5/9] Project API usages corrected (part 2) --- .../compiler/CompileServerManager.java | 16 ++++++++++++---- .../openapi/compiler/CompilerPaths.java | 10 +++++++--- .../intellij/ide/RecentProjectsManager.java | 7 ++----- .../intellij/psi/search/UpdateCacheTest.java | 18 +++++++++++++++++- .../com/intellij/openapi/project/Project.java | 11 ++++++++--- .../actions/AbstractLayoutCodeProcessor.java | 4 ++-- .../console/ConsoleHistoryController.java | 4 ++-- .../src/com/intellij/ide/impl/ProjectUtil.java | 5 +++-- .../impl/stores/ProjectStoreImpl.java | 2 +- .../project/impl/ProjectManagerImpl.java | 4 ++-- .../vfs/newvfs/impl/VirtualDirectoryImpl.java | 10 ++++++---- .../openapi/wm/impl/ProjectWindowAction.java | 4 ++-- .../wm/impl/ProjectWindowActionGroup.java | 10 +++++----- .../export/ExportTestResultsAction.java | 9 +++------ .../lang/ant/config/actions/TargetAction.java | 6 ++++-- .../ant/config/execution/ExecutionHandler.java | 7 ++++--- 16 files changed, 80 insertions(+), 47 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java index 8abbe757472b..ced65cfc37f5 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -191,6 +191,14 @@ public class CompileServerManager implements ApplicationComponent{ sendNotification(paths, true); } + @Nullable + private static String getProjectPath(final Project project) { + final String path = project.getPresentableUrl(); + if (path == null) return path; + final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(path); + return vFile != null ? vFile.getPath() : null; + } + public void sendReloadRequest(final Project project) { if (!project.isDefault() && project.isOpen()) { myTaskExecutor.submit(new Runnable() { @@ -200,7 +208,7 @@ public class CompileServerManager implements ApplicationComponent{ if (!project.isDisposed()) { final CompileServerClient client = ensureServerRunningAndClientConnected(false); if (client != null) { - client.sendProjectReloadRequest(Collections.singletonList(project.getLocation())); + client.sendProjectReloadRequest(Collections.singletonList(getProjectPath(project))); } } } @@ -251,7 +259,7 @@ public class CompileServerManager implements ApplicationComponent{ } for (Project project : openProjects) { try { - client.sendFSEvent(project.getLocation(), changed, deleted); + client.sendFSEvent(getProjectPath(project), changed, deleted); } catch (Exception e) { LOG.info(e); @@ -317,7 +325,7 @@ public class CompileServerManager implements ApplicationComponent{ final Collection modules, final Collection artifacts, final Collection paths, final Map userData, final JpsServerResponseHandler handler) { - final String projectId = project.getLocation(); + final String projectId = getProjectPath(project); final Ref futureRef = new Ref(null); final RunnableFuture future = myTaskExecutor.submit(new Runnable() { public void run() { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerPaths.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerPaths.java index 7f21c224225f..b366bc5a443d 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerPaths.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerPaths.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -96,13 +96,17 @@ public class CompilerPaths { return new File(getCompilerSystemDirectory(), projectName + "." + project.getLocationHash()); } + @Nullable private static String getPresentableName(final Project project) { if (project.isDefault()) { return project.getName(); } - String location = project.getLocation(); - if (location == null) return null; + String location = project.getPresentableUrl(); + if (location == null) { + return null; + } + String projectName = FileUtil.toSystemIndependentName(location); if (projectName.endsWith("/")) { projectName = projectName.substring(0, projectName.length() - 1); diff --git a/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java b/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java index c3ff4043ae1e..cd5a83b0d706 100644 --- a/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java +++ b/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.util.messages.MessageBus; -import java.io.File; - @State( name = "RecentProjectsManager", roamingType = RoamingType.DISABLED, @@ -39,8 +37,7 @@ public class RecentProjectsManager extends RecentProjectsManagerBase { } protected String getProjectPath(Project project) { - final String location = project.getLocation(); - return location == null ? null : location.replace('/', File.separatorChar); + return project.getPresentableUrl(); } protected void doOpenProject(final String projectPath, Project projectToClose, final boolean forceOpenInNewFrame) { diff --git a/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java b/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java index d1877bd01d70..cd2cf6890ac3 100644 --- a/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.search; import com.intellij.JavaTestUtil; @@ -139,7 +154,8 @@ public class UpdateCacheTest extends PsiTestCase{ checkUsages(objectClass, new String[]{}); FileBasedIndex.getInstance().getContainingFiles(TodoIndex.NAME, new TodoIndexEntry("todo", true), GlobalSearchScope.allScope(getProject())); - final String projectLocation = myProject.getLocation(); + final String projectLocation = myProject.getPresentableUrl(); + assert projectLocation != null : myProject; myProject.save(); final VirtualFile content = ModuleRootManager.getInstance(getModule()).getContentRoots()[0]; ProjectUtil.closeAndDispose(myProject); diff --git a/platform/core-api/src/com/intellij/openapi/project/Project.java b/platform/core-api/src/com/intellij/openapi/project/Project.java index bb57840075f1..f70e4025e64b 100644 --- a/platform/core-api/src/com/intellij/openapi/project/Project.java +++ b/platform/core-api/src/com/intellij/openapi/project/Project.java @@ -28,6 +28,12 @@ import org.jetbrains.annotations.Nullable; public interface Project extends ComponentManager, AreaInstance { @NonNls String DIRECTORY_STORE_FOLDER = ".idea"; + /** + * Returns a name ot the project. For a directory-based project it's an arbitrary string specified by user at project creation + * or later in a project settings. For a file-based project it's a name of a project file without extension. + * + * @return project name + */ @NotNull @NonNls String getName(); @@ -40,7 +46,6 @@ public interface Project extends ComponentManager, AreaInstance { * if it's desired to keep symlinks in original path.

* * @return project base directory, or null for default project - * todo: check usages */ @Nullable VirtualFile getBaseDir(); @@ -83,7 +88,8 @@ public interface Project extends ComponentManager, AreaInstance { /** * Returns presentable project path: - * {@linkplain #getProjectFilePath()} for file-based projects, {@linkplain #getBasePath()} for directory-based ones. + * {@linkplain #getProjectFilePath()} for file-based projects, {@linkplain #getBasePath()} for directory-based ones.
+ * Note: the word "presentable" here implies file system presentation, not a UI one. * * @return presentable project path */ @@ -110,7 +116,6 @@ public interface Project extends ComponentManager, AreaInstance { /** * @deprecated please use {@linkplain #getPresentableUrl()} or {@linkplain #getBasePath()} (to remove in IDEA 13). - * todo: remove usages */ @Nullable @NonNls diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java index 7dc21a333c96..b13222bb406b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -389,7 +389,7 @@ public abstract class AbstractLayoutCodeProcessor { private static Set getIgnoreRoots(@NotNull Project project) { Set result = new HashSet(); - String location = project.getLocation(); + String location = project.getBasePath(); if (location != null) { File projectDir = new File(location, Project.DIRECTORY_STORE_FOLDER); if (projectDir.isDirectory()) { diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java index 3806e0ff9656..29b8a89c4645 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleHistoryController.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ public class ConsoleHistoryController { @NotNull final LanguageConsoleImpl console, @NotNull final ConsoleHistoryModel model) { myType = type; - myId = StringUtil.isEmpty(persistenceId)? console.getProject().getLocation() : persistenceId; + myId = StringUtil.isEmpty(persistenceId)? console.getProject().getPresentableUrl() : persistenceId; myConsole = console; myModel = model; } diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java index 1e1dfef7ea35..8d1732e88c5a 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java @@ -138,7 +138,7 @@ public class ProjectUtil { } @Nullable - public static Project openProject(final String path, Project projectToClose, boolean forceOpenInNewFrame) { + public static Project openProject(final String path, @Nullable Project projectToClose, boolean forceOpenInNewFrame) { File file = new File(path); if (!file.exists()) { Messages.showErrorDialog(IdeBundle.message("error.project.file.does.not.exist", path), CommonBundle.getErrorTitle()); @@ -161,7 +161,8 @@ public class ProjectUtil { if (!forceOpenInNewFrame && openProjects.length > 0) { int exitCode = confirmOpenNewProject(false); if (exitCode == GeneralSettings.OPEN_PROJECT_SAME_WINDOW) { - if (!closeAndDispose(projectToClose != null ? projectToClose : openProjects[openProjects.length - 1])) return null; + final Project toClose = projectToClose != null ? projectToClose : openProjects[openProjects.length - 1]; + if (!closeAndDispose(toClose)) return null; } else if (exitCode != GeneralSettings.OPEN_PROJECT_NEW_WINDOW) { return null; diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java index 9032270e62a5..6b49310d49fa 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java @@ -316,7 +316,7 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject String temp = getProjectFileName(); FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(temp); if (fileType instanceof ProjectFileType) { - temp = temp.substring(0, temp.length() - fileType.getDefaultExtension().length()-1); + temp = temp.substring(0, temp.length() - fileType.getDefaultExtension().length() - 1); } final int i = temp.lastIndexOf(File.separatorChar); if (i >= 0) { diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java index faf376e92bd1..d957eca4d645 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -918,7 +918,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt ProjectImpl projectImpl = (ProjectImpl)project[0]; if (projectImpl.isDisposed()) return; IProjectStore projectStore = projectImpl.getStateStore(); - final String location = projectImpl.getLocation(); + final String location = projectImpl.getPresentableUrl(); final List original; try { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java index e28e5e496034..d5d81f96374e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java @@ -222,6 +222,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { String childPath = child.getPath(); if (child.getFileSystem() == JarFileSystem.getInstance()) { VirtualFile local = JarFileSystem.getInstance().getVirtualFileForJar(child); + assert local != null : child; childPath = local.getPath(); } if (FileUtil.startsWith(childPath, root)) { @@ -238,13 +239,14 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { if (!isUnder) { if (!allowed.isEmpty()) { - assert false : "File accessed outside allowed roots: " + child + ";\n Allowed roots: " + new ArrayList(allowed); + assert false : "File accessed outside allowed roots: " + child + ";\n Allowed roots: " + allowed; } } } } // null means we were unable to get roots, so do not check access + @Nullable private static Set allowedRoots() { if (insideGettingRoots) return null; Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); @@ -257,8 +259,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { String output = new File(outUrl.toURI()).getParentFile().getParentFile().getPath(); allowed.add(FileUtil.toSystemIndependentName(output)); } - catch (URISyntaxException ignored) { - } + catch (URISyntaxException ignored) { } String javaHome = SystemProperties.getJavaHome(); allowed.add(FileUtil.toSystemIndependentName(javaHome)); String tempDirectorySpecific = new File(FileUtil.getTempDirectory()).getParent(); @@ -277,7 +278,8 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { for (VirtualFile root : getAllRoots(project)) { allowed.add(StringUtil.trimEnd(root.getPath(), JarFileSystem.JAR_SEPARATOR)); } - String location = project.getLocation(); + String location = project.getBasePath(); + assert location != null : project; allowed.add(FileUtil.toSystemIndependentName(location)); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java index 60ce09d2c921..997e85a14001 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java @@ -90,7 +90,7 @@ public class ProjectWindowAction extends ToggleAction implements DumbAware { public Frame findProjectFrame() { final Project[] projects = ProjectManager.getInstance().getOpenProjects(); for (Project project : projects) { - if (myProjectLocation.equals(project.getLocation())) { + if (myProjectLocation.equals(project.getPresentableUrl())) { final WindowManager windowManager = WindowManager.getInstance(); return windowManager.getFrame(project); } @@ -104,7 +104,7 @@ public class ProjectWindowAction extends ToggleAction implements DumbAware { if (project == null) { return false; } - return myProjectLocation.equals(project.getLocation()); + return myProjectLocation.equals(project.getPresentableUrl()); } public void setSelected(@Nullable AnActionEvent e, boolean selected) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java index 4c8bc785c276..341d28d166dc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java @@ -36,7 +36,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { private ProjectWindowAction latest = null; public void addProject(@NotNull Project project) { - final String projectLocation = project.getLocation(); + final String projectLocation = project.getPresentableUrl(); if (projectLocation == null) { return; } @@ -56,7 +56,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { } public void removeProject(@NotNull Project project) { - final ProjectWindowAction windowAction = findWindowAction(project.getLocation()); + final ProjectWindowAction windowAction = findWindowAction(project.getPresentableUrl()); if (windowAction == null) { return; } @@ -91,7 +91,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { if (project == null) { return; } - final ProjectWindowAction windowAction = findWindowAction(project.getLocation()); + final ProjectWindowAction windowAction = findWindowAction(project.getPresentableUrl()); if (windowAction == null) { return; } @@ -106,7 +106,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { if (project == null) { return; } - final ProjectWindowAction windowAction = findWindowAction(project.getLocation()); + final ProjectWindowAction windowAction = findWindowAction(project.getPresentableUrl()); if (windowAction == null) { return; } @@ -144,7 +144,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup { final ProjectWindowAction windowAction = (ProjectWindowAction) child; if (projectName.equals(windowAction.getProjectName())) { if (result == null) { - result = new ArrayList(); + result = new ArrayList(); } result.add(windowAction); } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java index 6c08399b0199..67bfa9c18dde 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ import com.intellij.diagnostic.LogMessageEx; import com.intellij.diagnostic.errordialog.Attachment; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.configurations.RuntimeConfiguration; -import com.intellij.execution.testframework.AbstractTestProxy; import com.intellij.execution.testframework.TestFrameworkRunningModel; import com.intellij.ide.BrowserUtil; import com.intellij.openapi.actionSystem.ActionManager; @@ -28,7 +27,6 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.progress.PerformInBackgroundOption; @@ -142,12 +140,11 @@ public class ExportTestResultsAction extends DumbAwareAction { outputFolder = new File(config.getOutputFolder()); } else { - outputFolder = new File(new File(project.getLocation()), config.getOutputFolder()); + outputFolder = new File(new File(project.getBasePath()), config.getOutputFolder()); } } else { - outputFolder = new File(project.getLocation()); - + outputFolder = new File(project.getBasePath()); } final File outputFile = new File(outputFolder, filename_); final String outputText; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java index 9f6e9e7c7ab2..e7c1e3528bf9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,9 @@ public final class TargetAction extends AnAction { templatePresentation.setDescription(description); myBuildName = buildFile.getPresentableName(); myTargets = targets; - myDebugString = "Target action: " + displayName+ "; Build: " + buildFile.getPresentableName() + "; Project: " + buildFile.getProject().getLocation(); + myDebugString = "Target action: " + displayName + + "; Build: " + buildFile.getPresentableName() + + "; Project: " + buildFile.getProject().getPresentableUrl(); } public String toString() { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java index 77e9bd77b1ad..25d4c498804f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,6 +46,7 @@ import com.intellij.openapi.vfs.encoding.EncodingProjectManager; import com.intellij.openapi.wm.*; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.concurrent.TimeUnit; @@ -63,7 +64,7 @@ public final class ExecutionHandler { */ public static void runBuild(final AntBuildFileBase buildFile, String[] targets, - final AntBuildMessageView buildMessageViewToReuse, + @Nullable final AntBuildMessageView buildMessageViewToReuse, final DataContext dataContext, List additionalProperties, @NotNull final AntBuildListener antBuildListener) { FileDocumentManager.getInstance().saveAllDocuments(); @@ -223,7 +224,7 @@ public final class ExecutionHandler { } } - private static AntBuildMessageView prepareMessageView(AntBuildMessageView buildMessageViewToReuse, + private static AntBuildMessageView prepareMessageView(@Nullable AntBuildMessageView buildMessageViewToReuse, AntBuildFileBase buildFile, String[] targets) throws RunCanceledException { AntBuildMessageView messageView; From 4a4df0dc399cb94ccde9bba9f8275e3107f7aa1a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 21 Feb 2012 11:31:57 +0100 Subject: [PATCH 6/9] To English dictionary --- plugins/spellchecker/src/com/intellij/spellchecker/english.dic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/english.dic b/plugins/spellchecker/src/com/intellij/spellchecker/english.dic index e5e1f75b4c06..8e1321bb6ff0 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/english.dic +++ b/plugins/spellchecker/src/com/intellij/spellchecker/english.dic @@ -134293,6 +134293,8 @@ versifying versing version version's +versional +versioned versions verso verso's From a59749c742f91da1a260550889e1c0678e8dc8f8 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 21 Feb 2012 12:21:14 +0100 Subject: [PATCH 7/9] Just formatting --- .../intellij/ui/mac/MacFileChooserDialogImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java index de80c1b6561b..65bc28bec9ba 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java @@ -192,24 +192,23 @@ public class MacFileChooserDialogImpl implements PathChooserDialog { } static { - final ID delegateClass = Foundation.allocateObjcClassPair(Foundation.getObjcClass("NSObject"), "NSOpenPanelDelegate_"); - if (!Foundation.addMethod(delegateClass, Foundation.createSelector("panel:shouldShowFilename:"), SHOULD_SHOW_FILENAME_CALLBACK, "B*")) { + final ID delegate = Foundation.allocateObjcClassPair(Foundation.getObjcClass("NSObject"), "NSOpenPanelDelegate_"); + if (!Foundation.addMethod(delegate, Foundation.createSelector("panel:shouldShowFilename:"), SHOULD_SHOW_FILENAME_CALLBACK, "B*")) { throw new RuntimeException("Unable to add method to objective-c delegate class!"); } - if (!Foundation.addMethod(delegateClass, Foundation.createSelector("panel:isValidFilename:"), IS_VALID_FILENAME_CALLBACK, "B*")) { + if (!Foundation.addMethod(delegate, Foundation.createSelector("panel:isValidFilename:"), IS_VALID_FILENAME_CALLBACK, "B*")) { throw new RuntimeException("Unable to add method to objective-c delegate class!"); } - if (!Foundation.addMethod(delegateClass, Foundation.createSelector("showOpenPanel:"), MAIN_THREAD_RUNNABLE, "v*")) { + if (!Foundation.addMethod(delegate, Foundation.createSelector("showOpenPanel:"), MAIN_THREAD_RUNNABLE, "v*")) { throw new RuntimeException("Unable to add method to objective-c delegate class!"); } - if (!Foundation.addMethod(delegateClass, Foundation.createSelector("openPanelDidEnd:returnCode:contextInfo:"), OPEN_PANEL_DID_END, - "v*i")) { + if (!Foundation.addMethod(delegate, Foundation.createSelector("openPanelDidEnd:returnCode:contextInfo:"), OPEN_PANEL_DID_END, "v*i")) { throw new RuntimeException("Unable to add method to objective-c delegate class!"); } - if (!Foundation.addMethod(delegateClass, Foundation.createSelector("panel:shouldEnableURL:"), SHOULD_ENABLE_URL, "B@@")) { + if (!Foundation.addMethod(delegate, Foundation.createSelector("panel:shouldEnableURL:"), SHOULD_ENABLE_URL, "B@@")) { throw new RuntimeException("Unable to add method to objective-c delegate class!"); } - Foundation.registerObjcClassPair(delegateClass); + Foundation.registerObjcClassPair(delegate); } public MacFileChooserDialogImpl(@NotNull FileChooserDescriptor chooserDescriptor, Project project) { From d7b980dfc38054fa082382258d4fa577ec84ba87 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 21 Feb 2012 13:51:03 +0100 Subject: [PATCH 8/9] Show logical project path in a frame title --- .../openapi/wm/IdeaFrameTitleBuilder.java | 6 ++-- .../intellij/openapi/project/ProjectUtil.java | 10 ++++-- .../openapi/wm/impl/FrameTitleBuilder.java | 7 ++-- .../openapi/wm/impl/IdeFrameImpl.java | 4 +-- .../wm/impl/PlatformFrameTitleBuilder.java | 32 +++++++++++-------- .../intellij/openapi/util/io/FileUtil.java | 2 +- 6 files changed, 37 insertions(+), 24 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/wm/IdeaFrameTitleBuilder.java b/java/idea-ui/src/com/intellij/openapi/wm/IdeaFrameTitleBuilder.java index b82da4da9fd1..9796f9e8db3b 100644 --- a/java/idea-ui/src/com/intellij/openapi/wm/IdeaFrameTitleBuilder.java +++ b/java/idea-ui/src/com/intellij/openapi/wm/IdeaFrameTitleBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +20,14 @@ import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.impl.PlatformFrameTitleBuilder; +import org.jetbrains.annotations.NotNull; /** * @author yole */ public class IdeaFrameTitleBuilder extends PlatformFrameTitleBuilder { - public String getFileTitle(final Project project, final VirtualFile file) { + @Override + public String getFileTitle(@NotNull final Project project, @NotNull final VirtualFile file) { return ProjectUtil.calcRelativeToProjectPath(file, project, !SystemInfo.isMac); } } diff --git a/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java b/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java index f17e68759dcb..8683342f873e 100644 --- a/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java @@ -49,12 +49,16 @@ public class ProjectUtil { return FileUtil.getLocationRelativeToUserHome(project.getBasePath()); } - public static String calcRelativeToProjectPath(final VirtualFile file, final Project project, final boolean includeFilePath) { + @NotNull + public static String calcRelativeToProjectPath(@NotNull final VirtualFile file, + @Nullable final Project project, + final boolean includeFilePath) { return calcRelativeToProjectPath(file, project, includeFilePath, false); } - public static String calcRelativeToProjectPath(final VirtualFile file, - final Project project, + @NotNull + public static String calcRelativeToProjectPath(@NotNull final VirtualFile file, + @Nullable final Project project, final boolean includeFilePath, final boolean keepModuleAlwaysOnTheLeft) { if (file instanceof VirtualFilePathWrapper) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FrameTitleBuilder.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FrameTitleBuilder.java index ce0250378b27..3432f48dbe73 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FrameTitleBuilder.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FrameTitleBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package com.intellij.openapi.wm.impl; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; /** * @author yole @@ -27,7 +28,7 @@ public abstract class FrameTitleBuilder { return ServiceManager.getService(FrameTitleBuilder.class); } - public abstract String getFileTitle(final Project project, final VirtualFile file); + public abstract String getProjectTitle(@NotNull final Project project); - public abstract String getProjectTitle(final Project project); + public abstract String getFileTitle(@NotNull final Project project, @NotNull final VirtualFile file); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java index 76422cc6e8e1..ddb0d4f6ad93 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -256,7 +256,7 @@ public class IdeFrameImpl extends JFrame implements IdeFrame, DataProvider { myUpdatingTitle = false; } } - + private static final class Builder { public StringBuilder sb = new StringBuilder(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java index 468e749a9597..7f91b64d9cdf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java @@ -21,39 +21,45 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFilePathWrapper; import com.intellij.platform.ProjectBaseDirectory; +import org.jetbrains.annotations.NotNull; /** * @author yole */ public class PlatformFrameTitleBuilder extends FrameTitleBuilder { - public String getProjectTitle(final Project project) { - final VirtualFile baseDir = project.getBaseDir(); - if (baseDir != null) { - if (SystemInfo.isMac && baseDir.getName().equals(project.getName())) { - return "[" + FileUtil.getLocationRelativeToUserHome(baseDir.getPresentableUrl()) + "]"; - } - - return project.getName() + " - [" + FileUtil.getLocationRelativeToUserHome(baseDir.getPresentableUrl()) + "]"; - } + @Override + public String getProjectTitle(@NotNull final Project project) { + final String basePath = project.getBasePath(); + if (basePath == null) return project.getName(); - return project.getName(); + if (basePath.equals(project.getName())) { + return "[" + FileUtil.getLocationRelativeToUserHome(basePath) + "]"; + } + else { + return project.getName() + " - [" + FileUtil.getLocationRelativeToUserHome(basePath) + "]"; + } } - public String getFileTitle(final Project project, final VirtualFile file) { + @Override + public String getFileTitle(@NotNull final Project project, @NotNull final VirtualFile file) { if (SystemInfo.isMac) return file.getName(); if (file instanceof VirtualFilePathWrapper) { return ((VirtualFilePathWrapper)file).getPresentablePath(); } + String url = FileUtil.getLocationRelativeToUserHome(file.getPresentableUrl()); + if (url == null) url = file.getPresentableUrl(); + VirtualFile baseDir = ProjectBaseDirectory.getInstance(project).getBaseDir(); if (baseDir == null) baseDir = project.getBaseDir(); + if (baseDir != null) { - //noinspection ConstantConditions final String projectHomeUrl = FileUtil.getLocationRelativeToUserHome(baseDir.getPresentableUrl()); - if (url.startsWith(projectHomeUrl)) { + if (projectHomeUrl != null && url.startsWith(projectHomeUrl)) { url = "..." + url.substring(projectHomeUrl.length()); } } + return url; } } diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index 96aef7f4b09a..e02187132e29 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -1287,7 +1287,7 @@ public class FileUtil { } @Nullable - public static String getLocationRelativeToUserHome(final String path) { + public static String getLocationRelativeToUserHome(@Nullable final String path) { if (path == null) return null; if (SystemInfo.isUnix) { From e2668561de321777f7ddefda712c6e7a207da724 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 21 Feb 2012 14:04:48 +0100 Subject: [PATCH 9/9] IDEA-81487 (fix Windows startup script to locate bundled JRE) --- bin/scripts/win/idea.bat | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/scripts/win/idea.bat b/bin/scripts/win/idea.bat index d92bc5e11c1c..214e41642168 100644 --- a/bin/scripts/win/idea.bat +++ b/bin/scripts/win/idea.bat @@ -5,15 +5,21 @@ ::---------------------------------------------------------------------- :: --------------------------------------------------------------------- -:: Locate a JDK installation directory which will be used to ruin the IDE. -:: Try (in order): @@product_uc@@_JDK, JDK_HOME, JAVA_HOME. +:: Locate a JDK installation directory which will be used to run the IDE. +:: Try (in order): @@product_uc@@_JDK, ..\jre, JDK_HOME, JAVA_HOME. :: --------------------------------------------------------------------- -SET JDK=%@@product_uc@@_JDK% -IF "%JDK%" == "" SET JDK=%JDK_HOME% -IF "%JDK%" == "" SET JDK=%JAVA_HOME% +IF EXIST "%@@product_uc@@_JDK%" SET JDK=%@@product_uc@@_JDK% +IF NOT "%JDK%" == "" GOTO jdk +IF EXIST "%~dp0\..\jre" SET JDK=%~dp0\..\jre +IF NOT "%JDK%" == "" GOTO jdk +IF EXIST "%JDK_HOME%" SET JDK=%JDK_HOME% +IF NOT "%JDK%" == "" GOTO jdk +IF EXIST "%JAVA_HOME%" SET JDK=%JAVA_HOME% IF "%JDK%" == "" GOTO error +:jdk SET JAVA_EXE=%JDK%\bin\java.exe +IF NOT EXIST "%JAVA_EXE%" SET JAVA_EXE=%JDK%\jre\bin\java.exe IF NOT EXIST "%JAVA_EXE%" GOTO error :: ---------------------------------------------------------------------