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

simplify — use util union

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-11-04 16:21:30 +01:00
parent fe5ef6f03b
commit 209ede4e16
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
+1 -7
View File
@@ -139,7 +139,6 @@ public class PathMacrosImpl extends PathMacros implements PersistentStateCompone
);
public PathMacrosImpl() {
//setMacro(USER_HOME_MACRO_NAME, FileUtil.toSystemIndependentName(SystemProperties.getUserHome()));
}
public static PathMacrosImpl getInstanceEx() {
@@ -199,12 +198,7 @@ public class PathMacrosImpl extends PathMacros implements PersistentStateCompone
@Override
public Set<String> getAllMacroNames() {
final Set<String> userMacroNames = getUserMacroNames();
final Set<String> systemMacroNames = getSystemMacroNames();
final Set<String> allNames = new THashSet<>(userMacroNames.size() + systemMacroNames.size());
allNames.addAll(systemMacroNames);
allNames.addAll(userMacroNames);
return allNames;
return ContainerUtil.union(getUserMacroNames(), getSystemMacroNames());
}
@Override