From 55d4599b3bf14e64189e6f38451039cf283826b0 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Wed, 6 Feb 2013 16:21:58 +0400 Subject: [PATCH] Add toString methods for visibilities from java --- .../lang/resolve/java/JavaDescriptorResolver.java | 15 +++++++++++++++ .../jet/renderer/DescriptorRendererImpl.java | 14 +------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 4ed129c8d78..1759bd86f3d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -50,6 +50,11 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes if (visibility == Visibilities.PRIVATE) return 1; return -1; } + + @Override + public String toString() { + return "public/*package*/"; + } }; public static final Visibility PROTECTED_STATIC_VISIBILITY = new Visibility("protected_static", false) { @@ -79,6 +84,11 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes } return isVisible(what, fromClass.getContainingDeclaration()); } + + @Override + public String toString() { + return "protected/*protected static*/"; + } }; public static final Visibility PROTECTED_AND_PACKAGE = new Visibility("protected_and_package", false) { @@ -107,6 +117,11 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes if (visibility == Visibilities.PRIVATE) return 1; return -1; } + + @Override + public String toString() { + return "protected/*protected and package*/"; + } }; private JavaPropertyResolver propertiesResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 662a6f9df91..4fe5276e4a3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -311,19 +311,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { private void renderVisibility(@NotNull Visibility visibility, @NotNull StringBuilder builder) { if (!modifiers) return; - if ("package".equals(visibility.toString())) { - builder.append("public/*package*/ "); - } - else if ("protected_static".equals(visibility.toString())) { - builder.append("protected/*protected static*/ "); - } - else if ("protected_and_package".equals(visibility.toString())) { - builder.append("protected/*protected and package*/ "); - } - - else{ - builder.append(renderKeyword(visibility.toString())).append(" "); - } + builder.append(renderKeyword(visibility.toString())).append(" "); } private void renderModality(@NotNull Modality modality, @NotNull StringBuilder builder) {