From 9e339c12e9136d5bbc0d81d1777973011be2c8e7 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 11 Jul 2016 19:51:21 +0300 Subject: [PATCH] Minor: Move and rename KotlinFunctionSignatureComponent --- .../extractFunction/ui/KotlinExtractFunctionDialog.form | 2 +- .../extractFunction/ui/KotlinExtractFunctionDialog.java | 5 +++-- .../KotlinSignatureComponent.kt} | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/{extractFunction/ui/KotlinFunctionSignatureComponent.kt => ui/KotlinSignatureComponent.kt} (86%) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form index f8151c44fad..d0928478ed9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form @@ -53,7 +53,7 @@ - + diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java index a044fdb5940..f740ece0697 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java @@ -34,6 +34,7 @@ import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt; import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*; +import org.jetbrains.kotlin.idea.refactoring.introduce.ui.KotlinSignatureComponent; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.types.KotlinType; @@ -49,7 +50,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { private JPanel contentPane; private TitledSeparator inputParametersPanel; private JComboBox visibilityBox; - private KotlinFunctionSignatureComponent signaturePreviewField; + private KotlinSignatureComponent signaturePreviewField; private JPanel functionNamePanel; private NameSuggestionsField functionNameField; private JLabel functionNameLabel; @@ -82,7 +83,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { } private void createUIComponents() { - this.signaturePreviewField = new KotlinFunctionSignatureComponent("", project); + this.signaturePreviewField = new KotlinSignatureComponent("", project); } private boolean isVisibilitySectionAvailable() { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinFunctionSignatureComponent.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/KotlinSignatureComponent.kt similarity index 86% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinFunctionSignatureComponent.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/KotlinSignatureComponent.kt index e49bedf4661..91bc3915bbf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinFunctionSignatureComponent.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/KotlinSignatureComponent.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui +package org.jetbrains.kotlin.idea.refactoring.introduce.ui import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.KotlinFileType import com.intellij.refactoring.ui.MethodSignatureComponent -class KotlinFunctionSignatureComponent( +class KotlinSignatureComponent( signature: String, project: Project ) : MethodSignatureComponent(signature, project, KotlinFileType.INSTANCE) { private val myFileName = "dummy." + KotlinFileType.EXTENSION