MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-47452 - ASE: QuickFixAction.getSelectedElements

Browse Source
This commit is contained in:
anna
2013-07-02 11:00:20 +02:00
parent 50cfcbce61
commit 9740ff8a99
4 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-impl/src/com/intellij/codeInspection/deadCode/DummyEntryPointsPresentation.java
View File

@@ -51,11 +51,13 @@ public class DummyEntryPointsPresentation extends UnusedDeclarationPresentation
}
@Override
protected boolean applyFix(RefElement[] refElements) {
protected boolean applyFix(RefEntity[] refElements) {
final EntryPointsManager entryPointsManager =
getContext().getExtension(GlobalJavaInspectionContextImpl.CONTEXT).getEntryPointsManager(getContext().getRefManager());
for (RefElement refElement : refElements) {
entryPointsManager.removeEntryPoint(refElement);
for (RefEntity refElement : refElements) {
if (refElement instanceof RefElement) {
entryPointsManager.removeEntryPoint((RefElement)refElement);
}
}
return true;

22
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java
View File

@@ -162,11 +162,11 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
}
@Override
protected boolean applyFix(final RefElement[] refElements) {
protected boolean applyFix(final RefEntity[] refElements) {
if (!super.applyFix(refElements)) return false;
final ArrayList<PsiElement> psiElements = new ArrayList<PsiElement>();
for (RefElement refElement : refElements) {
PsiElement psiElement = refElement.getElement();
for (RefEntity refElement : refElements) {
PsiElement psiElement = refElement instanceof RefElement ? ((RefElement)refElement).getElement() : null;
if (psiElement == null) continue;
if (getFilter().getElementProblemCount((RefJavaElement)refElement) == 0) continue;
psiElements.add(psiElement);
@@ -199,10 +199,12 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
}
@Override
protected boolean applyFix(RefElement[] refElements) {
protected boolean applyFix(RefEntity[] refElements) {
final EntryPointsManager entryPointsManager = getEntryPointsManager();
for (RefElement refElement : refElements) {
entryPointsManager.addEntryPoint(refElement, true);
for (RefEntity refElement : refElements) {
if (refElement instanceof RefElement) {
entryPointsManager.addEntryPoint((RefElement)refElement, true);
}
}
return true;
@@ -216,15 +218,15 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
}
@Override
protected boolean applyFix(RefElement[] refElements) {
protected boolean applyFix(RefEntity[] refElements) {
if (!super.applyFix(refElements)) return false;
ArrayList<RefElement> deletedRefs = new ArrayList<RefElement>(1);
for (RefElement refElement : refElements) {
PsiElement psiElement = refElement.getElement();
for (RefEntity refElement : refElements) {
PsiElement psiElement = refElement instanceof RefElement ? ((RefElement)refElement).getElement() : null;
if (psiElement == null) continue;
if (getFilter().getElementProblemCount((RefJavaElement)refElement) == 0) continue;
commentOutDead(psiElement);
refElement.getRefManager().removeRefElement(refElement, deletedRefs);
refElement.getRefManager().removeRefElement((RefElement)refElement, deletedRefs);
}
EntryPointsManager entryPointsManager = getEntryPointsManager();

2
platform/lang-impl/src/com/intellij/codeInspection/ex/LocalQuickFixWrapper.java
View File

@@ -87,7 +87,7 @@ public class LocalQuickFixWrapper extends QuickFixAction {
}
@Override
protected boolean applyFix(RefElement[] refElements) {
protected boolean applyFix(RefEntity[] refElements) {
throw new UnsupportedOperationException("");
}

29
platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
View File

@@ -167,7 +167,7 @@ public class QuickFixAction extends AnAction {
}
}
public void doApplyFix(@NotNull final RefElement[] refElements, @NotNull InspectionResultsView view) {
public void doApplyFix(@NotNull final RefEntity[] refElements, @NotNull InspectionResultsView view) {
final RefManagerImpl refManager = (RefManagerImpl)view.getGlobalInspectionContext().getRefManager();
final boolean initial = refManager.isInProcess();
@@ -200,26 +200,26 @@ public class QuickFixAction extends AnAction {
}
}
public static void removeElements(@NotNull RefElement[] refElements, @NotNull Project project, @NotNull InspectionToolWrapper toolWrapper) {
public static void removeElements(@NotNull RefEntity[] refElements, @NotNull Project project, @NotNull InspectionToolWrapper toolWrapper) {
refreshViews(project, refElements, toolWrapper);
final ArrayList<RefElement> deletedRefs = new ArrayList<RefElement>(1);
for (RefElement refElement : refElements) {
if (refElement == null) continue;
refElement.getRefManager().removeRefElement(refElement, deletedRefs);
for (RefEntity refElement : refElements) {
if (!(refElement instanceof RefElement)) continue;
refElement.getRefManager().removeRefElement((RefElement)refElement, deletedRefs);
}
}
private static Set<VirtualFile> getReadOnlyFiles(final RefElement[] refElements) {
private static Set<VirtualFile> getReadOnlyFiles(final RefEntity[] refElements) {
Set<VirtualFile> readOnlyFiles = new THashSet<VirtualFile>();
for (RefElement refElement : refElements) {
PsiElement psiElement = refElement.getElement();
for (RefEntity refElement : refElements) {
PsiElement psiElement = refElement instanceof RefElement ? ((RefElement)refElement).getElement() : null;
if (psiElement == null || psiElement.getContainingFile() == null) continue;
readOnlyFiles.add(psiElement.getContainingFile().getVirtualFile());
}
return readOnlyFiles;
}
private static RefElement[] getSelectedElements(AnActionEvent e) {
private static RefEntity[] getSelectedElements(AnActionEvent e) {
final InspectionResultsView invoker = getInvoker(e);
if (invoker == null) return new RefElement[0];
List<RefEntity> selection = new ArrayList<RefEntity>(Arrays.asList(invoker.getTree().getSelectedElements()));
@@ -256,7 +256,7 @@ public class QuickFixAction extends AnAction {
}
});
return selection.toArray(new RefElement[selection.size()]);
return selection.toArray(new RefEntity[selection.size()]);
}
private static void refreshViews(@NotNull Project project, @NotNull Set<PsiElement> selectedElements, @NotNull InspectionToolWrapper toolWrapper) {
@@ -270,10 +270,10 @@ public class QuickFixAction extends AnAction {
}
}
private static void refreshViews(@NotNull Project project, @NotNull RefElement[] refElements, @NotNull InspectionToolWrapper toolWrapper) {
private static void refreshViews(@NotNull Project project, @NotNull RefEntity[] refElements, @NotNull InspectionToolWrapper toolWrapper) {
final Set<PsiElement> ignoredElements = new HashSet<PsiElement>();
for (RefElement element : refElements) {
final PsiElement psiElement = element != null ? element.getElement() : null;
for (RefEntity element : refElements) {
final PsiElement psiElement = element instanceof RefElement ? ((RefElement)element).getElement() : null;
if (psiElement != null && psiElement.isValid()) {
ignoredElements.add(psiElement);
}
@@ -283,8 +283,9 @@ public class QuickFixAction extends AnAction {
/**
* @return true if immediate UI update needed.
* @param refElements
*/
protected boolean applyFix(RefElement[] refElements) {
protected boolean applyFix(RefEntity[] refElements) {
Set<VirtualFile> readOnlyFiles = getReadOnlyFiles(refElements);
if (!readOnlyFiles.isEmpty()) {
final Project project = refElements[0].getRefManager().getProject();