1.1 --- a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java	Tue Aug 25 22:32:18 2015 +0200
     1.2 +++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java	Fri Jan 15 11:41:37 2016 +0100
     1.3 @@ -72,7 +72,6 @@
     1.4  import javax.lang.model.element.TypeElement;
     1.5  import javax.lang.model.element.VariableElement;
     1.6  import javax.lang.model.type.ArrayType;
     1.7 -import javax.lang.model.type.DeclaredType;
     1.8  import javax.lang.model.type.ExecutableType;
     1.9  import javax.lang.model.type.TypeKind;
    1.10  import javax.lang.model.type.TypeMirror;
    1.11 @@ -424,7 +423,7 @@
    1.12          StringBuilder convert = new StringBuilder();
    1.13          if (!isStatic) {
    1.14              if (selfObj) {
    1.15 -                source.append("Object self");
    1.16 +                source.append("java.lang.Object self");
    1.17                  convert.append("    if (p instanceof org.netbeans.html.boot.spi.Fn.FromJavaScript) {\n");
    1.18                  convert.append("      self").
    1.19                          append(" = ((org.netbeans.html.boot.spi.Fn.FromJavaScript)p).toJava(self").
    1.20 @@ -443,7 +442,7 @@
    1.21              ++cnt;
    1.22              final TypeMirror t = ve.asType();
    1.23              if (!t.getKind().isPrimitive() && !"java.lang.String".equals(t.toString())) { // NOI18N
    1.24 -                source.append("Object");
    1.25 +                source.append("java.lang.Object");
    1.26                  convert.append("    if (p instanceof org.netbeans.html.boot.spi.Fn.FromJavaScript) {\n");
    1.27                  convert.append("      arg").append(cnt).
    1.28                          append(" = ((org.netbeans.html.boot.spi.Fn.FromJavaScript)p).toJava(arg").append(cnt).
    1.29 @@ -464,7 +463,7 @@
    1.30          }
    1.31          source.append("    ");
    1.32          if (m.getReturnType().getKind() != TypeKind.VOID) {
    1.33 -            source.append("Object $ret = ");
    1.34 +            source.append("java.lang.Object $ret = ");
    1.35          }
    1.36          if (isStatic) {
    1.37              source.append(((TypeElement)m.getEnclosingElement()).getQualifiedName());