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

show more favorites in default project settings|file encodings|project encoding

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-09-01 14:45:21 +03:00
parent c011ad271c
commit 525600f2bd
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
+1
View File
@@ -205,6 +205,7 @@ public class EncodingManagerImpl extends EncodingManager implements PersistentSt
for (Project project : projects) {
result.addAll(EncodingProjectManager.getInstance(project).getFavorites());
}
result.addAll(EncodingProjectManagerImpl.widelyKnownCharsets());
return result;
}
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingProjectManagerImpl.java
+8 -4
View File
@@ -85,7 +85,6 @@ public class EncodingProjectManagerImpl extends EncodingProjectManager implement
});
}
//null key means project
private final Map<VirtualFile, Charset> myMapping = ContainerUtil.newConcurrentMap();
private volatile Charset myProjectCharset;
@@ -96,7 +95,7 @@ public class EncodingProjectManagerImpl extends EncodingProjectManager implement
List<VirtualFile> files = new ArrayList<VirtualFile>(myMapping.keySet());
ContainerUtil.quickSort(files, new Comparator<VirtualFile>() {
@Override
public int compare(final VirtualFile o1, final VirtualFile o2) {
public int compare(@NotNull final VirtualFile o1, @NotNull final VirtualFile o2) {
return o1.getPath().compareTo(o2.getPath());
}
});
@@ -235,9 +234,15 @@ public class EncodingProjectManagerImpl extends EncodingProjectManager implement
@Override
@NotNull
public Collection<Charset> getFavorites() {
Set<Charset> result = new HashSet<Charset>();
Set<Charset> result = widelyKnownCharsets();
result.addAll(myMapping.values());
result.add(getDefaultCharset());
return result;
}
@NotNull
static Set<Charset> widelyKnownCharsets() {
Set<Charset> result = new HashSet<Charset>();
result.add(CharsetToolkit.UTF8_CHARSET);
result.add(CharsetToolkit.getDefaultSystemCharset());
result.add(CharsetToolkit.UTF_16_CHARSET);
@@ -245,7 +250,6 @@ public class EncodingProjectManagerImpl extends EncodingProjectManager implement
result.add(CharsetToolkit.forName("US-ASCII"));
result.add(EncodingManager.getInstance().getDefaultCharset());
result.add(EncodingManager.getInstance().getDefaultCharsetForPropertiesFiles(null));
result.remove(null);
return result;
}