From 2862d13cb13242d6e69ac3550f687fc5f714ae8e Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Wed, 6 Feb 2013 12:41:38 +0400 Subject: [PATCH] Change tooltip message for protected static methods from java --- .../org/jetbrains/jet/renderer/DescriptorRendererImpl.java | 5 ++++- .../constructor/ConstructorInProtectedStaticNestedClass.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 9a5fb324d2f..42350fe59ab 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -314,7 +314,10 @@ public class DescriptorRendererImpl implements DescriptorRenderer { if ("package".equals(visibility.toString())) { builder.append("public/*package*/ "); } - else { + else if ("protected_static".equals(visibility.toString())) { + builder.append("protected/*protected static*/ "); + } + else{ builder.append(renderKeyword(visibility.toString())).append(" "); } } diff --git a/compiler/testData/loadJavaCustom/protectedStaticVisibility/constructor/ConstructorInProtectedStaticNestedClass.txt b/compiler/testData/loadJavaCustom/protectedStaticVisibility/constructor/ConstructorInProtectedStaticNestedClass.txt index d72b7febebf..eae227d3105 100644 --- a/compiler/testData/loadJavaCustom/protectedStaticVisibility/constructor/ConstructorInProtectedStaticNestedClass.txt +++ b/compiler/testData/loadJavaCustom/protectedStaticVisibility/constructor/ConstructorInProtectedStaticNestedClass.txt @@ -3,7 +3,7 @@ package test public open class ConstructorInProtectedStaticNestedClass : java.lang.Object { public constructor ConstructorInProtectedStaticNestedClass() - protected_static open class Inner : java.lang.Object { + protected/*protected static*/ open class Inner : java.lang.Object { protected constructor Inner() } }