Some hacky API tweaks to conform with new stdlib APIs.

js/js.libraries/src/stdlib/JUMaps.kt

@@ -0,0 +1,5 @@
+package kotlin
+
+import java.util.Map as JMap
+/** Provides [] access to maps */
+fun <K, V> JMap<K, V>.set(key : K, value : V) = this.put(key, value)

js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java

@@ -135,15 +135,17 @@ public final class AnalyzerFacadeForJS {
 
         @Override
         public void addDefaultImports(@NotNull Collection<JetImportDirective> directives) {
+            //TODO: these thing should not be hard-coded like that
             directives.add(JetPsiFactory.createImportDirective(project, new ImportPath("js.*")));
             directives.add(JetPsiFactory.createImportDirective(project, new ImportPath(JetStandardClasses.STANDARD_CLASSES_FQNAME, true)));
+            directives.add(JetPsiFactory.createImportDirective(project, new ImportPath("kotlin.*")));
         }
 
         @Override
         public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor,
                                          @NotNull WritableScope namespaceMemberScope) {
-            DefaultModuleConfiguration.createStandardConfiguration(project, true).extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope);
+            DefaultModuleConfiguration.createStandardConfiguration(project, true)
+                .extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope);
         }
-
     }
 }

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

@@ -44,7 +44,8 @@ public abstract class Config {
         "/raphael/raphael.kt",
         "/html5/canvas.kt",
         "/html5/files.kt",
-        "/html5/image.kt"
+        "/html5/image.kt",
+        "/stdlib/JUMaps.kt"
     );
 
     protected static final String LIBRARIES_LOCATION = "js/js.libraries/src";

js/js.translator/testFiles/webDemoExamples2/cases/builder.kt

@@ -7,7 +7,6 @@
  * See this page for details:
  * http://confluence.jetbrains.net/display/Kotlin/Type-safe+Groovy-style+builders
  */
-import js.*
 import java.util.*
 
 fun main(args : Array<String>) {
@@ -75,7 +74,7 @@ abstract class Tag(val name : String) : Element {
   override fun render(builder : StringBuilder, indent : String) {
   builder.append("$indent<$name${renderAttributes()}>\n")
   for (c in children) {
-      c.render(builder, indent + "  ")
+    c?.render(builder, indent + "  ")
   }
   builder.append("$indent</$name>\n")
   }
@@ -129,7 +128,7 @@ class P() : BodyTag("p")
 class H1() : BodyTag("h1")
 class A() : BodyTag("a") {
   public var href : String
-    get() = attributes["href"]
+  get() = attributes["href"].sure()
   set(value) {
     attributes["href"] = value
   }
@@ -140,6 +139,3 @@ fun html(init : HTML.() -> Unit) : HTML {
   html.init()
   return html
 }
-
-// An excerpt from the Standard Library
-fun <K, V> Map<K, V>.set(key : K, value : V) = this.put(key, value)