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

Merge branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Kalishev
2010-05-11 13:22:59 +04:00
parent bd36aa4f8d 418e37571d
commit a0214028af
4 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class StaticImportMethodFix implements IntentionAction {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.StaticImportMethodFix");
private final SmartPsiElementPointer<PsiMethodCallExpression> myMethodCall;
private List<PsiMethod> candidates;
private static final int OPTIONS = PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_CONTAINING_CLASS | PsiFormatUtil.SHOW_FQ_NAME;
private static final int OPTIONS = PsiFormatUtil.SHOW_NAME;
public StaticImportMethodFix(@NotNull PsiMethodCallExpression methodCallExpression) {
myMethodCall = SmartPointerManager.getInstance(methodCallExpression.getProject()).createSmartPsiElementPointer(methodCallExpression);
java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class MethodGroupingRule implements UsageGroupingRule {
}
private PsiMethod getMethod() {
return (PsiMethod)myMethodPointer.getElement();
return myMethodPointer.getElement();
}
@NotNull
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+27 -27
View File
@@ -54,10 +54,7 @@ import com.intellij.ui.TableScrollingUtil;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.usageView.UsageViewBundle;
import com.intellij.usages.*;
import com.intellij.usages.impl.GroupNode;
import com.intellij.usages.impl.NullUsage;
import com.intellij.usages.impl.UsageNode;
import com.intellij.usages.impl.UsageViewImpl;
import com.intellij.usages.impl.*;
import com.intellij.usages.rules.UsageFilteringRuleProvider;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Icons;
@@ -110,12 +107,26 @@ public class ShowUsagesAction extends AnAction {
hideHints();
}
};
private final UsageViewSettings myUsageViewSettings;
// used from plugin.xml
@SuppressWarnings({"UnusedDeclaration"})
public ShowUsagesAction() {
this(false);
}
private ShowUsagesAction(boolean showDialogBefore) {
setInjectedContext(true);
showSettingsDialogBefore = false;
showSettingsDialogBefore = showDialogBefore;
final UsageViewSettings usageViewSettings = UsageViewSettings.getInstance();
myUsageViewSettings = new UsageViewSettings();
myUsageViewSettings.loadState(usageViewSettings);
myUsageViewSettings.GROUP_BY_FILE_STRUCTURE = false;
myUsageViewSettings.GROUP_BY_MODULE = false;
myUsageViewSettings.GROUP_BY_PACKAGE = false;
myUsageViewSettings.GROUP_BY_USAGE_TYPE = false;
myUsageViewSettings.GROUP_BY_SCOPE = false;
}
public static class ShowSettings extends ShowUsagesAction {
@@ -124,11 +135,6 @@ public class ShowUsagesAction extends AnAction {
}
}
private ShowUsagesAction(boolean showDialogBefore) {
setInjectedContext(true);
showSettingsDialogBefore = showDialogBefore;
}
public void actionPerformed(AnActionEvent e) {
final Project project = e.getData(PlatformDataKeys.PROJECT);
if (project == null) return;
@@ -177,25 +183,18 @@ public class ShowUsagesAction extends AnAction {
presentation.setDetachedMode(true);
final UsageViewSettings usageViewSettings = UsageViewSettings.getInstance();
final UsageViewSettings save = new UsageViewSettings();
final UsageViewSettings savedGlobalSettings = new UsageViewSettings();
save.loadState(usageViewSettings);
usageViewSettings.GROUP_BY_FILE_STRUCTURE = false;
usageViewSettings.GROUP_BY_MODULE = false;
usageViewSettings.GROUP_BY_PACKAGE = false;
usageViewSettings.GROUP_BY_USAGE_TYPE = false;
usageViewSettings.GROUP_BY_SCOPE = false;
savedGlobalSettings.loadState(usageViewSettings);
usageViewSettings.loadState(myUsageViewSettings);
UsageViewManager manager = UsageViewManager.getInstance(handler.getProject());
final UsageViewImpl usageView = (UsageViewImpl)manager.createUsageView(UsageTarget.EMPTY_ARRAY, Usage.EMPTY_ARRAY, presentation, null);
Disposer.register(usageView, new Disposable() {
public void dispose() {
usageViewSettings.GROUP_BY_FILE_STRUCTURE = save.GROUP_BY_FILE_STRUCTURE;
usageViewSettings.GROUP_BY_MODULE = save.GROUP_BY_MODULE;
usageViewSettings.GROUP_BY_PACKAGE = save.GROUP_BY_PACKAGE;
usageViewSettings.GROUP_BY_USAGE_TYPE = save.GROUP_BY_USAGE_TYPE;
usageViewSettings.GROUP_BY_SCOPE = save.GROUP_BY_SCOPE;
myUsageViewSettings.loadState(usageViewSettings);
usageViewSettings.loadState(savedGlobalSettings);
}
});
@@ -431,10 +430,11 @@ public class ShowUsagesAction extends AnAction {
});
builder.setCommandButton(button);
DefaultActionGroup filters = new DefaultActionGroup();
usageView.addFilteringActions(filters);
DefaultActionGroup toolbar = new DefaultActionGroup();
usageView.addFilteringActions(toolbar);
filters.add(new AnAction("Open Find Usages Toolwindow", "Show all usages in a separate toolwindow", IconLoader.getIcon("/general/toolWindowFind.png")) {
toolbar.add(UsageGroupingRuleProviderImpl.createGroupByFileStructureAction(usageView));
toolbar.add(new AnAction("Open Find Usages Toolwindow", "Show all usages in a separate toolwindow", IconLoader.getIcon("/general/toolWindowFind.png")) {
{
AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_USAGES);
setShortcutSet(action.getShortcutSet());
@@ -453,14 +453,14 @@ public class ShowUsagesAction extends AnAction {
}
});
ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.USAGE_VIEW_TOOLBAR, filters, true);
ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.USAGE_VIEW_TOOLBAR, toolbar, true);
actionToolbar.setReservePlaceAutoPopupIcon(false);
final JComponent toolBar = actionToolbar.getComponent();
toolBar.setOpaque(false);
builder.setSettingButton(toolBar);
popup[0] = builder.createPopup();
for (AnAction action : filters.getChildren(null)) {
for (AnAction action : toolbar.getChildren(null)) {
action.unregisterCustomShortcutSet(usageView.getComponent());
action.registerCustomShortcutSet(action.getShortcutSet(), popup[0].getContent());
}
platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java
+15 -5
View File
@@ -80,14 +80,10 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider
final GroupByModuleTypeAction groupByModuleTypeAction = new GroupByModuleTypeAction(impl);
groupByModuleTypeAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK)), component);
final GroupByFileStructureAction groupByFileStructureAction = new GroupByFileStructureAction(impl);
groupByFileStructureAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_M,
InputEvent.CTRL_DOWN_MASK)), component);
final GroupByFileStructureAction groupByFileStructureAction = createGroupByFileStructureAction(impl);
impl.scheduleDisposeOnClose(new Disposable() {
public void dispose() {
groupByModuleTypeAction.unregisterCustomShortcutSet(component);
groupByFileStructureAction.unregisterCustomShortcutSet(component);
}
});
@@ -123,6 +119,20 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider
}
}
public static GroupByFileStructureAction createGroupByFileStructureAction(UsageViewImpl impl) {
final JComponent component = impl.getComponent();
final GroupByFileStructureAction groupByFileStructureAction = new GroupByFileStructureAction(impl);
groupByFileStructureAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_M,
InputEvent.CTRL_DOWN_MASK)), component);
impl.scheduleDisposeOnClose(new Disposable() {
public void dispose() {
groupByFileStructureAction.unregisterCustomShortcutSet(component);
}
});
return groupByFileStructureAction;
}
private static class GroupByUsageTypeAction extends RuleAction {
private GroupByUsageTypeAction(UsageViewImpl view) {
super(view, UsageViewBundle.message("action.group.by.usage.type"), IconLoader.getIcon("/ant/filter.png")); //TODO: special icon