From 8e80baf64064d9db593c62b7e692c22e95fd71ab Mon Sep 17 00:00:00 2001 From: Peter Gromov Date: Fri, 28 Jan 2005 19:37:46 +0300 Subject: [PATCH] getting rid of UsageViewImpl in interfaces --- .../usages/impl/UsageFilteringRuleProviderImpl.java | 10 ++++++---- .../usages/impl/UsageGroupingRuleProviderImpl.java | 12 +++++++----- .../usages/rules/UsageFilteringRuleProvider.java | 6 +++--- .../usages/rules/UsageGroupingRuleProvider.java | 6 +++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/UsageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java b/UsageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java index 2309c4a833b6..24d2a6fd2768 100644 --- a/UsageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java +++ b/UsageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java @@ -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}; diff --git a/UsageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java b/UsageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java index 18ccc53f6033..7db48e721ac4 100644 --- a/UsageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java +++ b/UsageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java @@ -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) }; } diff --git a/UsageView/src/com/intellij/usages/rules/UsageFilteringRuleProvider.java b/UsageView/src/com/intellij/usages/rules/UsageFilteringRuleProvider.java index afea3473e8cc..2c20b8d42025 100644 --- a/UsageView/src/com/intellij/usages/rules/UsageFilteringRuleProvider.java +++ b/UsageView/src/com/intellij/usages/rules/UsageFilteringRuleProvider.java @@ -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); } diff --git a/UsageView/src/com/intellij/usages/rules/UsageGroupingRuleProvider.java b/UsageView/src/com/intellij/usages/rules/UsageGroupingRuleProvider.java index 475ffaf39053..9e9910cdc371 100644 --- a/UsageView/src/com/intellij/usages/rules/UsageGroupingRuleProvider.java +++ b/UsageView/src/com/intellij/usages/rules/UsageGroupingRuleProvider.java @@ -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); }