Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/test/script/basic/JDK-8026161.js	Tue May 06 17:54:15 2014 +0530
     1.2 +++ b/test/script/basic/JDK-8026161.js	Tue Feb 11 12:05:22 2014 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   * 
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -28,5 +28,5 @@
    1.11   * @run
    1.12   */
    1.13  
    1.14 -print(new java.awt.Color(1, 1, 1)) // creates Color[r=1,g=1,b=1]
    1.15 -print(new java.awt.Color(1.0, 1.0, 1.0)) // Color[r=255,g=255,b=255]
    1.16 +print(Java.type("jdk.nashorn.test.models.IntFloatOverloadSelection").overloadedMethod(1))
    1.17 +print(Java.type("jdk.nashorn.test.models.IntFloatOverloadSelection").overloadedMethod(1.0))

     2.1 --- a/test/script/basic/JDK-8026161.js.EXPECTED	Tue May 06 17:54:15 2014 +0530
     2.2 +++ b/test/script/basic/JDK-8026161.js.EXPECTED	Tue Feb 11 12:05:22 2014 +0100
     2.3 @@ -1,2 +1,2 @@
     2.4 -java.awt.Color[r=1,g=1,b=1]
     2.5 -java.awt.Color[r=255,g=255,b=255]
     2.6 +int
     2.7 +float

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java	Tue Feb 11 12:05:22 2014 +0100
     3.3 @@ -0,0 +1,36 @@
     3.4 +/*
     3.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 + *
     3.8 + * This code is free software; you can redistribute it and/or modify it
     3.9 + * under the terms of the GNU General Public License version 2 only, as
    3.10 + * published by the Free Software Foundation.  Oracle designates this
    3.11 + * particular file as subject to the "Classpath" exception as provided
    3.12 + * by Oracle in the LICENSE file that accompanied this code.
    3.13 + *
    3.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.17 + * version 2 for more details (a copy is included in the LICENSE file that
    3.18 + * accompanied this code).
    3.19 + *
    3.20 + * You should have received a copy of the GNU General Public License version
    3.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.23 + *
    3.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.25 + * or visit www.oracle.com if you need additional information or have any
    3.26 + * questions.
    3.27 + */
    3.28 +package jdk.nashorn.test.models;
    3.29 +
    3.30 +public class IntFloatOverloadSelection {
    3.31 +
    3.32 +    public static String overloadedMethod(int i) {
    3.33 +        return "int";
    3.34 +    }
    3.35 +
    3.36 +    public static String overloadedMethod(float f) {
    3.37 +        return "float";
    3.38 +    }
    3.39 +}