MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

move: keep module on the left even on mac

Browse Source
This commit is contained in:
anna
2011-09-08 11:21:16 +02:00
parent 6c2f9d020e
commit d5b25c8bc5
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+1 -1
View File
@@ -291,7 +291,7 @@ public class MoveClassesOrPackagesDialog extends RefactoringDialog {
final PsiDirectory directory = itemWrapper.getDirectory();
final VirtualFile virtualFile = directory != null ? directory.getVirtualFile() : null;
append(virtualFile != null ? ProjectUtil.calcRelativeToProjectPath(virtualFile, myProject) : itemWrapper.getPresentableUrl());
append(virtualFile != null ? ProjectUtil.calcRelativeToProjectPath(virtualFile, myProject, true, true) : itemWrapper.getPresentableUrl());
} else {
setText("Leave in same source root");
platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java
+15 -7
View File
@@ -68,6 +68,13 @@ public class ProjectUtil {
}
public static String calcRelativeToProjectPath(final VirtualFile file, final Project project, final boolean includeFilePath) {
return calcRelativeToProjectPath(file, project, includeFilePath, false);
}
public static String calcRelativeToProjectPath(final VirtualFile file,
final Project project,
final boolean includeFilePath,
final boolean keepModuleAlwaysOnTheLeft) {
if (file instanceof VirtualFilePathWrapper) {
return includeFilePath ? ((VirtualFilePathWrapper)file).getPresentablePath() : file.getName();
}
@@ -84,8 +91,7 @@ public class ProjectUtil {
url = "..." + url.substring(projectHomeUrl.length());
}
}
final Module module = ModuleUtil.findModuleForFile(file, project);
if (SystemInfo.isMac && file.getFileSystem() instanceof JarFileSystem) {
final VirtualFile fileForJar = ((JarFileSystem)file.getFileSystem()).getVirtualFileForJar(file);
if (fileForJar != null) {
@@ -101,13 +107,15 @@ public class ProjectUtil {
}
}
}
final Module module = ModuleUtil.findModuleForFile(file, project);
if (module == null) return url;
return SystemInfo.isMac ? new StringBuffer().append(url).append(" - [").append(module.getName()).append("]").toString() :
new StringBuffer().append("[").append(module.getName()).append("] - ").append(url).toString();
return !keepModuleAlwaysOnTheLeft && SystemInfo.isMac ?
new StringBuffer().append(url).append(" - [").append(module.getName()).append("]").toString() :
new StringBuffer().append("[").append(module.getName()).append("] - ").append(url).toString();
}
}
}
public static String calcRelativeToProjectPath(final VirtualFile file, final Project project) {
return calcRelativeToProjectPath(file, project, true);
}