# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1452854497 -3600
# Node ID e633fed120649b94f111d63024075585a21d4226
# Parent  36165f49f5986e902aa3b242662d03775083ace1
Make sure the generated code uses fully qualified names when referencing java.lang.Object

diff -r 36165f49f598 -r e633fed12064 boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
--- a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java	Fri Jan 15 11:40:28 2016 +0100
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java	Fri Jan 15 11:41:37 2016 +0100
@@ -72,7 +72,6 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.ExecutableType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -424,7 +423,7 @@
         StringBuilder convert = new StringBuilder();
         if (!isStatic) {
             if (selfObj) {
-                source.append("Object self");
+                source.append("java.lang.Object self");
                 convert.append("    if (p instanceof org.netbeans.html.boot.spi.Fn.FromJavaScript) {\n");
                 convert.append("      self").
                         append(" = ((org.netbeans.html.boot.spi.Fn.FromJavaScript)p).toJava(self").
@@ -443,7 +442,7 @@
             ++cnt;
             final TypeMirror t = ve.asType();
             if (!t.getKind().isPrimitive() && !"java.lang.String".equals(t.toString())) { // NOI18N
-                source.append("Object");
+                source.append("java.lang.Object");
                 convert.append("    if (p instanceof org.netbeans.html.boot.spi.Fn.FromJavaScript) {\n");
                 convert.append("      arg").append(cnt).
                         append(" = ((org.netbeans.html.boot.spi.Fn.FromJavaScript)p).toJava(arg").append(cnt).
@@ -464,7 +463,7 @@
         }
         source.append("    ");
         if (m.getReturnType().getKind() != TypeKind.VOID) {
-            source.append("Object $ret = ");
+            source.append("java.lang.Object $ret = ");
         }
         if (isStatic) {
             source.append(((TypeElement)m.getEnclosingElement()).getQualifiedName());
diff -r 36165f49f598 -r e633fed12064 boot/src/test/java/org/netbeans/html/boot/impl/Object.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boot/src/test/java/org/netbeans/html/boot/impl/Object.java	Fri Jan 15 11:41:37 2016 +0100
@@ -0,0 +1,49 @@
+/**
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+package org.netbeans.html.boot.impl;
+
+/** Fake class to cause confusion in the generated code and force it
+ * to use fully qualified names
+ */
+final class Object {
+}