From 735df2e34039d55c731ff44da604885137b4ae6f Mon Sep 17 00:00:00 2001 From: zarechenskiy Date: Fri, 28 Mar 2014 19:06:15 +0400 Subject: [PATCH] Drop getExternal method from JavaSignatureFormatter --- .../java/resolver/PsiBasedMethodSignatureChecker.java | 2 +- .../java/structure/impl/JavaSignatureFormatterImpl.java | 7 ------- .../resolve/java/structure/JavaSignatureFormatter.java | 8 -------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java index a5d5c9b2221..0cd878ebd10 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java @@ -91,7 +91,7 @@ public class PsiBasedMethodSignatureChecker implements MethodSignatureChecker { + "super class = " + superFunction.getContainingDeclaration() + "\n" + "sub function = " + function + "\n" + "sub class = " + function.getContainingDeclaration() + "\n" - + "sub method = " + JavaSignatureFormatter.getInstance().getExternalName(method) + "\n" + + "sub method = " + method + "\n" + "@KotlinSignature = " + SignaturesUtil.getKotlinSignature(externalAnnotationResolver, method)); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java index 6e58096a306..c5e39924728 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java @@ -31,11 +31,4 @@ public class JavaSignatureFormatterImpl extends JavaSignatureFormatter { return PsiFormatUtil.formatMethod(((JavaMethodImpl) method).getPsi(), PsiSubstitutor.EMPTY, SHOW_NAME | SHOW_PARAMETERS, SHOW_TYPE | SHOW_FQ_CLASS_NAMES); } - - @NotNull - @Override - public String getExternalName(@NotNull JavaMethod method) { - String result = PsiFormatUtil.getExternalName(((JavaMethodImpl) method).getPsi()); - return result == null ? "null" : result; - } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java index 3c55bc7c8d2..b6cde618c83 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java @@ -41,12 +41,4 @@ public abstract class JavaSignatureFormatter { */ @NotNull public abstract String formatMethod(@NotNull JavaMethod method); - - /** - * @return a formatted signature of a method, showing method's containing class, return type and parameter types, all names are fully - * qualified, e.g.: - * {@code "java.lang.Class boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>)"} - */ - @NotNull - public abstract String getExternalName(@NotNull JavaMethod method); }