From 553cb67fd1ae980b6e2a16228571322cb75d4c72 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 15 Sep 2011 16:51:31 +0200 Subject: [PATCH] remove IntentionFilterOwner from PsiCodeFragment interface --- .../com/intellij/psi/impl/source/PsiCodeFragmentImpl.java | 2 +- .../src/com/intellij/util/xml/ui/PsiClassControl.java | 5 +++-- java/openapi/src/com/intellij/psi/JavaCodeFragment.java | 2 +- .../groovy/debugger/fragments/GroovyCodeFragment.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java index 921bb904cc5e..8fc8c7525780 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java @@ -43,7 +43,7 @@ import org.jetbrains.annotations.NotNull; import java.util.LinkedHashMap; import java.util.StringTokenizer; -public class PsiCodeFragmentImpl extends PsiFileImpl implements JavaCodeFragment { +public class PsiCodeFragmentImpl extends PsiFileImpl implements JavaCodeFragment, IntentionFilterOwner { private PsiElement myContext; private boolean myPhysical; private PsiType myThisType; diff --git a/java/java-impl/src/com/intellij/util/xml/ui/PsiClassControl.java b/java/java-impl/src/com/intellij/util/xml/ui/PsiClassControl.java index ac38c459932a..dea531578b8e 100644 --- a/java/java-impl/src/com/intellij/util/xml/ui/PsiClassControl.java +++ b/java/java-impl/src/com/intellij/util/xml/ui/PsiClassControl.java @@ -22,11 +22,12 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.psi.impl.source.PsiCodeFragmentImpl; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.EditorTextField; +import com.intellij.ui.JavaReferenceEditorUtil; import com.intellij.ui.ReferenceEditorWithBrowseButton; import com.intellij.ui.UIBundle; -import com.intellij.ui.JavaReferenceEditorUtil; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.ExtendClass; import com.intellij.util.xml.GenericDomValue; @@ -60,7 +61,7 @@ public class PsiClassControl extends EditorTextFieldControl { ReferenceEditorWithBrowseButton editor = JavaReferenceEditorUtil .createReferenceEditorWithBrowseButton(null, "", PsiManager.getInstance(project), true); Document document = editor.getChildComponent().getDocument(); - JavaCodeFragment fragment = (JavaCodeFragment)PsiDocumentManager.getInstance(project).getPsiFile(document); + PsiCodeFragmentImpl fragment = (PsiCodeFragmentImpl) PsiDocumentManager.getInstance(project).getPsiFile(document); assert fragment != null; fragment.setIntentionActionsFilter(IntentionFilterOwner.IntentionActionsFilter.EVERYTHING_AVAILABLE); fragment.putUserData(ModuleUtil.KEY_MODULE, getDomWrapper().getExistingDomElement().getModule()); diff --git a/java/openapi/src/com/intellij/psi/JavaCodeFragment.java b/java/openapi/src/com/intellij/psi/JavaCodeFragment.java index b6b7f76ee7f3..0b4164c4a8e8 100644 --- a/java/openapi/src/com/intellij/psi/JavaCodeFragment.java +++ b/java/openapi/src/com/intellij/psi/JavaCodeFragment.java @@ -19,7 +19,7 @@ package com.intellij.psi; * Represents a fragment of Java code which exists outside of a project structure (for example, * in a foreign language code or in a user interface element other than the main source code editor). */ -public interface JavaCodeFragment extends PsiImportHolder, IntentionFilterOwner, PsiCodeFragment { +public interface JavaCodeFragment extends PsiImportHolder, PsiCodeFragment { /** diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java index 7a4b6b881993..cd5980e6aa84 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java @@ -25,7 +25,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyFileImpl; /** * @author ven */ -public class GroovyCodeFragment extends GroovyFileImpl implements JavaCodeFragment { +public class GroovyCodeFragment extends GroovyFileImpl implements JavaCodeFragment, IntentionFilterOwner { private PsiType myThisType; private PsiType mySuperType; private ExceptionHandler myExceptionChecker;