azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename package jet -> kotlin in j2k

Browse Source 
org.jetbrains.jet.j2k -> org.jetbrains.kotlin.j2k

Also update calls to deprecated functions: size -> size(), length -> length(),
withIndices() -> withIndex()
This commit is contained in:
Alexander Udalov
2015-01-03 04:16:24 +03:00
parent 3c859caf2b
commit 366f0daaa8
68 changed files with 387 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
+5 -5
View File
@@ -22,10 +22,10 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.jet.j2k.ConverterSettings
import org.jetbrains.jet.j2k.FilesConversionScope
import org.jetbrains.jet.j2k.IdeaReferenceSearcher
import org.jetbrains.jet.j2k.JavaToKotlinConverter
import org.jetbrains.kotlin.j2k.ConverterSettings
import org.jetbrains.kotlin.j2k.FilesConversionScope
import org.jetbrains.kotlin.j2k.IdeaReferenceSearcher
import org.jetbrains.kotlin.j2k.JavaToKotlinConverter
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiManager
@@ -109,7 +109,7 @@ public class JavaToKotlinAction : AnAction() {
val convertedTexts = converter.elementsToKotlin(javaFiles.map { it to J2kPostProcessor(it) })
val result = ArrayList<VirtualFile>()
for ((i, psiFile) in javaFiles.withIndices()) {
for ((i, psiFile) in javaFiles.withIndex()) {
ApplicationManager.getApplication().runWriteAction {
result.addIfNotNull(saveConversionResult(psiFile.getVirtualFile(), convertedTexts[i], project))
}
idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Ref
import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.*
import org.jetbrains.jet.j2k.*
import org.jetbrains.kotlin.j2k.*
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.plugin.editor.JetEditorOptions
import java.awt.datatransfer.Transferable
@@ -99,7 +99,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
)
val startOffsets = code.startOffsets
val endOffsets = code.endOffsets
assert(startOffsets.size == endOffsets.size) { "Must have the same size" }
assert(startOffsets.size() == endOffsets.size()) { "Must have the same size" }
val result = StringBuilder()
for (i in startOffsets.indices) {
val startOffset = startOffsets[i]
idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt
+2 -2
View File
@@ -16,10 +16,10 @@
package org.jetbrains.jet.plugin.j2k
import org.jetbrains.jet.j2k.ResolverForConverter
import org.jetbrains.kotlin.j2k.ResolverForConverter
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor
public object IdeaResolverForConverter : ResolverForConverter {
override fun resolveToDescriptor(declaration: JetDeclaration) = declaration.resolveToDescriptor()
}
}
idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.plugin.j2k
import org.jetbrains.jet.j2k.PostProcessor
import org.jetbrains.kotlin.j2k.PostProcessor
import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments
@@ -46,4 +46,4 @@ public class J2kPostProcessor(override val contextToAnalyzeIn: PsiElement) : Pos
typeArgs.delete()
}
}
}
}