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

Extract common constant for "Group By" changes grouping action group

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-02-13 12:19:53 +08:00
parent 311d7b138b
commit 33a9757ad0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
+2 -1
View File
@@ -62,6 +62,7 @@ import java.util.stream.Stream;
import static com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager.unshelveSilentlyWithDnd;
import static com.intellij.openapi.vcs.changes.ui.ChangesTree.DEFAULT_GROUPING_KEYS;
import static com.intellij.openapi.vcs.changes.ui.ChangesTree.GROUP_BY_ACTION_GROUP;
import static com.intellij.util.containers.ContainerUtil.newHashSet;
import static com.intellij.util.containers.ContainerUtil.set;
import static java.util.stream.Collectors.toList;
@@ -181,7 +182,7 @@ public class ChangesViewManager implements ChangesViewI, ProjectComponent, Persi
visualActionsGroup.add(CommonActionsManager.getInstance().createExpandAllAction(expander, panel));
visualActionsGroup.add(CommonActionsManager.getInstance().createCollapseAllAction(expander, panel));
visualActionsGroup.add(ActionManager.getInstance().getAction("ChangesView.GroupBy"));
visualActionsGroup.add(ActionManager.getInstance().getAction(GROUP_BY_ACTION_GROUP));
visualActionsGroup.add(ActionManager.getInstance().getAction(IdeActions.ACTION_COPY));
visualActionsGroup.add(new ToggleShowIgnoredAction());
visualActionsGroup.add(new IgnoredSettingsAction());
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java
+2 -1
View File
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.stream.Stream;
import static com.intellij.openapi.vcs.changes.ui.ChangesTree.DEFAULT_GROUPING_KEYS;
import static com.intellij.openapi.vcs.changes.ui.ChangesTree.GROUP_BY_ACTION_GROUP;
import static com.intellij.util.containers.ContainerUtil.set;
abstract class SpecificFilesViewDialog extends DialogWrapper {
@@ -105,7 +106,7 @@ abstract class SpecificFilesViewDialog extends DialogWrapper {
final CommonActionsManager cam = CommonActionsManager.getInstance();
final Expander expander = new Expander();
group.addSeparator();
group.add(ActionManager.getInstance().getAction("ChangesView.GroupBy"));
group.add(ActionManager.getInstance().getAction(GROUP_BY_ACTION_GROUP));
group.add(cam.createExpandAllAction(expander, myView));
group.add(cam.createCollapseAllAction(expander, myView));
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTree.java
+3 -1
View File
@@ -72,6 +72,8 @@ public abstract class ChangesTree extends Tree implements DataProvider {
public static final String[] DEFAULT_GROUPING_KEYS = ar(DIRECTORY_GROUPING, MODULE_GROUPING);
@NonNls public static final String GROUP_BY_ACTION_GROUP = "ChangesView.GroupBy";
@Nullable private Runnable myInclusionListener;
@NotNull private final CopyProvider myTreeCopyProvider;
private TreeState myDirectoryTreeState;
@@ -470,7 +472,7 @@ public abstract class ChangesTree extends Tree implements DataProvider {
e.getPresentation().setEnabledAndVisible(!myGroupingSupport.isNone() || !myIsModelFlat);
}
};
AnAction[] actions = new AnAction[]{ActionManager.getInstance().getAction("ChangesView.GroupBy"), expandAllAction, collapseAllAction};
AnAction[] actions = new AnAction[]{ActionManager.getInstance().getAction(GROUP_BY_ACTION_GROUP), expandAllAction, collapseAllAction};
expandAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_EXPAND_ALL), this);
collapseAllAction.registerCustomShortcutSet(getActiveKeymapShortcuts(IdeActions.ACTION_COLLAPSE_ALL), this);
return actions;