diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java index 0753de9de36..03f2f11bc03 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java @@ -32,8 +32,8 @@ import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.plugin.JetBundle; -import org.jetbrains.jet.plugin.codeInsight.FunctionSignatureUtil; import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening; +import org.jetbrains.jet.plugin.quickfix.QuickFixUtil; import javax.swing.*; import java.util.ArrayList; @@ -112,7 +112,7 @@ public class JetChangeFunctionSignatureAction implements QuestionAction { @NotNull @Override public String getTextFor(FunctionDescriptor aValue) { - return FunctionSignatureUtil.createFunctionSignatureStringFromDescriptor( + return QuickFixUtil.createFunctionSignatureStringFromDescriptor( aValue, /* shortTypeNames = */ true); } @@ -120,7 +120,7 @@ public class JetChangeFunctionSignatureAction implements QuestionAction { } private static void changeSignature(final JetNamedFunction element, final Project project, FunctionDescriptor signature) { - final String signatureString = FunctionSignatureUtil.createFunctionSignatureStringFromDescriptor( + final String signatureString = QuickFixUtil.createFunctionSignatureStringFromDescriptor( signature, /* shortTypeNames = */ false); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/FunctionSignatureUtil.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/FunctionSignatureUtil.java deleted file mode 100644 index d05e283f292..00000000000 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/FunctionSignatureUtil.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2010-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 org.jetbrains.jet.plugin.codeInsight; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.renderer.DescriptorRenderer; - -public class FunctionSignatureUtil { - - private FunctionSignatureUtil() { - } - - @NotNull - public static String createFunctionSignatureStringFromDescriptor( - @NotNull FunctionDescriptor descriptor, - boolean shortTypeNames - ) { - DescriptorRenderer renderer = shortTypeNames ? DescriptorRenderer.SOURCE_CODE_SHORT_NAMES_IN_TYPES : DescriptorRenderer.SOURCE_CODE; - return renderer.render(descriptor); - } -} diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index 8517e139ff6..1083f068560 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -42,7 +42,6 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.actions.JetChangeFunctionSignatureAction; import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManagerUtil; -import org.jetbrains.jet.plugin.codeInsight.FunctionSignatureUtil; import java.util.*; @@ -76,7 +75,7 @@ public class ChangeMemberFunctionSignatureFix extends JetHintAction