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] UnversionedViewDialog: use ActionGroup

Browse Source 
Instead of hardcoding actions available for the dialog in the code.
Also extract registerShortCuts and refresh to separate methods for
clearness.
CR-IC-775
This commit is contained in:
Kirill Likhodedov
2013-04-25 13:45:25 +04:00
parent 3f22f5dfed
commit 18eb56d72f
2 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/VcsActions.xml
+8 -4
View File
@@ -122,10 +122,14 @@
<reference ref="VersionControlsGroup"/>
</group>
<!-- Alternative action presentations for the UnversionedViewDialog. Icon is the difference. -->
<action id="ChangesView.AddUnversioned.From.Dialog" class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionAction"
icon="AllIcons.General.Add" use-shortcut-of="ChangesView.AddUnversioned" />
<action id="ChangesView.DeleteUnversioned.From.Dialog" class="com.intellij.openapi.vcs.changes.actions.DeleteUnversionedFilesAction" />
<!-- There are alternative action presentations for the UnversionedViewDialog. Icon is the difference. -->
<group id="Unversioned.Files.Dialog">
<action id="ChangesView.AddUnversioned.From.Dialog" class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionAction"
icon="AllIcons.General.Add" use-shortcut-of="ChangesView.AddUnversioned" />
<reference ref="ChangesView.Move"/>
<action id="ChangesView.DeleteUnversioned.From.Dialog" class="com.intellij.openapi.vcs.changes.actions.DeleteUnversionedFilesAction"/>
<reference ref="ChangesView.Ignore"/>
</group>
<group id="ShelvedChangesPopupMenu">
<action id="ShelvedChanges.Unshelve" class="com.intellij.openapi.vcs.changes.shelf.UnshelveChangesAction"/>
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java
+34 -24
View File
@@ -21,6 +21,8 @@ import com.intellij.ide.TreeExpander;
import com.intellij.ide.util.treeView.TreeState;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.actionSystem.impl.PresentationFactory;
import com.intellij.openapi.actionSystem.impl.Utils;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.project.DumbAware;
@@ -42,6 +44,7 @@ import javax.swing.*;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
@@ -119,35 +122,16 @@ public class UnversionedViewDialog extends DialogWrapper {
actions.add(collapseAction);
actions.add(new ToggleShowFlattenAction());
AnAction addAction = ActionManager.getInstance().getAction("ChangesView.AddUnversioned.From.Dialog");
AnAction moveAction = ActionManager.getInstance().getAction(IdeActions.MOVE_TO_ANOTHER_CHANGE_LIST);
AnAction deleteAction = ActionManager.getInstance().getAction("ChangesView.DeleteUnversioned.From.Dialog");
AnAction ignoreAction = ActionManager.getInstance().getAction("ChangesView.Ignore");
final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("UNVERSIONED_DIALOG", group, false);
final AnAction[] operatingActions = { addAction, moveAction, deleteAction, ignoreAction };
for (AnAction action : operatingActions) {
actions.add(action);
action.registerCustomShortcutSet(action.getShortcutSet(), myView);
}
deleteAction.registerCustomShortcutSet(CommonShortcuts.DELETE, myView); // special shortcut for deleting file
ActionManager.getInstance().addAnActionListener(new AnActionListener.Adapter() {
@Override
public void afterActionPerformed(AnAction action, DataContext dataContext, AnActionEvent event) {
for (AnAction anAction : operatingActions) {
if (anAction.equals(action)) {
refreshView();
return;
}
}
}
}, myDisposable);
final ActionGroup operatingActions = (ActionGroup)ActionManager.getInstance().getAction("Unversioned.Files.Dialog");
registerShortcuts(operatingActions, actionToolbar.getToolbarDataContext());
refreshViewAfterActionPerformed(operatingActions);
actions.add(operatingActions);
for (AnAction action : actions) {
group.add(action);
}
final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("UNVERSIONED_DIALOG", group, false);
myPanel.add(actionToolbar.getComponent(), BorderLayout.WEST);
myPanel.add(ScrollPaneFactory.createScrollPane(myView), BorderLayout.CENTER);
@@ -160,6 +144,32 @@ public class UnversionedViewDialog extends DialogWrapper {
myView.setShowFlatten(false);
}
private void registerShortcuts(@NotNull ActionGroup opActionGroup, @NotNull DataContext dataContext) {
List<AnAction> opActions = new ArrayList<AnAction>();
Utils.expandActionGroup(opActionGroup, opActions, new PresentationFactory(), dataContext, "", ActionManager.getInstance());
for (AnAction action : opActions) {
action.registerCustomShortcutSet(action.getShortcutSet(), myView);
}
// special shortcut for deleting a file
AnAction deleteAction = ActionManager.getInstance().getAction("ChangesView.DeleteUnversioned.From.Dialog");
deleteAction.registerCustomShortcutSet(CommonShortcuts.DELETE, myView);
}
private void refreshViewAfterActionPerformed(@NotNull final ActionGroup opActionGroup) {
ActionManager.getInstance().addAnActionListener(new AnActionListener.Adapter() {
@Override
public void afterActionPerformed(AnAction action, DataContext dataContext, AnActionEvent event) {
for (AnAction anAction : opActionGroup.getChildren(event)) {
if (anAction.equals(action)) {
refreshView();
return;
}
}
}
}, myDisposable);
}
@Override
protected String getDimensionServiceKey() {
return "com.intellij.openapi.vcs.changes.UnversionedViewDialog";