mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
getting rid of UsageViewImpl in interfaces
This commit is contained in:
@@ -12,6 +12,7 @@ import com.intellij.usages.impl.rules.ReadAccessFilteringRule;
|
||||
import com.intellij.usages.impl.rules.WriteAccessFilteringRule;
|
||||
import com.intellij.usages.rules.UsageFilteringRule;
|
||||
import com.intellij.usages.rules.UsageFilteringRuleProvider;
|
||||
import com.intellij.usages.UsageView;
|
||||
import org.jdom.Element;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -45,16 +46,17 @@ public class UsageFilteringRuleProviderImpl extends UsageFilteringRuleProvider i
|
||||
return rules.toArray(new UsageFilteringRule[rules.size()]);
|
||||
}
|
||||
|
||||
public AnAction[] createFilteringActions(UsageViewImpl view) {
|
||||
final ShowImportsAction showImportsAction = new ShowImportsAction(view);
|
||||
public AnAction[] createFilteringActions(UsageView view) {
|
||||
final UsageViewImpl impl = (UsageViewImpl)view;
|
||||
final ShowImportsAction showImportsAction = new ShowImportsAction(impl);
|
||||
showImportsAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_DOWN_MASK)), view.getComponent());
|
||||
|
||||
final ReadWriteState readWriteSharedState = new ReadWriteState();
|
||||
|
||||
final ShowReadAccessUsagesAction showReadAccessUsagesAction = new ShowReadAccessUsagesAction(view, readWriteSharedState);
|
||||
final ShowReadAccessUsagesAction showReadAccessUsagesAction = new ShowReadAccessUsagesAction(impl, readWriteSharedState);
|
||||
showReadAccessUsagesAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK)), view.getComponent());
|
||||
|
||||
final ShowWriteAccessUsagesAction showWriteAccessUsagesAction = new ShowWriteAccessUsagesAction(view, readWriteSharedState);
|
||||
final ShowWriteAccessUsagesAction showWriteAccessUsagesAction = new ShowWriteAccessUsagesAction(impl, readWriteSharedState);
|
||||
showWriteAccessUsagesAction.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK)), view.getComponent());
|
||||
|
||||
return new AnAction[] {showImportsAction, showReadAccessUsagesAction, showWriteAccessUsagesAction};
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.intellij.openapi.util.*;
|
||||
import com.intellij.usages.impl.rules.*;
|
||||
import com.intellij.usages.rules.UsageGroupingRule;
|
||||
import com.intellij.usages.rules.UsageGroupingRuleProvider;
|
||||
import com.intellij.usages.UsageView;
|
||||
import org.jdom.Element;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -48,12 +49,13 @@ public class UsageGroupingRuleProviderImpl extends UsageGroupingRuleProvider imp
|
||||
return rules.toArray(new UsageGroupingRule[rules.size()]);
|
||||
}
|
||||
|
||||
public AnAction[] createGroupingActions(UsageViewImpl view) {
|
||||
public AnAction[] createGroupingActions(UsageView view) {
|
||||
final UsageViewImpl impl = (UsageViewImpl)view;
|
||||
return new AnAction[] {
|
||||
new GroupByUsageTypeAction(view),
|
||||
new GroupByModuleTypeAction(view),
|
||||
new GroupByPackageAction(view),
|
||||
new GroupByFileStructureAction(view)
|
||||
new GroupByUsageTypeAction(impl),
|
||||
new GroupByModuleTypeAction(impl),
|
||||
new GroupByPackageAction(impl),
|
||||
new GroupByFileStructureAction(impl)
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.intellij.usages.rules;
|
||||
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.actionSystem.AnAction;
|
||||
import com.intellij.usages.impl.UsageViewImpl;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.usages.UsageView;
|
||||
|
||||
public abstract class UsageFilteringRuleProvider {
|
||||
public abstract UsageFilteringRule[] getActiveRules(Project project);
|
||||
|
||||
public abstract AnAction[] createFilteringActions(UsageViewImpl view);
|
||||
public abstract AnAction[] createFilteringActions(UsageView view);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.intellij.usages.rules;
|
||||
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.actionSystem.AnAction;
|
||||
import com.intellij.usages.impl.UsageViewImpl;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.usages.UsageView;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
@@ -14,5 +14,5 @@ import com.intellij.usages.impl.UsageViewImpl;
|
||||
public abstract class UsageGroupingRuleProvider {
|
||||
public abstract UsageGroupingRule[] getActiveRules(Project project);
|
||||
|
||||
public abstract AnAction[] createGroupingActions(UsageViewImpl view);
|
||||
public abstract AnAction[] createGroupingActions(UsageView view);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user