# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1409517414 -7200
# Node ID 87f66a77adf9de1458949829dd7e5b4f37738122
# Parent  223db336eed89fd46d94b077b844deaad1796f3b
Adopting to new names of SPI packages to be introduced by version 1.0 of html4j API

diff -r 223db336eed8 -r 87f66a77adf9 ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrJavaScriptBodyTest.java
--- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrJavaScriptBodyTest.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrJavaScriptBodyTest.java	Sun Aug 31 22:36:54 2014 +0200
@@ -18,8 +18,8 @@
 package org.apidesign.bck2brwsr.ko2brwsr;
 
 import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.apidesign.html.json.tck.JavaScriptTCK;
-import org.apidesign.html.json.tck.KOTest;
+import org.netbeans.html.json.tck.JavaScriptTCK;
+import org.netbeans.html.json.tck.KOTest;
 import org.testng.annotations.Factory;
 
 /**
diff -r 223db336eed8 -r 87f66a77adf9 ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java
--- a/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/ko/bck2brwsr/src/test/java/org/apidesign/bck2brwsr/ko2brwsr/Bck2BrwsrKnockoutTest.java	Sun Aug 31 22:36:54 2014 +0200
@@ -25,12 +25,12 @@
 import net.java.html.BrwsrCtx;
 import org.apidesign.bck2brwsr.core.JavaScriptBody;
 import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.Technology;
-import org.apidesign.html.json.spi.Transfer;
-import org.apidesign.html.json.spi.WSTransfer;
-import org.apidesign.html.json.tck.KOTest;
-import org.apidesign.html.json.tck.KnockoutTCK;
+import org.netbeans.html.context.spi.Contexts;
+import org.netbeans.html.json.spi.Technology;
+import org.netbeans.html.json.spi.Transfer;
+import org.netbeans.html.json.spi.WSTransfer;
+import org.netbeans.html.json.tck.KOTest;
+import org.netbeans.html.json.tck.KnockoutTCK;
 import org.netbeans.html.ko4j.KO4J;
 import org.openide.util.lookup.ServiceProvider;
 import org.testng.annotations.Factory;
diff -r 223db336eed8 -r 87f66a77adf9 ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/JavaScriptBodyFXBrwsrTest.java
--- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/JavaScriptBodyFXBrwsrTest.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/JavaScriptBodyFXBrwsrTest.java	Sun Aug 31 22:36:54 2014 +0200
@@ -18,8 +18,8 @@
 package org.apidesign.bck2brwsr.kofx;
 
 import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.apidesign.html.json.tck.JavaScriptTCK;
-import org.apidesign.html.json.tck.KOTest;
+import org.netbeans.html.json.tck.JavaScriptTCK;
+import org.netbeans.html.json.tck.KOTest;
 import org.testng.annotations.Factory;
 
 /**
diff -r 223db336eed8 -r 87f66a77adf9 ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java
--- a/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/ko/fx/src/test/java/org/apidesign/bck2brwsr/kofx/KnockoutFXTest.java	Sun Aug 31 22:36:54 2014 +0200
@@ -29,15 +29,13 @@
 import net.java.html.BrwsrCtx;
 import net.java.html.js.JavaScriptBody;
 import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.apidesign.html.boot.spi.Fn;
-import org.apidesign.html.context.spi.Contexts;
-import org.apidesign.html.json.spi.Technology;
-import org.apidesign.html.json.spi.Transfer;
-import org.apidesign.html.json.spi.WSTransfer;
-import org.apidesign.html.json.tck.KOTest;
-import org.apidesign.html.json.tck.KnockoutTCK;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.netbeans.html.boot.spi.Fn;
+import org.netbeans.html.context.spi.Contexts;
+import org.netbeans.html.json.spi.Technology;
+import org.netbeans.html.json.spi.Transfer;
+import org.netbeans.html.json.spi.WSTransfer;
+import org.netbeans.html.json.tck.KOTest;
+import org.netbeans.html.json.tck.KnockoutTCK;
 import org.netbeans.html.ko4j.KO4J;
 import org.netbeans.html.wstyrus.TyrusContext;
 import org.openide.util.lookup.ServiceProvider;
diff -r 223db336eed8 -r 87f66a77adf9 launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java
--- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/JVMBridge.java	Sun Aug 31 22:36:54 2014 +0200
@@ -21,20 +21,18 @@
 import java.io.Reader;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.TooManyListenersException;
 import java.util.concurrent.Executor;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.scene.web.WebEngine;
 import netscape.javascript.JSObject;
-import org.apidesign.html.boot.spi.Fn;
 import org.netbeans.html.boot.impl.FindResources;
 import org.netbeans.html.boot.impl.FnUtils;
+import org.netbeans.html.boot.spi.Fn;
 
 /**
  *
diff -r 223db336eed8 -r 87f66a77adf9 launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java
--- a/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java	Sun Aug 31 22:36:54 2014 +0200
@@ -30,9 +30,9 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import org.apidesign.html.boot.spi.Fn;
 import org.netbeans.html.boot.impl.FindResources;
 import org.netbeans.html.boot.impl.FnUtils;
+import org.netbeans.html.boot.spi.Fn;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
diff -r 223db336eed8 -r 87f66a77adf9 pom.xml
--- a/pom.xml	Mon Aug 11 18:17:47 2014 +0200
+++ b/pom.xml	Sun Aug 31 22:36:54 2014 +0200
@@ -15,7 +15,7 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <netbeans.version>RELEASE80</netbeans.version>
       <license>COPYING</license>
-      <net.java.html.version>0.8.3</net.java.html.version>
+      <net.java.html.version>1.0-SNAPSHOT</net.java.html.version>
       <netbeans.compile.on.save>none</netbeans.compile.on.save>
   </properties>
   <modules>
diff -r 223db336eed8 -r 87f66a77adf9 rt/emul/mini/src/main/java/java/lang/Class.java
--- a/rt/emul/mini/src/main/java/java/lang/Class.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/rt/emul/mini/src/main/java/java/lang/Class.java	Sun Aug 31 22:36:54 2014 +0200
@@ -1824,6 +1824,13 @@
         + "}\n"
     )
     static native int activate();
+
+    @Exported
+    @JavaScriptOnly(name = "activate__Ljava_io_Closeable_2Lorg_netbeans_html_boot_spi_Fn$Presenter_2", value = "function() {\n"
+        + "  return vm.org_apidesign_bck2brwsr_emul_lang_System(false).activate__Ljava_io_Closeable_2();"
+        + "}\n"
+    )
+    static native int activateNew();
     
     private static Object bck2BrwsrCnvrt(Object o) {
         if (o instanceof Throwable) {
diff -r 223db336eed8 -r 87f66a77adf9 rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Mon Aug 11 18:17:47 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Sun Aug 31 22:36:54 2014 +0200
@@ -1624,7 +1624,10 @@
 
         final String in = mi[0];
         String mcn;
-        if (callbacks && in.equals("org/apidesign/html/boot/spi/Fn")) {
+        if (callbacks && (
+            in.equals("org/apidesign/html/boot/spi/Fn") ||
+            in.equals("org/netbeans/html/boot/spi/Fn")
+        )) {
             mcn = "java_lang_Class";
         } else {
             mcn = mangleClassName(in);
@@ -1660,7 +1663,7 @@
         String mn = findMethodName(mi, cnt, returnType);
 
         final int numArguments = cnt.length() + 1;
-        final CharSequence[] vars = new CharSequence[numArguments];
+        final CharSequence[] vars =  new CharSequence[numArguments];
 
         for (int j = numArguments - 1; j >= 0; --j) {
             vars[j] = mapper.popValue();