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

IDEA-93097 Recent project list should not contain project with same name

Browse Source
This commit is contained in:
peter
2012-10-17 22:42:53 +02:00
parent 701d66ecfc
commit 0d2bad5ff8
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java
+30 -24
View File
@@ -139,7 +139,23 @@ public abstract class RecentProjectsManagerBase implements PersistentStateCompon
protected String getProjectDisplayName(Project project) {
return "";
}
private static Set<String> getDuplicateProjectNames(Set<String> openedPaths, Set<String> recentPaths) {
Set<String> names = ContainerUtil.newHashSet();
Set<String> duplicates = ContainerUtil.newHashSet();
for (String path : openedPaths) {
if (!names.add(getProjectName(path))) {
duplicates.add(path);
}
}
for (String path : recentPaths) {
if (!names.add(getProjectName(path))) {
duplicates.add(path);
}
}
return duplicates;
}
/**
* @param addClearListItem - used for detecting whether the "Clear List" action should be added
@@ -149,35 +165,25 @@ public abstract class RecentProjectsManagerBase implements PersistentStateCompon
public AnAction[] getRecentProjectsActions(boolean addClearListItem) {
validateRecentProjects();
Project[] openProjects = ProjectManager.getInstance().getOpenProjects();
ArrayList<AnAction> actions = new ArrayList<AnAction>();
final Map<String, Integer> map = new LinkedHashMap<String, Integer>();
final List<String> paths = new ArrayList<String>();
synchronized (myState) {
outer: for (String recentPath : myState.recentPaths) {
if (recentPath == null) {
continue;
}
for (Project openProject : openProjects) {
final String path = getProjectPath(openProject);
if (path == null || recentPath.equals(path)) {
continue outer;
}
}
final String projectName = getProjectName(recentPath);
map.put(projectName, map.containsKey(projectName) ? map.get(projectName) + 1 : 1);
paths.add(recentPath);
}
final Set<String> openedPaths = ContainerUtil.newHashSet();
for (Project openProject : ProjectManager.getInstance().getOpenProjects()) {
ContainerUtil.addIfNotNull(openedPaths, getProjectPath(openProject));
}
final LinkedHashSet<String> paths;
synchronized (myState) {
paths = ContainerUtil.newLinkedHashSet(myState.recentPaths);
}
paths.remove(null);
paths.removeAll(openedPaths);
ArrayList<AnAction> actions = new ArrayList<AnAction>();
Set<String> duplicates = getDuplicateProjectNames(openedPaths, paths);
for (final String path : paths) {
final String projectName = getProjectName(path);
String displayName = myState.names.get(path);
if (StringUtil.isEmptyOrSpaces(displayName)) {
displayName = map.get(projectName) > 1 ? path : projectName;
displayName = duplicates.contains(path) ? path : projectName;
}
actions.add(new ReopenProjectAction(path, projectName, displayName));
}