From 95bf9e3c1c876f430069379140994fd206ba92ae Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 15 Oct 2014 17:29:58 +0400 Subject: [PATCH] Repackaging --- j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt | 1 - j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt | 1 - j2k/src/org/jetbrains/jet/j2k/Converter.kt | 1 - .../jetbrains/jet/j2k/{visitors => }/ExpressionConverter.kt | 2 +- .../org/jetbrains/jet/j2k/{visitors => }/ForConverter.kt | 6 +----- .../org/jetbrains/jet/j2k/{visitors => }/SpecialMethod.kt | 3 +-- .../jetbrains/jet/j2k/{visitors => }/StatementConverter.kt | 4 +--- .../org/jetbrains/jet/j2k/{visitors => }/SwitchConverter.kt | 4 +--- j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt | 1 - j2k/src/org/jetbrains/jet/j2k/{visitors => }/TypeVisitor.kt | 4 +--- 10 files changed, 6 insertions(+), 21 deletions(-) rename j2k/src/org/jetbrains/jet/j2k/{visitors => }/ExpressionConverter.kt (99%) rename j2k/src/org/jetbrains/jet/j2k/{visitors => }/ForConverter.kt (97%) rename j2k/src/org/jetbrains/jet/j2k/{visitors => }/SpecialMethod.kt (98%) rename j2k/src/org/jetbrains/jet/j2k/{visitors => }/StatementConverter.kt (98%) rename j2k/src/org/jetbrains/jet/j2k/{visitors => }/SwitchConverter.kt (97%) rename j2k/src/org/jetbrains/jet/j2k/{visitors => }/TypeVisitor.kt (98%) diff --git a/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt index 8f9741175e2..2c190b9342c 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt @@ -35,7 +35,6 @@ import com.intellij.psi.PsiExpressionStatement import com.intellij.psi.PsiAssignmentExpression import com.intellij.psi.PsiExpression import com.intellij.psi.JavaTokenType -import org.jetbrains.jet.j2k.visitors.ExpressionConverter import com.intellij.psi.PsiElementFactory class FieldCorrectionInfo(val name: Identifier, val access: Modifier?, val setterAccess: Modifier?) diff --git a/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt index 9af191b4881..ef02b091e97 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt @@ -22,7 +22,6 @@ import com.intellij.psi.util.PsiUtil import java.util.HashMap import java.util.ArrayList import java.util.HashSet -import org.jetbrains.jet.j2k.visitors.ExpressionConverter class ConstructorConverter(private val psiClass: PsiClass, private val converter: Converter, diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt index 2f3a9c138eb..ff4c745a01c 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt @@ -18,7 +18,6 @@ package org.jetbrains.jet.j2k import com.intellij.psi.* import org.jetbrains.jet.j2k.ast.* -import org.jetbrains.jet.j2k.visitors.* import java.util.* import com.intellij.psi.CommonClassNames.* import org.jetbrains.jet.lang.types.expressions.OperatorConventions.* diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ExpressionConverter.kt similarity index 99% rename from j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionConverter.kt rename to j2k/src/org/jetbrains/jet/j2k/ExpressionConverter.kt index f24a6e0056f..6d416b83b6d 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ExpressionConverter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.j2k.visitors +package org.jetbrains.jet.j2k import com.intellij.psi.* import com.intellij.psi.tree.IElementType diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ForConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ForConverter.kt similarity index 97% rename from j2k/src/org/jetbrains/jet/j2k/visitors/ForConverter.kt rename to j2k/src/org/jetbrains/jet/j2k/ForConverter.kt index 9e63198cd4c..a9354a2f0ec 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ForConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ForConverter.kt @@ -14,14 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.j2k.visitors +package org.jetbrains.jet.j2k import com.intellij.psi.PsiForStatement import org.jetbrains.jet.j2k.ast.ForeachStatement import com.intellij.psi.PsiDeclarationStatement -import org.jetbrains.jet.j2k.singleOrNull2 import com.intellij.psi.PsiLocalVariable -import org.jetbrains.jet.j2k.hasWriteAccesses import com.intellij.psi.PsiBinaryExpression import com.intellij.psi.JavaTokenType import com.intellij.psi.PsiReferenceExpression @@ -30,7 +28,6 @@ import org.jetbrains.jet.j2k.ast.PrimitiveType import org.jetbrains.jet.j2k.ast.Identifier import org.jetbrains.jet.j2k.ast.assignNoPrototype import org.jetbrains.jet.j2k.ast.declarationIdentifier -import org.jetbrains.jet.j2k.isInSingleLine import com.intellij.psi.PsiElement import com.intellij.psi.PsiVariable import com.intellij.psi.PsiPostfixExpression @@ -47,7 +44,6 @@ import com.intellij.psi.PsiArrayType import org.jetbrains.jet.j2k.ast.BinaryExpression import org.jetbrains.jet.j2k.ast.LiteralExpression import org.jetbrains.jet.j2k.ast.RangeExpression -import org.jetbrains.jet.j2k.Converter import com.intellij.psi.PsiBlockStatement import com.intellij.psi.PsiNamedElement import org.jetbrains.jet.j2k.ast.Block diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/SpecialMethod.kt b/j2k/src/org/jetbrains/jet/j2k/SpecialMethod.kt similarity index 98% rename from j2k/src/org/jetbrains/jet/j2k/visitors/SpecialMethod.kt rename to j2k/src/org/jetbrains/jet/j2k/SpecialMethod.kt index 7d50ce4549a..a23780ed2da 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/SpecialMethod.kt +++ b/j2k/src/org/jetbrains/jet/j2k/SpecialMethod.kt @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.j2k.visitors +package org.jetbrains.jet.j2k import com.intellij.psi.PsiMethod import com.intellij.psi.PsiExpression -import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.BinaryExpression import org.jetbrains.jet.j2k.ast.Expression import org.jetbrains.jet.j2k.ast.MethodCallExpression diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/StatementConverter.kt b/j2k/src/org/jetbrains/jet/j2k/StatementConverter.kt similarity index 98% rename from j2k/src/org/jetbrains/jet/j2k/visitors/StatementConverter.kt rename to j2k/src/org/jetbrains/jet/j2k/StatementConverter.kt index aa640bd4ca5..fb48f4d4976 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/StatementConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/StatementConverter.kt @@ -14,13 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.j2k.visitors +package org.jetbrains.jet.j2k import com.intellij.psi.* -import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.* import java.util.ArrayList -import org.jetbrains.jet.j2k.isInSingleLine trait StatementConverter { fun convertStatement(statement: PsiStatement, converter: Converter): Statement diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/SwitchConverter.kt b/j2k/src/org/jetbrains/jet/j2k/SwitchConverter.kt similarity index 97% rename from j2k/src/org/jetbrains/jet/j2k/visitors/SwitchConverter.kt rename to j2k/src/org/jetbrains/jet/j2k/SwitchConverter.kt index 5cb62366431..8fe34cc9f39 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/SwitchConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/SwitchConverter.kt @@ -14,13 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.j2k.visitors +package org.jetbrains.jet.j2k import com.intellij.psi.* import org.jetbrains.jet.j2k.ast.* -import org.jetbrains.jet.j2k.Converter import java.util.ArrayList -import org.jetbrains.jet.j2k.singleOrNull2 class SwitchConverter(private val converter: Converter) { public fun convert(statement: PsiSwitchStatement): WhenStatement diff --git a/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt index d71d03644b1..320eaa0a387 100644 --- a/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt @@ -19,7 +19,6 @@ package org.jetbrains.jet.j2k import org.jetbrains.jet.j2k.ast.Type import org.jetbrains.jet.j2k.ast.Nullability import com.intellij.psi.* -import org.jetbrains.jet.j2k.visitors.TypeVisitor import java.util.HashMap import java.util.HashSet import org.jetbrains.jet.j2k.ast.Import diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/TypeVisitor.kt similarity index 98% rename from j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt rename to j2k/src/org/jetbrains/jet/j2k/TypeVisitor.kt index 045f38ba97d..8a74d730c5e 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt +++ b/j2k/src/org/jetbrains/jet/j2k/TypeVisitor.kt @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.j2k.visitors +package org.jetbrains.jet.j2k import com.intellij.psi.* import com.intellij.psi.impl.source.PsiClassReferenceType import org.jetbrains.jet.j2k.ast.* import com.intellij.openapi.util.text.StringUtil import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType -import org.jetbrains.jet.j2k.TypeConverter -import org.jetbrains.jet.j2k.Converter private val PRIMITIVE_TYPES_NAMES = JvmPrimitiveType.values().map { it.getName() }