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

WI-2489: suppress reloading platform projects

Browse Source
This commit is contained in:
anna
2010-07-07 12:37:49 +04:00
parent 362625ae54
commit 9127e6309a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java
+6 -1
View File
@@ -322,11 +322,16 @@ public class MultipleFileMergeDialog extends DialogWrapper {
if (file.getFileType() == StdFileTypes.IDEA_MODULE ||
file.getFileType() == StdFileTypes.IDEA_PROJECT ||
file.getFileType() == StdFileTypes.IDEA_WORKSPACE ||
ProjectOpenProcessor.getImportProvider(file) != null) {
isProjectFile(file)) {
myProjectManager.saveChangedProjectFile(file, myProject);
}
}
private static boolean isProjectFile(VirtualFile file) {
final ProjectOpenProcessor importProvider = ProjectOpenProcessor.getImportProvider(file);
return importProvider != null && importProvider.lookForProjectsInDirectory();
}
private static String decodeContent(final VirtualFile file, final byte[] content) {
return StringUtil.convertLineSeparators(file.getCharset().decode(ByteBuffer.wrap(content)).toString());
}