Repackaging

This commit is contained in:
Valentin Kipyatkov
2014-10-15 17:29:58 +04:00
committed by valentin
parent f5e9230a04
commit 95bf9e3c1c
10 changed files with 6 additions and 21 deletions
@@ -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?)
@@ -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,
@@ -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.*
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() }