Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build.xml	Fri May 15 16:36:25 2015 +0200
     1.2 +++ b/make/build.xml	Tue Dec 16 14:06:32 2014 +0530
     1.3 @@ -210,7 +210,7 @@
     1.4    </target>
     1.5  
     1.6    <target name="javadoc" depends="jar">
     1.7 -    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" 
     1.8 +    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html" 
     1.9          extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
    1.10          additionalparam="-quiet" failonerror="true">
    1.11        <classpath>

     2.1 --- a/samples/browser_dom.js	Fri May 15 16:36:25 2015 +0200
     2.2 +++ b/samples/browser_dom.js	Tue Dec 16 14:06:32 2014 +0530
     2.3 @@ -40,7 +40,6 @@
     2.4  var ChangeListener = Java.type("javafx.beans.value.ChangeListener");
     2.5  var Scene     = Java.type("javafx.scene.Scene");
     2.6  var WebView   = Java.type("javafx.scene.web.WebView");
     2.7 -var EventListener = Java.type("org.w3c.dom.events.EventListener");
     2.8  
     2.9  // JavaFX start method
    2.10  function start(stage) {

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/samples/time_color.fx	Tue Dec 16 14:06:32 2014 +0530
     3.3 @@ -0,0 +1,89 @@
     3.4 +#// Usage: jjs -fx time_color.js [-- true/false]
     3.5 +
     3.6 +/*
     3.7 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     3.8 + *
     3.9 + * Redistribution and use in source and binary forms, with or without
    3.10 + * modification, are permitted provided that the following conditions
    3.11 + * are met:
    3.12 + *
    3.13 + *   - Redistributions of source code must retain the above copyright
    3.14 + *     notice, this list of conditions and the following disclaimer.
    3.15 + *
    3.16 + *   - Redistributions in binary form must reproduce the above copyright
    3.17 + *     notice, this list of conditions and the following disclaimer in the
    3.18 + *     documentation and/or other materials provided with the distribution.
    3.19 + *
    3.20 + *   - Neither the name of Oracle nor the names of its
    3.21 + *     contributors may be used to endorse or promote products derived
    3.22 + *     from this software without specific prior written permission.
    3.23 + *
    3.24 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
    3.25 + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    3.26 + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    3.27 + * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
    3.28 + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
    3.29 + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
    3.30 + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
    3.31 + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
    3.32 + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    3.33 + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    3.34 + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3.35 + */
    3.36 +
    3.37 +// A simple javafx program that changes background color
    3.38 +// of scene based on current time value (once per sec).
    3.39 +// inspired by http://whatcolourisit.scn9a.org/
    3.40 +
    3.41 +if (!$OPTIONS._fx) {
    3.42 +    print("Usage: jjs -fx time_color.js");
    3.43 +    print("       jjs -fx time_color.js -- true");
    3.44 +    exit(1);
    3.45 +}
    3.46 +
    3.47 +// JavaFX classes used
    3.48 +var Color = Java.type("javafx.scene.paint.Color");
    3.49 +var Group = Java.type("javafx.scene.Group");
    3.50 +var Label = Java.type("javafx.scene.control.Label");
    3.51 +var Platform = Java.type("javafx.application.Platform");
    3.52 +var Scene = Java.type("javafx.scene.Scene");
    3.53 +var Timer = Java.type("java.util.Timer");
    3.54 +
    3.55 +// execute function periodically once per given time in millisec
    3.56 +function setInterval(func, ms) {
    3.57 +    // New timer, run as daemon so the application can quit
    3.58 +    var timer = new Timer("setInterval", true);
    3.59 +    timer.schedule(function() Platform.runLater(func), ms, ms);	
    3.60 +    return timer;
    3.61 +}
    3.62 +
    3.63 +// do you want to flip hour/min/sec for RGB?
    3.64 +var flip = arguments.length > 0? "true".equals(arguments[0]) : false;
    3.65 +
    3.66 +// JavaFX start method
    3.67 +function start(stage) {
    3.68 +    start.title = "Time Color";
    3.69 +    var root = new Group();
    3.70 +    var label = new Label("time");
    3.71 +    label.textFill = Color.WHITE;
    3.72 +    root.children.add(label); 
    3.73 +    stage.scene = new Scene(root, 700, 500);
    3.74 +
    3.75 +    setInterval(function() {
    3.76 +        var d = new Date();
    3.77 +        var hours = d.getHours();
    3.78 +	var mins = d.getMinutes();
    3.79 +	var secs = d.getSeconds();
    3.80 +
    3.81 +        if (hours < 10) hours = "0" + hours;
    3.82 +        if (mins < 10) mins = "0" + mins;
    3.83 +        if (secs < 10) secs = "0" + secs;
    3.84 +
    3.85 +	var hex = flip?
    3.86 +            "#" + secs + mins + hours : "#" + hours + mins + secs;
    3.87 +        label.text = "Color: " + hex;
    3.88 +        stage.scene.fill = Color.web(hex);
    3.89 +    }, 1000);
    3.90 +
    3.91 +    stage.show();
    3.92 +}

     4.1 --- a/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java	Fri May 15 16:36:25 2015 +0200
     4.2 +++ b/src/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java	Tue Dec 16 14:06:32 2014 +0530
     4.3 @@ -61,7 +61,7 @@
     4.4  import jdk.nashorn.internal.runtime.options.Options;
     4.5  
     4.6  /**
     4.7 - * Static utility that encapsulates persistence of type information for functions compiled with optimistic
     4.8 + * <p>Static utility that encapsulates persistence of type information for functions compiled with optimistic
     4.9   * typing. With this feature enabled, when a JavaScript function is recompiled because it gets deoptimized,
    4.10   * the type information for deoptimization is stored in a cache file. If the same function is compiled in a
    4.11   * subsequent JVM invocation, the type information is used for initial compilation, thus allowing the system
    4.12 @@ -77,6 +77,7 @@
    4.13   * {@code nashorn.typeInfo.cleanupDelaySeconds} system property. You can also specify the word
    4.14   * {@code unlimited} as the value for {@code nashorn.typeInfo.maxFiles} in which case the type info cache is
    4.15   * allowed to grow without limits.
    4.16 + * </p>
    4.17   */
    4.18  public final class OptimisticTypesPersistence {
    4.19      // Default is 0, for disabling the feature when not specified. A reasonable default when enabled is

     5.1 --- a/src/jdk/nashorn/internal/runtime/CodeInstaller.java	Fri May 15 16:36:25 2015 +0200
     5.2 +++ b/src/jdk/nashorn/internal/runtime/CodeInstaller.java	Tue Dec 16 14:06:32 2014 +0530
     5.3 @@ -86,7 +86,7 @@
     5.4       * @param source the script source
     5.5       * @param mainClassName the main class name
     5.6       * @param classBytes map of class names to class bytes
     5.7 -     * @param initializers compilation id -> FunctionInitializer map
     5.8 +     * @param initializers compilation id -> FunctionInitializer map
     5.9       * @param constants constants array
    5.10       * @param compilationId compilation id
    5.11       */

     6.1 --- a/src/jdk/nashorn/internal/runtime/JSType.java	Fri May 15 16:36:25 2015 +0200
     6.2 +++ b/src/jdk/nashorn/internal/runtime/JSType.java	Tue Dec 16 14:06:32 2014 +0530
     6.3 @@ -181,10 +181,10 @@
     6.4      /** Div exact wrapper for potentially integer division that turns into float point */
     6.5      public static final Call DIV_EXACT_LONG       = staticCall(JSTYPE_LOOKUP, JSType.class, "divExact", long.class, long.class, long.class, int.class);
     6.6  
     6.7 -    /** Div zero wrapper for long division that handles (0/0) >>> 0 == 0 */
     6.8 +    /** Div zero wrapper for long division that handles (0/0) >>> 0 == 0 */
     6.9      public static final Call DIV_ZERO_LONG        = staticCall(JSTYPE_LOOKUP, JSType.class, "divZero", long.class, long.class, long.class);
    6.10  
    6.11 -    /** Mod zero wrapper for long division that handles (0%0) >>> 0 == 0 */
    6.12 +    /** Mod zero wrapper for long division that handles (0%0) >>> 0 == 0 */
    6.13      public static final Call REM_ZERO_LONG       = staticCall(JSTYPE_LOOKUP, JSType.class, "remZero", long.class, long.class, long.class);
    6.14  
    6.15      /** Mod exact wrapper for potentially integer remainders that turns into float point */

     7.1 --- a/src/jdk/nashorn/internal/runtime/StoredScript.java	Fri May 15 16:36:25 2015 +0200
     7.2 +++ b/src/jdk/nashorn/internal/runtime/StoredScript.java	Tue Dec 16 14:06:32 2014 +0530
     7.3 @@ -58,7 +58,7 @@
     7.4       * @param compilationId compilation id
     7.5       * @param mainClassName main class name
     7.6       * @param classBytes map of class names to class bytes
     7.7 -     * @param initializers initializer map, id -> FunctionInitializer
     7.8 +     * @param initializers initializer map, id -> FunctionInitializer
     7.9       * @param constants constants array
    7.10       */
    7.11      public StoredScript(final int compilationId, final String mainClassName, final Map<String, byte[]> classBytes, final Map<Integer, FunctionInitializer> initializers, final Object[] constants) {

     8.1 --- a/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java	Fri May 15 16:36:25 2015 +0200
     8.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java	Tue Dec 16 14:06:32 2014 +0530
     8.3 @@ -276,7 +276,7 @@
     8.4      /**
     8.5       * Align an array size up to the nearest array chunk size
     8.6       * @param size size required
     8.7 -     * @return size given, always >= size
     8.8 +     * @return size given, always >= size
     8.9       */
    8.10      protected final static int alignUp(final int size) {
    8.11          return size + CHUNK_SIZE - 1 & ~(CHUNK_SIZE - 1);