From 9dd6dea85f82d1283d2974f492f3afc3f436666e Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 2 Jul 2015 15:25:14 +0300 Subject: [PATCH] Change Signature: Move UI-related classes to separate package --- .../idea/refactoring/changeSignature/JetChangeSignature.kt | 5 +---- .../{ => ui}/JetCallableParameterTableModel.java | 5 ++++- .../{ => ui}/JetChangePropertySignatureDialog.kt | 0 .../changeSignature/{ => ui}/JetChangeSignatureDialog.java | 3 ++- .../{ => ui}/JetFunctionParameterTableModel.java | 4 +++- .../{ => ui}/JetPrimaryConstructorParameterTableModel.java | 5 ++++- .../{ => ui}/JetSecondaryConstructorParameterTableModel.java | 4 +++- 7 files changed, 17 insertions(+), 9 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/{ => ui}/JetCallableParameterTableModel.java (91%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/{ => ui}/JetChangePropertySignatureDialog.kt (100%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/{ => ui}/JetChangeSignatureDialog.java (99%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/{ => ui}/JetFunctionParameterTableModel.java (94%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/{ => ui}/JetPrimaryConstructorParameterTableModel.java (91%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/{ => ui}/JetSecondaryConstructorParameterTableModel.java (85%) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt index ea42b360901..adc2be4f15a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature import com.intellij.lang.java.JavaLanguage import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.psi.PsiElement @@ -32,19 +31,17 @@ import com.intellij.refactoring.util.CanonicalTypes import com.intellij.testFramework.LightVirtualFile import com.intellij.util.VisibilityUtil import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.idea.JetFileType -import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde -import org.jetbrains.kotlin.idea.core.refactoring.createJavaClass import org.jetbrains.kotlin.idea.core.refactoring.createJavaMethod import org.jetbrains.kotlin.idea.core.refactoring.toPsiFile import org.jetbrains.kotlin.idea.refactoring.CallableRefactoring +import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.JetChangeSignatureDialog import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.resolve.BindingContext diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetCallableParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java similarity index 91% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetCallableParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java index ac8c0d280a4..96c46afb54b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetCallableParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.changeSignature; +package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiCodeFragment; @@ -23,6 +23,9 @@ import com.intellij.refactoring.changeSignature.ParameterTableModelBase; import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetPsiFactory; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangePropertySignatureDialog.kt similarity index 100% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangePropertySignatureDialog.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangePropertySignatureDialog.kt diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.java similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.java index 60b414f99eb..ce8b961d443 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.changeSignature; +package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.colors.EditorColorsManager; @@ -54,6 +54,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.*; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpressionCodeFragment; import org.jetbrains.kotlin.psi.JetTypeCodeFragment; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetFunctionParameterTableModel.java similarity index 94% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetFunctionParameterTableModel.java index b3dff394552..8627ff65306 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetFunctionParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetFunctionParameterTableModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.changeSignature; +package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; @@ -24,6 +24,8 @@ import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.JetFileType; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetPrimaryConstructorParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java similarity index 91% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetPrimaryConstructorParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java index 186b3a2fc84..82553775fe5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetPrimaryConstructorParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.changeSignature; +package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui; import com.intellij.openapi.ui.ComboBoxTableRenderer; import com.intellij.psi.PsiElement; @@ -23,6 +23,9 @@ import com.intellij.util.ui.ColumnInfo; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; import javax.swing.*; import javax.swing.table.TableCellEditor; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetSecondaryConstructorParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetSecondaryConstructorParameterTableModel.java similarity index 85% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetSecondaryConstructorParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetSecondaryConstructorParameterTableModel.java index 0e7722650aa..45198b54b37 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetSecondaryConstructorParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetSecondaryConstructorParameterTableModel.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.changeSignature; +package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui; import com.intellij.psi.PsiElement; import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import org.jetbrains.kotlin.idea.JetFileType; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; public class JetSecondaryConstructorParameterTableModel extends JetCallableParameterTableModel { public JetSecondaryConstructorParameterTableModel(JetMethodDescriptor methodDescriptor, PsiElement context) {