removed JLang and LUtil from file named in stdlib

ReadMe.md

@@ -79,7 +79,7 @@ Currently only committers can assign issues to themselves so just add a comment
 
 A nice gentle way to contribute would be to review the [API docs](http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/index.html) and find classes or functions which are not documented very well and submit a patch.
 
-In particular it'd be great if all functions included a nice example of how to use it such as for the <a href="http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Collection-extensions.html#filter(jet.Function1)">filter()</a> function on Collection. This is implemented using the <a href="https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/JLangIterablesLazy.kt#L17">@includeFunctionBody</a> macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage.
+In particular it'd be great if all functions included a nice example of how to use it such as for the <a href="http://jetbrains.github.com/kotlin/versions/snapshot/apidocs/kotlin/java/util/Collection-extensions.html#filter(jet.Function1)">filter()</a> function on Collection. This is implemented using the <a href="https://github.com/JetBrains/kotlin/blob/master/libraries/stdlib/src/kotlin/IterablesLazy.kt#L17">@includeFunctionBody</a> macro to include code from a test function. This serves as a double win; the API gets better documented with nice examples to help new users and the code gets more test coverage.
 
 Also the [JavaScript translation](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) could really use your help. See the [JavaScript contribution section](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) for more details.
 

js/js.translator/src/org/jetbrains/k2js/config/Config.java

