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

SVN: additional fix for encoding + shelf - when default encoding is not UTF-8

Browse Source
This commit is contained in:
irengrig
2012-07-25 21:36:18 +04:00
parent d4fd48621a
commit c7428e92db
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+1 -1
View File
@@ -666,7 +666,7 @@ public class ShelveChangesManager implements ProjectComponent, JDOMExternalizabl
// todo problem: control usage
public static List<TextFilePatch> loadPatches(Project project, final String patchPath, CommitContext commitContext) throws IOException, PatchSyntaxException {
char[] text = FileUtil.loadFileText(new File(patchPath));
char[] text = FileUtil.loadFileText(new File(patchPath), CharsetToolkit.UTF8);
PatchReader reader = new PatchReader(new CharArrayCharSequence(text));
final List<TextFilePatch> textFilePatches = reader.readAllPatches();
final TransparentlyFailedValue<Map<String, Map<String, CharSequence>>, PatchSyntaxException> additionalInfo = reader.getAdditionalInfo(