From 39a8a029cf24e551306d4c9a0c1d9074a82f2f9b Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Mon, 20 Feb 2012 12:14:38 +0400 Subject: [PATCH] ability to get explicit 'public' modifier in Extract Groovy method --- .../groovy/refactoring/extract/ExtractUtil.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java index 7efdf2b4d150..a36eda322dad 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ExtractUtil.java @@ -18,7 +18,10 @@ package org.jetbrains.plugins.groovy.refactoring.extract; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.CommonClassNames; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiPrimitiveType; +import com.intellij.psi.PsiType; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.HashMap; @@ -428,7 +431,12 @@ public class ExtractUtil { public static String getModifierString(ExtractMethodInfoHelper helper) { String visibility = helper.getVisibility(); LOG.assertTrue(visibility != null && visibility.length() > 0); - visibility = visibility.equals(PsiModifier.PUBLIC) ? "" : visibility + " "; - return visibility + (helper.isStatic() ? "static " : ""); + final StringBuilder builder = new StringBuilder(); + builder.append(visibility); + builder.append(" "); + if (helper.isStatic()) { + builder.append("static "); + } + return builder.toString(); } }