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

@NotNull VirtualFile.getPresentableUrl (IDEA-117476)

Browse Source
This commit is contained in:
peter
2013-12-18 08:22:40 +01:00
parent 6a771e7140
commit 4889341700
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
+1 -1
View File
@@ -150,8 +150,8 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
* @return the presentable URL.
* @see VirtualFileSystem#extractPresentableUrl
*/
@NotNull
public final String getPresentableUrl() {
if (!isValid()) return null;
return getFileSystem().extractPresentableUrl(getPath());
}
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+3 -9
View File
@@ -709,15 +709,14 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
String message;
if (causes.size() == 1) {
message = ProjectBundle.message("project.reload.external.change.single", getPresentablePath(causes.iterator().next().first));
message = ProjectBundle.message("project.reload.external.change.single", causes.iterator().next().first.getPresentableUrl());
}
else {
StringBuilder filesBuilder = new StringBuilder();
boolean first = true;
Set<String> alreadyShown = new HashSet<String>();
for (Pair<VirtualFile, StateStorage> cause : causes) {
VirtualFile file = cause.first;
String url = getPresentablePath(file);
String url = cause.first.getPresentableUrl();
if (!alreadyShown.contains(url)) {
if (alreadyShown.size() > 10) {
filesBuilder.append("\n" + "and ").append(causes.size() - alreadyShown.size()).append(" more");
@@ -736,11 +735,6 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
Messages.getQuestionIcon()) == 0;
}
private static String getPresentablePath(@NotNull VirtualFile file) {
String url = file.getPresentableUrl(); // might be null for invalid file
return url == null ? file.getPath() : url;
}
@Override
public boolean isFileSavedToBeReloaded(VirtualFile candidate) {
return mySavedCopies.containsKey(candidate);
@@ -866,7 +860,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
file.setBinaryContent(bytes, -1, mySavedTimestamps.get(file));
}
catch (IOException e) {
Messages.showWarningDialog(ProjectBundle.message("project.reload.write.failed", getPresentablePath(file)),
Messages.showWarningDialog(ProjectBundle.message("project.reload.write.failed", file.getPresentableUrl()),
ProjectBundle.message("project.reload.write.failed.title"));
}
}