Merge

Mon, 19 May 2014 22:00:46 -0700

author
asaha
date
Mon, 19 May 2014 22:00:46 -0700
changeset 916
b596502e86f5
parent 915
0716f4613601
parent 885
8d7476d004d9
child 917
809d393a6379

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue May 06 11:04:13 2014 -0700
     1.2 +++ b/.hgtags	Mon May 19 22:00:46 2014 -0700
     1.3 @@ -263,4 +263,6 @@
     1.4  7001e9f95b443a75e432205a29974c05b88e0fdc jdk8u11-b05
     1.5  daa414a4d8b712584d0818fab3fd31996e4cb645 jdk8u11-b06
     1.6  d9d482948b7c89161887b47e68e3367663d51b76 jdk8u11-b07
     1.7 +a392513941025e2750acdcc45f9df2ec9080bde9 jdk8u11-b08
     1.8 +dec6999877f39d3c17f7a092d8e2e17b676bb34b jdk8u11-b09
     1.9  7001e9f95b443a75e432205a29974c05b88e0fdc jdk8u25-b00
     2.1 --- a/test/script/basic/JDK-8026161.js	Tue May 06 11:04:13 2014 -0700
     2.2 +++ b/test/script/basic/JDK-8026161.js	Mon May 19 22:00:46 2014 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   * 
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -28,5 +28,5 @@
    2.11   * @run
    2.12   */
    2.13  
    2.14 -print(new java.awt.Color(1, 1, 1)) // creates Color[r=1,g=1,b=1]
    2.15 -print(new java.awt.Color(1.0, 1.0, 1.0)) // Color[r=255,g=255,b=255]
    2.16 +print(Java.type("jdk.nashorn.test.models.IntFloatOverloadSelection").overloadedMethod(1))
    2.17 +print(Java.type("jdk.nashorn.test.models.IntFloatOverloadSelection").overloadedMethod(1.0))
     3.1 --- a/test/script/basic/JDK-8026161.js.EXPECTED	Tue May 06 11:04:13 2014 -0700
     3.2 +++ b/test/script/basic/JDK-8026161.js.EXPECTED	Mon May 19 22:00:46 2014 -0700
     3.3 @@ -1,2 +1,2 @@
     3.4 -java.awt.Color[r=1,g=1,b=1]
     3.5 -java.awt.Color[r=255,g=255,b=255]
     3.6 +int
     3.7 +float
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/test/src/jdk/nashorn/test/models/IntFloatOverloadSelection.java	Mon May 19 22:00:46 2014 -0700
     4.3 @@ -0,0 +1,36 @@
     4.4 +/*
     4.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     4.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.7 + *
     4.8 + * This code is free software; you can redistribute it and/or modify it
     4.9 + * under the terms of the GNU General Public License version 2 only, as
    4.10 + * published by the Free Software Foundation.  Oracle designates this
    4.11 + * particular file as subject to the "Classpath" exception as provided
    4.12 + * by Oracle in the LICENSE file that accompanied this code.
    4.13 + *
    4.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    4.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.17 + * version 2 for more details (a copy is included in the LICENSE file that
    4.18 + * accompanied this code).
    4.19 + *
    4.20 + * You should have received a copy of the GNU General Public License version
    4.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    4.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.23 + *
    4.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.25 + * or visit www.oracle.com if you need additional information or have any
    4.26 + * questions.
    4.27 + */
    4.28 +package jdk.nashorn.test.models;
    4.29 +
    4.30 +public class IntFloatOverloadSelection {
    4.31 +
    4.32 +    public static String overloadedMethod(int i) {
    4.33 +        return "int";
    4.34 +    }
    4.35 +
    4.36 +    public static String overloadedMethod(float f) {
    4.37 +        return "float";
    4.38 +    }
    4.39 +}

mercurial