1.1 --- a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java Sat Aug 02 12:59:31 2014 +0200
1.2 +++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java Tue Aug 26 18:13:30 2014 +0200
1.3 @@ -353,13 +353,13 @@
1.4 source.append("package ").append(pkgName).append(";\n");
1.5 source.append("public final class $JsCallbacks$ {\n");
1.6 source.append(" static final $JsCallbacks$ VM = new $JsCallbacks$(null);\n");
1.7 - source.append(" private final org.apidesign.html.boot.spi.Fn.Presenter p;\n");
1.8 + source.append(" private final org.netbeans.html.boot.spi.Fn.Presenter p;\n");
1.9 source.append(" private $JsCallbacks$ last;\n");
1.10 - source.append(" private $JsCallbacks$(org.apidesign.html.boot.spi.Fn.Presenter p) {\n");
1.11 + source.append(" private $JsCallbacks$(org.netbeans.html.boot.spi.Fn.Presenter p) {\n");
1.12 source.append(" this.p = p;\n");
1.13 source.append(" }\n");
1.14 source.append(" final $JsCallbacks$ current() {\n");
1.15 - source.append(" org.apidesign.html.boot.spi.Fn.Presenter now = org.apidesign.html.boot.spi.Fn.activePresenter();\n");
1.16 + source.append(" org.netbeans.html.boot.spi.Fn.Presenter now = org.netbeans.html.boot.spi.Fn.activePresenter();\n");
1.17 source.append(" if (now == p) return this;\n");
1.18 source.append(" if (last != null && now == last.p) return last;\n");
1.19 source.append(" return last = new $JsCallbacks$(now);\n");
1.20 @@ -388,9 +388,9 @@
1.21 final TypeMirror t = ve.asType();
1.22 if (!t.getKind().isPrimitive()) {
1.23 source.append("Object");
1.24 - convert.append(" if (p instanceof org.apidesign.html.boot.spi.Fn.FromJavaScript) {\n");
1.25 + convert.append(" if (p instanceof org.netbeans.html.boot.spi.Fn.FromJavaScript) {\n");
1.26 convert.append(" arg").append(cnt).
1.27 - append(" = ((org.apidesign.html.boot.spi.Fn.FromJavaScript)p).toJava(arg").append(cnt).
1.28 + append(" = ((org.netbeans.html.boot.spi.Fn.FromJavaScript)p).toJava(arg").append(cnt).
1.29 append(");\n");
1.30 convert.append(" }\n");
1.31 } else {
1.32 @@ -402,9 +402,9 @@
1.33 source.append(") throws Throwable {\n");
1.34 source.append(convert);
1.35 if (useTryResources()) {
1.36 - source.append(" try (java.io.Closeable a = org.apidesign.html.boot.spi.Fn.activate(p)) { \n");
1.37 + source.append(" try (java.io.Closeable a = org.netbeans.html.boot.spi.Fn.activate(p)) { \n");
1.38 } else {
1.39 - source.append(" java.io.Closeable a = org.apidesign.html.boot.spi.Fn.activate(p); try {\n");
1.40 + source.append(" java.io.Closeable a = org.netbeans.html.boot.spi.Fn.activate(p); try {\n");
1.41 }
1.42 source.append(" ");
1.43 if (m.getReturnType().getKind() != TypeKind.VOID) {
1.44 @@ -430,8 +430,8 @@
1.45 if (m.getReturnType().getKind() == TypeKind.VOID) {
1.46 source.append(" return null;\n");
1.47 } else {
1.48 - source.append(" if (p instanceof org.apidesign.html.boot.spi.Fn.ToJavaScript) {\n");
1.49 - source.append(" $ret = ((org.apidesign.html.boot.spi.Fn.ToJavaScript)p).toJavaScript($ret);\n");
1.50 + source.append(" if (p instanceof org.netbeans.html.boot.spi.Fn.ToJavaScript) {\n");
1.51 + source.append(" $ret = ((org.netbeans.html.boot.spi.Fn.ToJavaScript)p).toJavaScript($ret);\n");
1.52 source.append(" }\n");
1.53 source.append(" return $ret;\n");
1.54 }