removed imports of java mapped classes

in tools code
This commit is contained in:
Svetlana Isakova
2012-09-07 23:36:09 +04:00
parent 89fd0526cf
commit e059f8b650
15 changed files with 5 additions and 23 deletions
@@ -3,7 +3,6 @@ package kotlin.jdbc
import java.sql.* import java.sql.*
import kotlin.template.StringTemplate import kotlin.template.StringTemplate
import java.math.BigDecimal import java.math.BigDecimal
import java.util.Map
import java.util.Properties import java.util.Properties
/** /**
@@ -2,9 +2,6 @@ package kotlin.jdbc
import java.sql.* import java.sql.*
import java.util.ArrayList import java.util.ArrayList
import java.util.Collection
import java.util.List
import java.util.Map
/** /**
* Executes the specfied block with result set and then closes it * Executes the specfied block with result set and then closes it
@@ -68,7 +65,7 @@ fun ResultSet.getValues(columnNames : jet.Array<String> = getColumnNames()) : je
* Return map filled with values from current row in the cursor. Uses column names as keys for result map. * Return map filled with values from current row in the cursor. Uses column names as keys for result map.
* @param columnNames you can specify column names to extract otherwise all columns will be extracted * @param columnNames you can specify column names to extract otherwise all columns will be extracted
*/ */
fun ResultSet.getValuesAsMap(columnNames : jet.Array<String> = getColumnNames()) : java.util.Map<String, Any?> { fun ResultSet.getValuesAsMap(columnNames : jet.Array<String> = getColumnNames()) : Map<String, Any?> {
val result = java.util.HashMap<String, Any?>(columnNames.size) val result = java.util.HashMap<String, Any?>(columnNames.size)
columnNames.forEach { columnNames.forEach {
@@ -11,7 +11,7 @@ annotation class extension() {
/** /**
* Defines the extension functions on a List<T> * Defines the extension functions on a List<T>
*/ */
extension open class ListExtensions<T>(private val that: java.util.List<T>): CollectionExtensions<T>(that), ListLike<T> { extension open class ListExtensions<T>(private val that: List<T>): CollectionExtensions<T>(that), ListLike<T> {
public override fun get(index: Int): T { public override fun get(index: Int): T {
return that.get(index)!! return that.get(index)!!
} }
@@ -20,7 +20,7 @@ extension open class ListExtensions<T>(private val that: java.util.List<T>): Col
/** /**
* Defines the extension functions on a Collection<T> * Defines the extension functions on a Collection<T>
*/ */
extension open class CollectionExtensions<T>(private val that: java.util.Collection<T>): CollectionLike<T> { extension open class CollectionExtensions<T>(private val that: Collection<T>): CollectionLike<T> {
public override fun iterator(): Iterator<T> { public override fun iterator(): Iterator<T> {
// TODO adapt java.util.Iterator<T> to Iterator<T> // TODO adapt java.util.Iterator<T> to Iterator<T>
throw UnsupportedOperationException() throw UnsupportedOperationException()
@@ -36,7 +36,7 @@ extension open class CollectionExtensions<T>(private val that: java.util.Collect
/** /**
* Defines the extension functions on a Collection<T> * Defines the extension functions on a Collection<T>
*/ */
extension open class IteratorExtensions<T>(private val that: java.util.Iterator<T>): LazyTraversable<T> { extension open class IteratorExtensions<T>(private val that: Iterator<T>): LazyTraversable<T> {
public override fun iterator(): Iterator<T> { public override fun iterator(): Iterator<T> {
// TODO adapt java.util.Iterator<T> to Iterator<T> // TODO adapt java.util.Iterator<T> to Iterator<T>
throw UnsupportedOperationException() throw UnsupportedOperationException()
@@ -1,8 +1,6 @@
package kotlin2 package kotlin2
import java.util.ArrayList import java.util.ArrayList
import java.util.Collection
import java.util.List
public trait EagerTraversable<T>: Traversable<T> { public trait EagerTraversable<T>: Traversable<T> {
/** /**
@@ -350,7 +350,7 @@ public trait Traversable<T>: Iterable<T> {
/* /*
public fun withIndices(): java.lang.Iterable<#(Int, T)> { public fun withIndices(): java.lang.Iterable<#(Int, T)> {
return object : java.lang.Iterable<#(Int, T)> { return object : java.lang.Iterable<#(Int, T)> {
public override fun iterator(): java.util.Iterator<#(Int, T)> { public override fun iterator(): Iterator<#(Int, T)> {
return NumberedIterator<T>(iterator()) return NumberedIterator<T>(iterator())
} }
} }
@@ -1,8 +1,6 @@
package org.jetbrains.kotlin.doc package org.jetbrains.kotlin.doc
import java.util.HashMap import java.util.HashMap
import java.util.List
import java.util.Map
fun <A, K, V> List<A>.toHashMap(f: (A) -> Pair<K, V>): Map<K, V> { fun <A, K, V> List<A>.toHashMap(f: (A) -> Pair<K, V>): Map<K, V> {
val r = HashMap<K, V>() val r = HashMap<K, V>()
@@ -1,7 +1,6 @@
package org.jetbrains.kotlin.doc.highlighter package org.jetbrains.kotlin.doc.highlighter
import java.util.HashMap import java.util.HashMap
import java.util.Map
import kotlin.template.HtmlFormatter import kotlin.template.HtmlFormatter
import org.jetbrains.jet.internal.com.intellij.psi.* import org.jetbrains.jet.internal.com.intellij.psi.*
import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType
@@ -1,7 +1,6 @@
package org.jetbrains.kotlin.doc.highlighter2 package org.jetbrains.kotlin.doc.highlighter2
import java.io.File import java.io.File
import java.util.List
import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
import org.jetbrains.jet.internal.com.intellij.psi.PsiElement import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
import org.jetbrains.jet.internal.com.intellij.psi.PsiFile import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
@@ -1,6 +1,5 @@
package org.jetbrains.kotlin.doc.highlighter2 package org.jetbrains.kotlin.doc.highlighter2
import java.util.List
import org.jetbrains.jet.internal.com.intellij.psi.PsiElement import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
private fun PsiElement.getTextChildRelativeOffset() = private fun PsiElement.getTextChildRelativeOffset() =
@@ -1,7 +1,6 @@
package org.jetbrains.kotlin.doc.model package org.jetbrains.kotlin.doc.model
import java.io.File import java.io.File
import java.util.List
import org.jetbrains.jet.cli.common.CompilerPlugin import org.jetbrains.jet.cli.common.CompilerPlugin
import org.jetbrains.jet.cli.common.CompilerPluginContext import org.jetbrains.jet.cli.common.CompilerPluginContext
import org.jetbrains.kotlin.doc.KDocArguments import org.jetbrains.kotlin.doc.KDocArguments
@@ -1,6 +1,5 @@
package org.jetbrains.kotlin.doc.templates package org.jetbrains.kotlin.doc.templates
import java.util.List
import org.jetbrains.kotlin.doc.* import org.jetbrains.kotlin.doc.*
import org.jetbrains.kotlin.doc.model.KAnnotation import org.jetbrains.kotlin.doc.model.KAnnotation
import org.jetbrains.kotlin.doc.model.KClass import org.jetbrains.kotlin.doc.model.KClass
@@ -1,7 +1,5 @@
package org.jetbrains.kotlin.template package org.jetbrains.kotlin.template
import java.util.List
abstract class HtmlTemplate() : TextTemplate() { abstract class HtmlTemplate() : TextTemplate() {
fun tag( fun tag(
@@ -1,6 +1,5 @@
package test.kotlin package test.kotlin
import java.util.List
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.jet.config.CompilerConfiguration
@@ -1,6 +1,5 @@
package org.jetbrains.kotlin.js.qunit package org.jetbrains.kotlin.js.qunit
import java.util.List
import kotlin.test.* import kotlin.test.*
import org.openqa.selenium.By import org.openqa.selenium.By
import org.openqa.selenium.WebDriver import org.openqa.selenium.WebDriver
@@ -5,7 +5,6 @@ import org.junit.runners.AllTests
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.Parameterized import org.junit.runners.Parameterized
import org.junit.runners.Parameterized.Parameters import org.junit.runners.Parameterized.Parameters
import java.util.List
/* /*
[RunWith(javaClass<Parameterized>())] [RunWith(javaClass<Parameterized>())]