diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightField.java b/java/java-impl/src/com/intellij/psi/impl/light/LightField.java index b42fa20e4737..3c6ade259404 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightField.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightField.java @@ -108,11 +108,6 @@ public class LightField extends LightElement implements PsiField { throw new IncorrectOperationException("Not supported"); } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } - @Override public PsiModifierList getModifierList() { return myField.getModifierList(); diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java b/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java index d568db62854f..0b8147cd47fc 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java @@ -390,12 +390,6 @@ public class LightMethodBuilder extends LightElement implements PsiMethod, Origi return getContainingFile(); } - @Override - @Nullable - public PsiType getReturnTypeNoResolve() { - return getReturnType(); - } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBase.java b/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBase.java index 6a580554fcdc..161c19e9c2fb 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBase.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -153,10 +153,6 @@ public abstract class LightVariableBase extends LightElement implements PsiVaria final RowIcon baseIcon = ElementPresentationUtil.createLayeredIcon(PlatformIcons.VARIABLE_ICON, this, false); return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon); } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } @Nullable @Override diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBuilder.java b/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBuilder.java index 93ea3327522b..6922a6673e10 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBuilder.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightVariableBuilder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.impl.light; import com.intellij.codeInsight.completion.originInfo.OriginInfoAwareElement; @@ -33,7 +48,7 @@ public class LightVariableBuilder extends LightE this(navigationElement.getManager(), name, type, JavaLanguage.INSTANCE); setNavigationElement(navigationElement); } - + public LightVariableBuilder(PsiManager manager, @NotNull String name, @NotNull PsiType type, Language language) { super(manager, language); myName = name; @@ -108,10 +123,6 @@ public class LightVariableBuilder extends LightE throw new UnsupportedOperationException("setName is not implemented yet in com.intellij.psi.impl.light.LightVariableBuilder"); } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } @Override protected boolean isVisibilitySupported() { return true; diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java index ea6443bcb369..d69352551623 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -770,7 +770,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { final PsiManager manager = aClass.getManager(); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); final PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Cloneable", scope); - if (!InheritanceUtil.isCorrectDescendant(aClass, cloneable, true)) { + if (!InheritanceUtil.isInheritorOrSelf(aClass, cloneable, true)) { return false; } final PsiMethod[] methods = aClass.findMethodsByName("clone", false); @@ -789,7 +789,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { final PsiManager manager = aClass.getManager(); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); final PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.io.Serializable", scope); - if (!InheritanceUtil.isCorrectDescendant(aClass, serializable, true)) { + if (!InheritanceUtil.isInheritorOrSelf(aClass, serializable, true)) { return false; } final PsiMethod[] methods = aClass.findMethodsByName("writeObject", false); diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java index b346b5858c03..2cd9045ba121 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -776,7 +776,7 @@ public class SystemBuilder { final PsiClass castClass = castResult.getElement(); if (operandClass != null && castClass != null) { - if (InheritanceUtil.isCorrectDescendant(operandClass, castClass, true)) { + if (InheritanceUtil.isInheritorOrSelf(operandClass, castClass, true)) { system.addSubtypeConstraint(operandType, castType); } } diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java index d82b185e75c0..14f334e829f2 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -431,10 +431,10 @@ public class BindingFactory { return direction; } else { - if (InheritanceUtil.isCorrectDescendant(xClass, yClass, true)) { + if (InheritanceUtil.isInheritorOrSelf(xClass, yClass, true)) { return Binding.BETTER; } - else if (InheritanceUtil.isCorrectDescendant(yClass, xClass, true)) { + else if (InheritanceUtil.isInheritorOrSelf(yClass, xClass, true)) { return Binding.WORSE; } diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java index 6841a70ffe16..7f637234100c 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -743,12 +743,6 @@ public class RefactoringUtil { return result; } - /** @deprecated use {@linkplain #makeMethodAbstract(com.intellij.psi.PsiClass, com.intellij.psi.PsiMethod)} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") - public static void abstractizeMethod(PsiClass targetClass, PsiMethod method) throws IncorrectOperationException { - makeMethodAbstract(targetClass, method); - } - public static void makeMethodAbstract(@NotNull PsiClass targetClass, @NotNull PsiMethod method) throws IncorrectOperationException { if (!method.hasModifierProperty(PsiModifier.DEFAULT)) { PsiCodeBlock body = method.getBody(); @@ -766,7 +760,7 @@ public class RefactoringUtil { } } - + public static void makeMethodDefault(@NotNull PsiMethod method) throws IncorrectOperationException { PsiUtil.setModifierProperty(method, PsiModifier.DEFAULT, true); PsiUtil.setModifierProperty(method, PsiModifier.ABSTRACT, false); diff --git a/java/java-psi-api/src/com/intellij/psi/JavaTokenType.java b/java/java-psi-api/src/com/intellij/psi/JavaTokenType.java index e9a5f0a8ee54..f8daa11c1d47 100644 --- a/java/java-psi-api/src/com/intellij/psi/JavaTokenType.java +++ b/java/java-psi-api/src/com/intellij/psi/JavaTokenType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package com.intellij.psi; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.tree.TokenSet; import com.intellij.psi.tree.java.IJavaElementType; import com.intellij.psi.tree.java.IKeywordElementType; @@ -140,32 +139,4 @@ public interface JavaTokenType extends TokenType { IElementType DOUBLE_COLON = new IJavaElementType("DOUBLE_COLON"); IElementType ARROW = new IJavaElementType("ARROW"); - - /** @deprecated use {@linkplain com.intellij.psi.impl.source.tree.ElementType#OPERATION_BIT_SET} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") TokenSet OPERATION_BIT_SET = TokenSet.create( - EQ, GT, LT, EXCL, TILDE, QUEST, COLON, PLUS, MINUS, ASTERISK, DIV, AND, OR, XOR, - PERC, EQEQ, LE, GE, NE, ANDAND, OROR, PLUSPLUS, MINUSMINUS, LTLT, GTGT, GTGTGT, - PLUSEQ, MINUSEQ, ASTERISKEQ, DIVEQ, ANDEQ, OREQ, XOREQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ - ); - - /** @deprecated use {@linkplain com.intellij.psi.impl.source.tree.ElementType#KEYWORD_BIT_SET} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") TokenSet KEYWORD_BIT_SET = TokenSet.create( - ABSTRACT_KEYWORD, ASSERT_KEYWORD, BOOLEAN_KEYWORD, BREAK_KEYWORD, BYTE_KEYWORD, CASE_KEYWORD, - CATCH_KEYWORD, CHAR_KEYWORD, CLASS_KEYWORD, CONST_KEYWORD, CONTINUE_KEYWORD, - DEFAULT_KEYWORD, DO_KEYWORD, DOUBLE_KEYWORD, ELSE_KEYWORD, ENUM_KEYWORD, EXTENDS_KEYWORD, - FINAL_KEYWORD, FINALLY_KEYWORD, FLOAT_KEYWORD, FOR_KEYWORD, GOTO_KEYWORD, - IF_KEYWORD, IMPLEMENTS_KEYWORD, IMPORT_KEYWORD, INSTANCEOF_KEYWORD, INT_KEYWORD, - INTERFACE_KEYWORD, LONG_KEYWORD, NATIVE_KEYWORD, NEW_KEYWORD, PACKAGE_KEYWORD, - PRIVATE_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, RETURN_KEYWORD, SHORT_KEYWORD, - SUPER_KEYWORD, STATIC_KEYWORD, STRICTFP_KEYWORD, SWITCH_KEYWORD, SYNCHRONIZED_KEYWORD, - THIS_KEYWORD, THROW_KEYWORD, THROWS_KEYWORD, TRANSIENT_KEYWORD, TRY_KEYWORD, - VOID_KEYWORD, VOLATILE_KEYWORD, WHILE_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, NULL_KEYWORD - ); - - /** @deprecated use {@linkplain com.intellij.psi.impl.source.tree.ElementType#MODIFIER_BIT_SET} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") TokenSet MODIFIER_BIT_SET = TokenSet.create( - PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, STATIC_KEYWORD, - ABSTRACT_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD, STRICTFP_KEYWORD, - SYNCHRONIZED_KEYWORD, TRANSIENT_KEYWORD, VOLATILE_KEYWORD - ); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethod.java b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java index 28a79ed07d9b..05c970e06289 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiMethod.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java @@ -200,7 +200,4 @@ public interface PsiMethod extends PsiMember, PsiNameIdentifierOwner, PsiModifie @NotNull HierarchicalMethodSignature getHierarchicalMethodSignature(); - - /** @deprecated use {@link #getReturnType()} (to remove in IDEA 13) */ - PsiType getReturnTypeNoResolve(); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java deleted file mode 100644 index be9023b7a63c..000000000000 --- a/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.psi; - -/** @deprecated obsolete (to remove in IDEA 13) */ -@SuppressWarnings("UnusedDeclaration") -public interface PsiMethodReceiver extends PsiAnnotationOwner, PsiParameter { -} diff --git a/java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java b/java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java index 125d3321a194..4291ee79d432 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java @@ -141,11 +141,6 @@ public abstract class PsiNameHelper { return buffer.toString(); } - /** deprecated use {@link #getPresentableText(String, PsiAnnotation[], PsiType[])} (to remove in IDEA 13) */ - public static String getPresentableText(@Nullable String referenceName, @NotNull PsiType[] typeParameters) { - return getPresentableText(referenceName, PsiAnnotation.EMPTY_ARRAY, typeParameters); - } - @NotNull public static String getQualifiedClassName(String referenceText, boolean removeWhitespace) { if (removeWhitespace) { diff --git a/java/java-psi-api/src/com/intellij/psi/PsiType.java b/java/java-psi-api/src/com/intellij/psi/PsiType.java index 4a3285090bf6..8d415d58e540 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiType.java @@ -264,12 +264,6 @@ public abstract class PsiType implements PsiAnnotationOwner { return getAnnotations(); } - /** @deprecated use {@link #getAnnotationsTextPrefix(boolean, boolean, boolean)} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") - protected String getAnnotationsTextPrefix() { - return getAnnotationsTextPrefix(false, false, true); - } - @NotNull protected String getAnnotationsTextPrefix(boolean qualified, boolean leadingSpace, boolean trailingSpace) { PsiAnnotation[] annotations = getAnnotations(); diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java index e94c1aaa069e..c6d464950fc4 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java @@ -53,10 +53,4 @@ public interface PsiTypeElement extends PsiElement,PsiAnnotationOwner { */ @Nullable PsiJavaCodeReferenceElement getInnermostComponentReferenceElement(); - - /** @deprecated use {@link PsiAnnotation#getOwner()} (to remove in IDEA 13) */ - PsiAnnotationOwner getOwner(PsiAnnotation annotation); - - /** @deprecated use {@link #getType()} (to remove in IDEA 13) */ - PsiType getTypeNoResolve(@NotNull PsiElement context); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiVariable.java b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java index c6d4a7de91c0..507c57d25d21 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiVariable.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java @@ -89,7 +89,4 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne @Override PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException; - - /** @deprecated use {@link #getType()} (to remove in IDEA 13) */ - PsiType getTypeNoResolve(); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java b/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java index 7040d4b43fe0..6dcd00c2e004 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java @@ -79,21 +79,6 @@ public class PsiWildcardType extends PsiType { return annotations.length == 0 ? this : new PsiWildcardType(this, annotations); } - /** - * @deprecated implementation details (to remove in IDEA 13) - */ - @SuppressWarnings("UnusedDeclaration") - public static PsiWildcardType changeBound(@NotNull PsiWildcardType type, @NotNull PsiType newBound) { - LOG.assertTrue(type.getBound() != null); - LOG.assertTrue(newBound.isValid()); - if (type.myIsExtending) { - if (newBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { - return createUnbounded(type.myManager); - } - } - return new PsiWildcardType(type.myManager, type.myIsExtending, newBound); - } - @Override public String getPresentableText() { return getAnnotationsTextPrefix(false, false, true) + diff --git a/java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java b/java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java index ce8e11896a62..5dc8bcb01079 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java @@ -28,11 +28,6 @@ import java.util.Set; public class InheritanceUtil { private InheritanceUtil() { } - /** @deprecated Use {@link PsiClass#isInheritor(com.intellij.psi.PsiClass, boolean)} instead (to remove in IDEA 13) */ - public static boolean isInheritor(@NotNull PsiClass candidateClass, @NotNull PsiClass baseClass, boolean checkDeep) { - return candidateClass.isInheritor(baseClass, checkDeep); - } - /** * @param aClass a class to check. * @param baseClass supposed base class. @@ -45,11 +40,6 @@ public class InheritanceUtil { return manager.areElementsEquivalent(baseClass, aClass) || aClass.isInheritor(baseClass, checkDeep); } - /** @deprecated use {@linkplain #isInheritorOrSelf(com.intellij.psi.PsiClass, com.intellij.psi.PsiClass, boolean) (to remove in IDEA 13)} */ - public static boolean isCorrectDescendant(@Nullable PsiClass aClass, @Nullable PsiClass baseClass, boolean checkDeep) { - return isInheritorOrSelf(aClass, baseClass, checkDeep); - } - public static boolean processSupers(@Nullable PsiClass aClass, boolean includeSelf, @NotNull Processor superProcessor) { if (aClass == null) return true; diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java index 6cb6931d0e15..c6003b7ccfc9 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java @@ -1031,7 +1031,7 @@ public class TypeConversionUtil { * InheritanceUtil.isInheritor(derivedClass, superClass, true) * * @return substitutor (never returns null) - * @see InheritanceUtil#isInheritor(PsiClass, PsiClass, boolean) + * @see PsiClass#isInheritor(PsiClass, PsiClass, boolean) */ @NotNull public static PsiSubstitutor getSuperClassSubstitutor(@NotNull PsiClass superClass, diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java index 0a3091f308b2..f587393aff88 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java @@ -225,11 +225,6 @@ public class ClsFieldImpl extends ClsMemberImpl implements PsiFiel return PsiImplUtil.getMemberUseScope(this); } - @Override - public PsiType getTypeNoResolve() { - return getType(); //todo? - } - @Override protected boolean isVisibilitySupported() { return true; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java index ac0ccfb32b0d..d1e9ff6ed01d 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java @@ -337,11 +337,6 @@ public class ClsMethodImpl extends ClsMemberImpl implements PsiAn return PsiImplUtil.getMemberUseScope(this); } - @Override - public PsiType getReturnTypeNoResolve() { - return getReturnType(); - } - @Override protected boolean isVisibilitySupported() { return true; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java index e75c320e3876..a10343bfeb03 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java @@ -251,11 +251,6 @@ public class ClsParameterImpl extends ClsRepositoryPsiElement return new LocalSearchScope(getDeclarationScope()); } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } - @Override public String toString() { return "PsiParameter"; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java index 2fded2dca310..7cab653e796b 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java @@ -135,16 +135,6 @@ public class ClsTypeElementImpl extends ClsElementImpl implements PsiTypeElement return null; } - @Override - public PsiAnnotationOwner getOwner(PsiAnnotation annotation) { - return this; //todo - } - - @Override - public PsiType getTypeNoResolve(@NotNull PsiElement context) { - return getType(); - } - private ClsElementImpl calculateChild() { if (JavaPsiFacade.getInstance(getProject()).getElementFactory().createPrimitiveType(myTypeText) != null) { return null; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java index 6045a907e1e4..46229ade6e48 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java @@ -258,9 +258,4 @@ public class LightMethod extends LightElement implements PsiMethod { public PsiElement getContext() { return getContainingClass(); } - - @Override - public PsiType getReturnTypeNoResolve() { - return getReturnType(); - } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeElement.java index f8c0c89d2f1c..5d30065fa7c3 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeElement.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,16 +69,6 @@ public class LightTypeElement extends LightElement implements PsiTypeElement { return null; } - @Override - public PsiAnnotationOwner getOwner(PsiAnnotation annotation) { - return this; - } - - @Override - public PsiType getTypeNoResolve(@NotNull PsiElement context) { - return getType(); - } - @Override public boolean isValid() { return myType.isValid(); @@ -100,7 +90,7 @@ public class LightTypeElement extends LightElement implements PsiTypeElement { public PsiAnnotation addAnnotation(@NotNull @NonNls String qualifiedName) { throw new IncorrectOperationException(); } - + @Override @NotNull public PsiAnnotation[] getApplicableAnnotations() { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java index 4b28435bf089..3ffb565ab5ca 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -313,8 +313,4 @@ public class PsiEnumConstantImpl extends JavaStubPsiElement implem public boolean isEquivalentTo(final PsiElement another) { return PsiClassImplUtil.isFieldEquivalentTo(this, another); } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java index 9f1a078d526c..3535bfe5bbfa 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java @@ -123,11 +123,6 @@ public class PsiFieldImpl extends JavaStubPsiElement implements Ps return this; } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } - @Override @NotNull public PsiType getType() { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java index c2ef01b71d36..59a0e3d15bdd 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java @@ -187,11 +187,6 @@ public class PsiMethodImpl extends JavaStubPsiElement implements return PsiImplUtil.getTypeParameters(this); } - @Override - public PsiType getReturnTypeNoResolve() { - return getReturnType(); - } - @Override public PsiType getReturnType() { if (isConstructor()) return null; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java index 9216b164fb66..52827e2fb82b 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java @@ -147,11 +147,6 @@ public class PsiParameterImpl extends JavaStubPsiElement imple } } - @Override - public PsiType getTypeNoResolve() { - return getType(); - } - private boolean isLambdaParameter() { final PsiElement parent = getParent(); return parent instanceof PsiParameterList && parent.getParent() instanceof PsiLambdaExpression; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java index a747e0357505..283c0cd4b5f0 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java @@ -183,11 +183,6 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl }); } - @Override - public PsiType getTypeNoResolve(@NotNull PsiElement context) { - return getType(); - } - @Override public PsiJavaCodeReferenceElement getInnermostComponentReferenceElement() { TreeElement firstChildNode = getFirstChildNode(); @@ -200,11 +195,6 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl } } - @Override - public PsiAnnotationOwner getOwner(@NotNull PsiAnnotation annotation) { - return this; - } - @Nullable private PsiJavaCodeReferenceElement getReferenceElement() { ASTNode ref = findChildByType(JavaElementType.JAVA_CODE_REFERENCE); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java index 1380b68b9213..24338854d633 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java @@ -16,11 +16,13 @@ package com.intellij.psi.impl.source.tree; import com.intellij.lang.ASTFactory; -import com.intellij.lang.ASTNode; import com.intellij.lang.LighterAST; import com.intellij.lang.LighterASTNode; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.psi.*; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiJavaCodeReferenceElement; +import com.intellij.psi.PsiManager; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.impl.source.DummyHolder; import com.intellij.psi.impl.source.SourceTreeToPsiMap; @@ -74,18 +76,6 @@ public class SourceUtil { return LightTreeUtil.toFilteredString(tree, node, REF_FILTER); } - /** @deprecated use {@link AstBufferUtil#getTextSkippingWhitespaceComments(ASTNode)} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") - public static String getTextSkipWhiteSpaceAndComments(ASTNode element) { - return AstBufferUtil.getTextSkippingWhitespaceComments(element); - } - - /** @deprecated use {@link LightTreeUtil#toFilteredString(LighterAST, LighterASTNode, TokenSet)} (to remove in IDEA 13) */ - @SuppressWarnings("UnusedDeclaration") - public static String getTextSkipWhiteSpaceAndComments(LighterAST tree, LighterASTNode node) { - return LightTreeUtil.toFilteredString(tree, node, ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET); - } - public static TreeElement addParenthToReplacedChild(@NotNull IElementType parenthType, @NotNull TreeElement newChild, @NotNull PsiManager manager) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java index ba0f02f14b08..f8bc8e425b9c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java @@ -328,13 +328,9 @@ public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLoca final RowIcon baseIcon = ElementPresentationUtil.createLayeredIcon(PlatformIcons.VARIABLE_ICON, this, false); return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon); } + @Override protected boolean isVisibilitySupported() { return true; } - - @Override - public PsiType getTypeNoResolve() { - return getType(); - } } diff --git a/java/openapi/src/com/intellij/ui/UIHelper.java b/java/openapi/src/com/intellij/ui/UIHelper.java deleted file mode 100644 index 977e897c7096..000000000000 --- a/java/openapi/src/com/intellij/ui/UIHelper.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.ui; - -import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.PackageChooser; -import com.intellij.openapi.ui.SplitterProportionsData; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiType; -import com.intellij.util.Function; -import com.intellij.util.containers.Convertor; -import com.intellij.util.ui.Table; -import com.intellij.ui.treeStructure.treetable.TreeTable; - -import javax.swing.*; -import javax.swing.table.TableCellRenderer; -import javax.swing.tree.TreeCellRenderer; -import javax.swing.tree.TreePath; -import java.awt.*; - -/** @deprecated to remove in IDEA 13 */ -@SuppressWarnings({"UnusedDeclaration", "deprecation"}) -public interface UIHelper { - void installToolTipHandler(JTree tree); - - void installToolTipHandler(JTable table); - - void installEditSourceOnDoubleClick(JTree tree); - - void installEditSourceOnDoubleClick(TreeTable tree); - - void installEditSourceOnDoubleClick(Table table); - - void installTreeTableSpeedSearch(TreeTable treeTable); - - void installTreeTableSpeedSearch(TreeTable treeTable, Convertor convertor); - - void installTreeSpeedSearch(JTree tree); - - void installTreeSpeedSearch(JTree tree, Convertor convertor); - - void installListSpeedSearch(JList list); - - void installListSpeedSearch(JList list, Function elementTextDelegate); - - void installEditSourceOnEnterKeyHandler(JTree tree); - - SplitterProportionsData createSplitterProportionsData(); - - TableCellRenderer createPsiElementRenderer(PsiElement psiElement, Project project); - - TreeCellRenderer createHighlightableTreeCellRenderer(); - - void drawDottedRectangle(Graphics g, int x, int y, int i, int i1); - - void installSmartExpander(JTree tree); - - void installSelectionSaver(JTree tree); - - TextComponent createTypedTextField(final String text, PsiType type, PsiElement context, final Project project); - - PackageChooser createPackageChooser(String title, Project project); -} diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeElement.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeElement.java index ff6731283fec..683ba7c4d241 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeElement.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeElement.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.groovy.lang.psi.api.types; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; @@ -27,7 +26,4 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; public interface GrTypeElement extends GroovyPsiElement { @NotNull PsiType getType(); - - /** @deprecated use {@link #getType()} (to remove in IDEA 13) */ - PsiType getTypeNoResolve(PsiElement context); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java index 1f97eb4c38d7..d08d29a82830 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java @@ -279,11 +279,6 @@ public abstract class GrVariableBaseImpl extends GrStubEl return JetgroovyIcons.Groovy.Variable; } - public PsiType getTypeNoResolve() { - return getType(); - } - - @Nullable private GrVariableDeclaration getDeclaration() { PsiElement parent = getParent(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java index 9fac30672934..471a5e34d492 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java @@ -538,10 +538,6 @@ public abstract class GrMethodBaseImpl extends GrStubElementBase i return visitor.getResult(); } - public PsiType getReturnTypeNoResolve() { - return getReturnType(); - } - @Override public boolean isEquivalentTo(PsiElement another) { return PsiClassImplUtil.isMethodEquivalentTo(this, another); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java index d90b73c8b45d..96f1e762a2ab 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -445,11 +445,6 @@ public class GrLightMethodBuilder extends LightElement implements GrMethod, Ori return getContainingFile(); } - @Override - public PsiType getReturnTypeNoResolve() { - return getReturnType(); - } - protected void copyData(GrLightMethodBuilder dst) { dst.setMethodKind(myMethodKind); dst.setData(myData); @@ -460,7 +455,7 @@ public class GrLightMethodBuilder extends LightElement implements GrMethod, Ori dst.setBaseIcon(myBaseIcon); dst.setReturnType(myReturnType); dst.setContainingClass(myContainingClass); - + dst.getModifierList().copyModifiers(this); dst.getParameterList().clear(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightTypeElement.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightTypeElement.java index 14e285bfb793..f10b16018c81 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightTypeElement.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightTypeElement.java @@ -1,8 +1,13 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance withe law or agreed to in writing, software + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and @@ -10,7 +15,6 @@ */ package org.jetbrains.plugins.groovy.lang.psi.impl.synthetic; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.PsiType; import com.intellij.psi.impl.light.LightElement; @@ -36,11 +40,6 @@ public class GrLightTypeElement extends LightElement implements GrTypeElement { return myType; } - @Override - public PsiType getTypeNoResolve(PsiElement context) { - return myType; - } - @Override public void accept(GroovyElementVisitor visitor) { visitor.visitTypeElement(this); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrSyntheticTypeElement.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrSyntheticTypeElement.java index b3e2e3ebd935..b200ed3b6aac 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrSyntheticTypeElement.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrSyntheticTypeElement.java @@ -48,16 +48,6 @@ public class GrSyntheticTypeElement extends LightElement implements PsiTypeEleme return null; } - @Override - public PsiAnnotationOwner getOwner(PsiAnnotation annotation) { - return this; - } - - @Override - public PsiType getTypeNoResolve(@NotNull PsiElement context) { - return myElement.getType(); - } - @NotNull @Override public PsiAnnotation[] getAnnotations() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrArrayTypeElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrArrayTypeElementImpl.java index 39c4f00da03c..3cdec04bb241 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrArrayTypeElementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrArrayTypeElementImpl.java @@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.types; import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor; @@ -51,9 +50,4 @@ public class GrArrayTypeElementImpl extends GroovyPsiElementImpl implements GrAr public PsiType getType() { return getComponentTypeElement().getType().createArrayType(); } - - @Override - public PsiType getTypeNoResolve(PsiElement context) { - return getType(); - } } \ No newline at end of file diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrBuiltInTypeElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrBuiltInTypeElementImpl.java index 861507ffd43e..5eec3d6d5489 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrBuiltInTypeElementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrBuiltInTypeElementImpl.java @@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.types; import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor; @@ -46,9 +45,4 @@ public class GrBuiltInTypeElementImpl extends GroovyPsiElementImpl implements Gr public PsiType getType() { return TypesUtil.getPrimitiveTypeByText(getText()); } - - @Override - public PsiType getTypeNoResolve(PsiElement context) { - return getType(); - } } \ No newline at end of file diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClassTypeElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClassTypeElementImpl.java index 593b315d4e01..202b9a89b02b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClassTypeElementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClassTypeElementImpl.java @@ -16,7 +16,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.types; import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes; @@ -52,9 +51,4 @@ public class GrClassTypeElementImpl extends GroovyPsiElementImpl implements GrCl public PsiType getType() { return new GrClassReferenceType(getReferenceElement()); } - - @Override - public PsiType getTypeNoResolve(PsiElement context) { - return getType(); - } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrDisjunctionTypeElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrDisjunctionTypeElementImpl.java index 45ca8079c8ee..1030331b9589 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrDisjunctionTypeElementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrDisjunctionTypeElementImpl.java @@ -68,11 +68,6 @@ public class GrDisjunctionTypeElementImpl extends GroovyPsiElementImpl implement return cachedType; } - @Override - public PsiType getTypeNoResolve(PsiElement context) { - return getType(); - } - @Override public void subtreeChanged() { super.subtreeChanged(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrWildcardTypeArgumentImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrWildcardTypeArgumentImpl.java index 0208258416e5..01c1c71df9cb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrWildcardTypeArgumentImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrWildcardTypeArgumentImpl.java @@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.types; import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import com.intellij.psi.PsiWildcardType; import org.jetbrains.annotations.NotNull; @@ -58,11 +57,6 @@ public class GrWildcardTypeArgumentImpl extends GroovyPsiElementImpl implements return null; } - @Override - public PsiType getTypeNoResolve(PsiElement context) { - return getType(); - } - public GrTypeElement getBoundTypeElement() { return findChildByClass(GrTypeElement.class); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java index c2a12968465f..030693dabea4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicMethodImpl.java @@ -222,10 +222,6 @@ public class GrDynamicMethodImpl extends LightElement implements GrMethod { return myMethod.getHierarchicalMethodSignature(); } - public PsiType getReturnTypeNoResolve() { - return myMethod.getReturnType(); - } - @Override public boolean isEquivalentTo(PsiElement another) { return another instanceof GrDynamicMethodImpl && myMethod.isEquivalentTo(((GrDynamicMethodImpl)another).myMethod); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicPropertyImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicPropertyImpl.java index 605a06f16e05..1521684d1d9c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicPropertyImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/GrDynamicPropertyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -140,10 +140,6 @@ public class GrDynamicPropertyImpl extends LightElement implements GrField { return this; } - public PsiType getTypeNoResolve() { - return null; - } - public String getText() { return null; }