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

vcs log: cleanup

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-12-05 19:44:46 +03:00
parent 05f04009ac
commit ce9559cf8c
4 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
+2 -2
View File
@@ -110,7 +110,7 @@ public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponen
@NotNull
@Override
public AnAction createAction(@NotNull String name) {
return new PredefinedValueAction(Collections.singletonList(name)) {
return new PredefinedValueAction(name) {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
myFilterModel.setFilter(myFilterModel.createFilter(myValues)); // does not add to recent
@@ -126,7 +126,7 @@ public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponen
@NotNull
@Override
protected AnAction createCollapsedAction(String actionName) {
return createPredefinedValueAction(Collections.singletonList(actionName)); // adds to recent
return new PredefinedValueAction(actionName); // adds to recent
}
}
}
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java
+3 -17
View File
@@ -127,10 +127,7 @@ public abstract class BranchPopupBuilder {
private static void putActionsForReferences(List<RefGroup> references, Groups actions) {
for (final RefGroup refGroup : references) {
if (refGroup instanceof SingletonRefGroup) {
String name = refGroup.getName();
if (!actions.singletonGroups.contains(name)) {
actions.singletonGroups.add(name);
}
actions.singletonGroups.add(refGroup.getName());
}
else if (refGroup.isExpanded()) {
addToGroup(refGroup, actions.expandedGroups);
@@ -142,20 +139,9 @@ public abstract class BranchPopupBuilder {
}
private static void addToGroup(final RefGroup refGroup, TreeMap<String, TreeSet<String>> groupToAdd) {
TreeSet<String> existingGroup = groupToAdd.get(refGroup.getName());
TreeSet<String> actions = new TreeSet<>();
TreeSet<String> groupActions = groupToAdd.computeIfAbsent(refGroup.getName(), key -> new TreeSet<>());
for (VcsRef ref : refGroup.getRefs()) {
actions.add(ref.getName());
}
if (existingGroup == null) {
groupToAdd.put(refGroup.getName(), actions);
}
else {
for (String action : actions) {
existingGroup.add(action);
}
groupActions.add(ref.getName());
}
}
}
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultipleValueFilterPopupComponent.java
+4 -5
View File
@@ -84,11 +84,6 @@ abstract class MultipleValueFilterPopupComponent<Filter extends VcsLogFilter> ex
return StringUtil.join(values, ", ");
}
@NotNull
protected AnAction createPredefinedValueAction(@NotNull List<String> values) {
return new PredefinedValueAction(values);
}
@NotNull
protected AnAction createSelectMultipleValuesAction() {
return new SelectMultipleValuesAction();
@@ -105,6 +100,10 @@ abstract class MultipleValueFilterPopupComponent<Filter extends VcsLogFilter> ex
@NotNull protected final List<String> myValues;
public PredefinedValueAction(@NotNull String value) {
this(Collections.singletonList(value));
}
public PredefinedValueAction(@NotNull List<String> values) {
super(null, tooltip(values), null);
getTemplatePresentation().setText(displayableText(values), false);
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
+1 -1
View File
@@ -63,7 +63,7 @@ class UserFilterPopupComponent extends MultipleValueFilterPopupComponent<VcsLogU
group.add(createAllAction());
group.add(createSelectMultipleValuesAction());
if (!myLogData.getCurrentUser().isEmpty()) {
group.add(createPredefinedValueAction(Collections.singletonList(VcsLogUserFilterImpl.ME)));
group.add(new PredefinedValueAction(VcsLogUserFilterImpl.ME));
}
group.addAll(createRecentItemsActionGroup());
return group;