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

don't hide run configuration type if there are only one irrelevant type (IDEA-116046)

Browse Source
This commit is contained in:
nik
2013-11-07 15:51:40 +04:00
parent 15e08d4d8d
commit d2a2cd9c07
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+20 -25
View File
@@ -1088,44 +1088,26 @@ class RunConfigurable extends BaseConfigurable {
}
private void showAddPopup(final boolean showApplicableTypesOnly) {
final JBPopupFactory popupFactory = JBPopupFactory.getInstance();
final List<ConfigurationType> configurationTypes;
int hiddenCount = 0;
if (showApplicableTypesOnly) {
List<ConfigurationType> applicableTypes = new ArrayList<ConfigurationType>();
for (ConfigurationType type : getRunManager().getConfigurationFactories(false)) {
if (isApplicable(type)) {
applicableTypes.add(type);
}
else {
hiddenCount++;
}
}
configurationTypes = applicableTypes;
}
else {
configurationTypes = new ArrayList<ConfigurationType>(Arrays.asList(getRunManager().getConfigurationFactories(false)));
}
ConfigurationType[] allTypes = getRunManager().getConfigurationFactories(false);
final List<ConfigurationType> configurationTypes = getTypesToShow(showApplicableTypesOnly, allTypes);
Collections.sort(configurationTypes, new Comparator<ConfigurationType>() {
@Override
public int compare(final ConfigurationType type1, final ConfigurationType type2) {
return type1.getDisplayName().compareToIgnoreCase(type2.getDisplayName());
}
});
final int hiddenCount = allTypes.length - configurationTypes.size();
if (hiddenCount > 0) {
configurationTypes.add(null);
}
final int finalHiddenCount = hiddenCount;
final ListPopup popup =
popupFactory.createListPopup(new BaseListPopupStep<ConfigurationType>(
final ListPopup popup = JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<ConfigurationType>(
ExecutionBundle.message("add.new.run.configuration.acrtion.name"), configurationTypes) {
@Override
@NotNull
public String getTextFor(final ConfigurationType type) {
return type != null ? type.getDisplayName() : "(" + finalHiddenCount + " more items)";
return type != null ? type.getDisplayName() : "(" + hiddenCount + " more items)";
}
@Override
@@ -1197,7 +1179,6 @@ class RunConfigurable extends BaseConfigurable {
createNewConfiguration(factory);
return FINAL_CHOICE;
}
};
}
@@ -1205,12 +1186,26 @@ class RunConfigurable extends BaseConfigurable {
public boolean hasSubstep(final ConfigurationType type) {
return type != null && type.getConfigurationFactories().length > 1;
}
});
//new TreeSpeedSearch(myTree);
popup.showUnderneathOf(myToolbarDecorator.getActionsPanel());
}
private List<ConfigurationType> getTypesToShow(boolean showApplicableTypesOnly, ConfigurationType[] allTypes) {
if (showApplicableTypesOnly) {
List<ConfigurationType> applicableTypes = new ArrayList<ConfigurationType>();
for (ConfigurationType type : allTypes) {
if (isApplicable(type)) {
applicableTypes.add(type);
}
}
if (applicableTypes.size() < allTypes.length - 1) {
return applicableTypes;
}
}
return new ArrayList<ConfigurationType>(Arrays.asList(allTypes));
}
private boolean isApplicable(ConfigurationType type) {
for (ConfigurationFactory factory : type.getConfigurationFactories()) {
if (factory.isApplicable(myProject)) {