@@ -118,15 +118,15 @@ public abstract class Config {
             "/kotlin/Preconditions.kt",
             "/kotlin/Iterators.kt",
             "/kotlin/JUtil.kt",
-            "/kotlin/JUtilCollections.kt",
-            "/kotlin/JUtilMaps.kt",
-            "/kotlin/JLangIterables.kt",
-            "/kotlin/JLangIterablesLazy.kt",
-            "/kotlin/JLangIterablesSpecial.kt",
-            "/generated/ArraysFromJLangIterables.kt",
-            "/generated/ArraysFromJLangIterablesLazy.kt",
-            "/generated/ArraysFromJUtilCollections.kt",
-            "/generated/JUtilIteratorsFromJLangIterables.kt",
+            "/kotlin/Collections.kt",
+            "/kotlin/Maps.kt",
+            "/kotlin/Iterables.kt",
+            "/kotlin/IterablesLazy.kt",
+            "/kotlin/IterablesSpecial.kt",
+            "/generated/ArraysFromIterables.kt",
+            "/generated/ArraysFromIterablesLazy.kt",
+            "/generated/ArraysFromCollections.kt",
+            "/generated/IteratorsFromIterables.kt",
             "/kotlin/support/AbstractIterator.kt",
             "/kotlin/Standard.kt",
             "/kotlin/Strings.kt",

libraries/stdlib/src/generated/ArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/ArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/ArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/ArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/ArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/BooleanArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/BooleanArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/BooleanArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/BooleanArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/BooleanArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/ByteArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/ByteArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/ByteArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/ByteArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/ByteArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/CharArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/CharArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/CharArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/CharArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/CharArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/DoubleArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/DoubleArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/DoubleArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/DoubleArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/DoubleArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/FloatArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/FloatArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/FloatArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/FloatArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/FloatArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/IntArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/IntArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/IntArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/IntArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/IntArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/IteratorsFromIterables.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/IteratorsFromIterablesJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/LongArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/LongArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/LongArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/LongArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/LongArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/ShortArraysFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/ShortArraysFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/src/generated/ShortArraysFromIterables.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterables.kt
+// Generated from input file: src/kotlin/Iterables.kt
 //
 
 

libraries/stdlib/src/generated/ShortArraysFromIterablesJVM.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesJVM.kt
+// Generated from input file: src/kotlin/IterablesJVM.kt
 //
 
 

libraries/stdlib/src/generated/ShortArraysFromIterablesLazy.kt

@@ -5,7 +5,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JLangIterablesLazy.kt
+// Generated from input file: src/kotlin/IterablesLazy.kt
 //
 
 

libraries/stdlib/src/generated/StandardFromCollections.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollections.kt
+// Generated from input file: src/kotlin/Collections.kt
 //
 
 

libraries/stdlib/src/generated/StandardFromCollectionsJVM.kt

@@ -4,7 +4,7 @@ package kotlin
 // NOTE THIS FILE IS AUTO-GENERATED by the GenerateStandardLib.kt
 // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib
 //
-// Generated from input file: JUtilCollectionsJVM.kt
+// Generated from input file: src/kotlin/CollectionsJVM.kt
 //
 
 

libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateStandardLib.kt

@@ -74,16 +74,16 @@ fun main(args: Array<String>) {
 
     val otherArrayNames = arrayList("Boolean", "Byte", "Char", "Short", "Int", "Long", "Float", "Double")
 
-    // JLangIterables - Generic iterable stuff
-    generateFile(File(outDir, "ArraysFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) {
+    // Iterables - Generic iterable stuff
+    generateFile(File(outDir, "ArraysFromIterables.kt"), "package kotlin\n", File(srcDir, "Iterables.kt")) {
         it.replaceAll("Iterable<T", "Array<T").
             replaceAll("Iterable<T", "Array<T")
     }
-    generateFile(File(outDir, "ArraysFromJLangIterablesJVM.kt"), "package kotlin\n", File(srcDir, "JLangIterablesJVM.kt")) {
+    generateFile(File(outDir, "ArraysFromIterablesJVM.kt"), "package kotlin\n", File(srcDir, "IterablesJVM.kt")) {
         it.replaceAll("Iterable<T", "Array<T").
             replaceAll("Iterable<T", "Array<T")
     }
-    generateFile(File(outDir, "ArraysFromJLangIterablesLazy.kt"), "package kotlin\n", File(srcDir, "JLangIterablesLazy.kt")) {
+    generateFile(File(outDir, "ArraysFromIterablesLazy.kt"), "package kotlin\n", File(srcDir, "IterablesLazy.kt")) {
         it.replaceAll("Iterable<T", "Array<T")
     }
     for (arrayName in otherArrayNames) {
@@ -94,47 +94,47 @@ fun main(args: Array<String>) {
             replaceAll("Iterable<T>", "${arrayName}Array"))
         }
 
-        generateFile(File(outDir, "${arrayName}ArraysFromJLangIterables.kt"), "package kotlin\n", File(srcDir, "JLangIterables.kt")) {
+        generateFile(File(outDir, "${arrayName}ArraysFromIterables.kt"), "package kotlin\n", File(srcDir, "Iterables.kt")) {
             replace(it)
         }
-        generateFile(File(outDir, "${arrayName}ArraysFromJLangIterablesJVM.kt"), "package kotlin\n", File(srcDir, "JLangIterablesJVM.kt")) {
+        generateFile(File(outDir, "${arrayName}ArraysFromIterablesJVM.kt"), "package kotlin\n", File(srcDir, "IterablesJVM.kt")) {
             replace(it)
         }
-        generateFile(File(outDir, "${arrayName}ArraysFromJLangIterablesLazy.kt"), "package kotlin\n", File(srcDir, "JLangIterablesLazy.kt")) {
+        generateFile(File(outDir, "${arrayName}ArraysFromIterablesLazy.kt"), "package kotlin\n", File(srcDir, "IterablesLazy.kt")) {
             replace(it)
         }
     }
 
-    generateFile(File(outDir, "JUtilIteratorsFromJLangIterables.kt"), "package kotlin", File(srcDir, "JLangIterables.kt")) {
+    generateFile(File(outDir, "IteratorsFromIterables.kt"), "package kotlin", File(srcDir, "Iterables.kt")) {
         it.replaceAll("Iterable<T", "Iterator<T")
     }
-    generateFile(File(outDir, "JUtilIteratorsFromJLangIterablesJVM.kt"), "package kotlin", File(srcDir, "JLangIterablesJVM.kt")) {
+    generateFile(File(outDir, "IteratorsFromIterablesJVM.kt"), "package kotlin", File(srcDir, "IterablesJVM.kt")) {
         it.replaceAll("Iterable<T", "Iterator<T")
     }
 
 
-    // JUtilCollections - methods returning a collection of the same input size (if its a collection)
-    generateFile(File(outDir, "ArraysFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
+    // Collections - methods returning a collection of the same input size (if its a collection)
+    generateFile(File(outDir, "ArraysFromCollections.kt"), "package kotlin", File(srcDir, "Collections.kt")) {
         it.replaceAll("Collection<T", "Array<T")
     }
-    generateFile(File(outDir, "ArraysFromJUtilCollectionsJVM.kt"), "package kotlin", File(srcDir, "JUtilCollectionsJVM.kt")) {
+    generateFile(File(outDir, "ArraysFromCollectionsJVM.kt"), "package kotlin", File(srcDir, "CollectionsJVM.kt")) {
         it.replaceAll("Collection<T", "Array<T")
     }
     for (arrayName in otherArrayNames) {
-        generateFile(File(outDir, "${arrayName}ArraysFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
+        generateFile(File(outDir, "${arrayName}ArraysFromCollections.kt"), "package kotlin", File(srcDir, "Collections.kt")) {
             replaceGenerics(arrayName, it.replaceAll("<T> Collection<T>", "${arrayName}Array").
             replaceAll("Collection<T>", "${arrayName}Array"))
         }
-        generateFile(File(outDir, "${arrayName}ArraysFromJUtilCollectionsJVM.kt"), "package kotlin", File(srcDir, "JUtilCollectionsJVM.kt")) {
+        generateFile(File(outDir, "${arrayName}ArraysFromCollectionsJVM.kt"), "package kotlin", File(srcDir, "CollectionsJVM.kt")) {
             replaceGenerics(arrayName, it.replaceAll("<T> Collection<T>", "${arrayName}Array").
             replaceAll("Collection<T>", "${arrayName}Array"))
         }
     }
 
-    generateFile(File(outDir, "StandardFromJUtilCollections.kt"), "package kotlin", File(srcDir, "JUtilCollections.kt")) {
+    generateFile(File(outDir, "StandardFromCollections.kt"), "package kotlin", File(srcDir, "Collections.kt")) {
         it.replaceAll("Collection<T", "Iterable<T").replaceAll("(this.size)", "")
     }
-    generateFile(File(outDir, "StandardFromJUtilCollectionsJVM.kt"), "package kotlin",  File(srcDir, "JUtilCollectionsJVM.kt")) {
+    generateFile(File(outDir, "StandardFromCollectionsJVM.kt"), "package kotlin",  File(srcDir, "CollectionsJVM.kt")) {
         it.replaceAll("Collection<T", "Iterable<T").replaceAll("(this.size)", "")
     }
 

libraries/tools/kotlin-js-library/pom.xml

@@ -58,11 +58,11 @@
                                         <include name="Preconditions.kt"/>
                                         <include name="Iterators.kt"/>
                                         <include name="JUtil.kt"/>
-                                        <include name="JUtilCollections.kt"/>
-                                        <include name="JUtilMaps.kt"/>
-                                        <include name="JLangIterables.kt"/>
-                                        <include name="JLangIterablesLazy.kt"/>
-                                        <include name="JLangIterablesSpecial.kt"/>
+                                        <include name="Collections.kt"/>
+                                        <include name="Maps.kt"/>
+                                        <include name="Iterables.kt"/>
+                                        <include name="IterablesLazy.kt"/>
+                                        <include name="IterablesSpecial.kt"/>
 <!--
                                         <include name="Ordering.kt"/>
 -->
@@ -74,8 +74,8 @@
                                         <exclude name="**/*JVM.kt"/>
                                         <exclude name="DownTo.kt"/>
 <!--
-                                        <include name="JUtilIteratorsFromJLangIterables.kt"/>
-                                        <include name="JUtilIterablesFromJUtilCollections.kt"/>
+                                        <include name="IteratorsFromJLangIterables.kt"/>
+                                        <include name="IterablesFromCollections.kt"/>
 -->
                                     </fileset>
                                 </copy>