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

new project wizard: sorting groups

Browse Source
This commit is contained in:
Dmitry Avdeev
2013-12-19 16:42:51 +04:00
parent 3206d79a1b
commit 52e167f5a0
2 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+5 -6
View File
@@ -136,19 +136,18 @@ public class ProjectTypeStep extends ModuleWizardStep implements Disposable {
MultiMap<TemplatesGroup,ProjectTemplate> templatesMap = CreateFromTemplateMode.getTemplatesMap(context, false);
List<TemplatesGroup> groups = new ArrayList<TemplatesGroup>(templatesMap.keySet());
Collections.sort(groups);
MultiMap<String, ProjectCategory> map = new MultiMap<String, ProjectCategory>();
MultiMap<TemplatesGroup, ProjectCategory> map = new MultiMap<TemplatesGroup, ProjectCategory>();
for (TemplatesGroup group : groups) {
String name = group.getName();
for (ProjectTemplate template : templatesMap.get(group)) {
TemplateBasedProjectType projectType = new TemplateBasedProjectType(template);
map.putValue(name, projectType);
map.putValue(group, projectType);
}
for (ProjectCategory category : categories.get(name)) {
map.putValue(name, category);
for (ProjectCategory category : categories.get(group.getName())) {
map.putValue(group, category);
}
}
myProjectTypesList = new ProjectTypesList(myProjectTypeList, map);
myProjectTypesList = new ProjectTypesList(myProjectTypeList, map, myBuilders);
myProjectTypeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypesList.java
+45 -10
View File
@@ -16,26 +16,30 @@
package com.intellij.ide.projectWizard;
import com.intellij.ide.util.newProjectWizard.SelectTemplateSettings;
import com.intellij.ide.util.newProjectWizard.TemplatesGroup;
import com.intellij.ide.util.projectWizard.ModuleBuilder;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CustomShortcutSet;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.ui.popup.ListItemDescriptor;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Pair;
import com.intellij.platform.ProjectTemplatesFactory;
import com.intellij.ui.CollectionListModel;
import com.intellij.ui.ListSpeedSearch;
import com.intellij.ui.SpeedSearchComparator;
import com.intellij.ui.components.JBList;
import com.intellij.ui.popup.list.GroupedItemsListRenderer;
import com.intellij.util.containers.FactoryMap;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.*;
/**
* @author Dmitry Avdeev
@@ -47,7 +51,7 @@ public class ProjectTypesList implements Disposable {
private final CollectionListModel<TemplateItem> myModel;
private Pair<TemplateItem, Integer> myBestMatch;
public ProjectTypesList(JBList list, MultiMap<String, ProjectCategory> map) {
public ProjectTypesList(JBList list, MultiMap<TemplatesGroup, ProjectCategory> map, FactoryMap<ProjectCategory, ModuleBuilder> builders) {
myList = list;
myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -58,7 +62,7 @@ public class ProjectTypesList implements Disposable {
return super.getElementText(element);
}
}.setComparator(new SpeedSearchComparator(false));
List<TemplateItem> items = buildItems(map);
List<TemplateItem> items = buildItems(map, builders);
myModel = new CollectionListModel<TemplateItem>(items);
myList.setCellRenderer(new GroupedItemsListRenderer(new ListItemDescriptor() {
@@ -137,19 +141,50 @@ public class ProjectTypesList implements Disposable {
}
}
private List<TemplateItem> buildItems(MultiMap<String, ProjectCategory> map) {
private static List<TemplateItem> buildItems(final MultiMap<TemplatesGroup, ProjectCategory> map, final FactoryMap<ProjectCategory, ModuleBuilder> builders) {
List<TemplateItem> items = new ArrayList<TemplateItem>();
List<String> groups = new ArrayList<String>(map.keySet());
Collections.sort(groups);
for (String group : groups) {
List<TemplatesGroup> groups = new ArrayList<TemplatesGroup>(map.keySet());
final Map<ModuleType, Integer> moduleTypeMap = new HashMap<ModuleType, Integer>();
for (ProjectCategory category : map.values()) {
ModuleType type = builders.get(category).getModuleType();
Integer integer = moduleTypeMap.get(type);
moduleTypeMap.put(type, integer == null ? 0 : integer + 1);
}
Collections.sort(groups, new Comparator<TemplatesGroup>() {
@Override
public int compare(TemplatesGroup o1, TemplatesGroup o2) {
int weight = Comparing.compare(o1.getName().equals(ProjectTemplatesFactory.OTHER_GROUP), o2.getName().equals(ProjectTemplatesFactory.OTHER_GROUP));
if (weight != 0) return weight;
int byModuleType = getModuleTypePopularity(o2, map, builders, moduleTypeMap) - getModuleTypePopularity(o1, map, builders, moduleTypeMap);
if (byModuleType != 0) return byModuleType;
int i = map.get(o2).size() - map.get(o1).size(); // compare group size
return i == 0 ? o1.compareTo(o2) : i;
}
});
for (TemplatesGroup group : groups) {
for (ProjectCategory template : map.get(group)) {
TemplateItem templateItem = new TemplateItem(template, group);
TemplateItem templateItem = new TemplateItem(template, group.getName());
items.add(templateItem);
}
}
return items;
}
private static int getModuleTypePopularity(TemplatesGroup group,
MultiMap<TemplatesGroup, ProjectCategory> map,
FactoryMap<ProjectCategory, ModuleBuilder> builders,
Map<ModuleType, Integer> moduleTypeMap) {
int moduleTypePopularity = 0;
for (ProjectCategory category : map.get(group)) {
ModuleType type = builders.get(category).getModuleType();
moduleTypePopularity = Math.max(moduleTypePopularity, moduleTypeMap.get(type));
}
return moduleTypePopularity;
}
@Nullable
public ProjectCategory getSelectedType() {
Object value = myList.getSelectedValue();