8014519: scriptpad sample does not work with nashorn

Reviewed-by: attila, jlaskey
Contributed-by: rieberandreas@gmail.com

src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -75,7 +75,7 @@ public class Main {
          */
         InputStream is = Main.class.getResourceAsStream("/resources/" + name);
         // current script file name for better error messages
-        engine.put(ScriptEngine.NAME, name);
+        engine.put(ScriptEngine.FILENAME, name);
         // evaluate the script in the InputStream
         engine.eval(new InputStreamReader(is));
     }

src/share/sample/scripting/scriptpad/src/resources/Main.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * This script can be loaded in jrunscript to start scriptpad.
  *
@@ -48,4 +47,3 @@ load("conc.js");
 load("gui.js");
 load("scriptpad.js");
 load("mm.js");
-

src/share/sample/scripting/scriptpad/src/resources/conc.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * Concurrency utilities for JavaScript. These are based on
  * java.lang and java.util.concurrent API. The following functions
@@ -46,6 +45,35 @@
  * objects exported from here.
  */
 
+// shortcut for j.u.c lock classes
+var Lock = java.util.concurrent.locks.ReentrantLock;
+var RWLock = java.util.concurrent.locks.ReentrantReadWriteLock;
+
+// check if there is a build in sync function, define one if missing
+if (typeof sync === "undefined") {
+    var sync = function(func, obj) {
+        if (arguments.length < 1 || arguments.length > 2 ) {
+            throw "sync(function [,object]) parameter count mismatch";
+        }
+
+        var syncobj = (arguments.length == 2 ? obj : this);
+
+        if (!syncobj._syncLock) {
+            syncobj._syncLock = new Lock();
+        }
+
+        return function() {
+            syncobj._syncLock.lock();
+            try {
+                func.apply(null, arguments);
+            } finally {
+                syncobj._syncLock.unlock();
+            }
+        };
+    };
+    sync.docString = "synchronize a function, optionally on an object";
+}
+
 /**
  * Wrapper for java.lang.Object.wait
  *
@@ -58,7 +86,6 @@ function wait(object) {
 }
 wait.docString = "convenient wrapper for java.lang.Object.wait method";
 
-
 /**
  * Wrapper for java.lang.Object.notify
  *
@@ -71,7 +98,6 @@ function notify(object) {
 }
 notify.docString = "convenient wrapper for java.lang.Object.notify method";
 
-
 /**
  * Wrapper for java.lang.Object.notifyAll
  *
@@ -84,7 +110,6 @@ function notifyAll(object)  {
 }
 notifyAll.docString = "convenient wrapper for java.lang.Object.notifyAll method";
 
-
 /**
  * Creates a java.lang.Runnable from a given script
  * function.
@@ -97,7 +122,7 @@ Function.prototype.runnable = function() {
             func.apply(null, args);
         }
     }
-}
+};
 
 /**
  * Executes the function on a new Java Thread.
@@ -106,7 +131,7 @@ Function.prototype.thread = function() {
     var t = new java.lang.Thread(this.runnable.apply(this, arguments));
     t.start();
     return t;
-}
+};
 
 /**
  * Executes the function on a new Java daemon Thread.
@@ -116,7 +141,7 @@ Function.prototype.daemon = function() {
     t.setDaemon(true);
     t.start();
     return t;
-}
+};
 
 /**
  * Creates a java.util.concurrent.Callable from a given script
@@ -128,7 +153,7 @@ Function.prototype.callable = function() {
     return new java.util.concurrent.Callable() {
           call: function() { return func.apply(null, args); }
     }
-}
+};
 
 /**
  * Registers the script function so that it will be called exit.
@@ -137,7 +162,7 @@ Function.prototype.atexit = function () {
     var args = arguments;
     java.lang.Runtime.getRuntime().addShutdownHook(
          new java.lang.Thread(this.runnable.apply(this, args)));
-}
+};
 
 /**
  * Executes the function asynchronously.
@@ -152,13 +177,9 @@ Function.prototype.future = (function() {
     (function() { theExecutor.shutdown(); }).atexit();
     return function() {
         return theExecutor.submit(this.callable.apply(this, arguments));
-    }
+    };
 })();
 
-// shortcut for j.u.c lock classes
-var Lock = java.util.concurrent.locks.ReentrantLock;
-var RWLock = java.util.concurrent.locks.ReentrantReadWriteLock;
-
 /**
  * Executes a function after acquiring given lock. On return,
  * (normal or exceptional), lock is released.
@@ -179,7 +200,7 @@ Function.prototype.sync = function (lock) {
     } finally {
         lock.unlock();
     }
-}
+};
 
 /**
  * Causes current thread to sleep for specified
@@ -192,6 +213,39 @@ function sleep(interval) {
 }
 sleep.docString = "wrapper for java.lang.Thread.sleep method";
 
+/**
+ * Schedules a task to be executed once in N milliseconds specified.
+ *
+ * @param callback function or expression to evaluate
+ * @param interval in milliseconds to sleep
+ * @return timeout ID (which is nothing but Thread instance)
+ */
+function setTimeout(callback, interval) {
+    if (! (callback instanceof Function) && typeof callback !== "function") {
+        callback = new Function(callback);
+    }
+
+    // start a new thread that sleeps given time
+    // and calls callback in an infinite loop
+    return (function() {
+         try {
+             sleep(interval);
+         } catch (x) { }
+         callback();
+    }).daemon();
+}
+setTimeout.docString = "calls given callback once after specified interval";
+
+/**
+ * Cancels a timeout set earlier.
+ * @param tid timeout ID returned from setTimeout
+ */
+function clearTimeout(tid) {
+    // we just interrupt the timer thread
+    tid.interrupt();
+}
+clearTimeout.docString = "interrupt a setTimeout timer";
+
 /**
  * Schedules a task to be executed once in
  * every N milliseconds specified.
@@ -200,8 +254,8 @@ sleep.docString = "wrapper for java.lang.Thread.sleep method";
  * @param interval in milliseconds to sleep
  * @return timeout ID (which is nothing but Thread instance)
  */
-function setTimeout(callback, interval) {
-    if (! (callback instanceof Function)) {
+function setInterval(callback, interval) {
+    if (! (callback instanceof Function) && typeof callback !== "function") {
         callback = new Function(callback);
     }
 
@@ -209,21 +263,26 @@ function setTimeout(callback, interval) {
     // and calls callback in an infinite loop
     return (function() {
          while (true) {
+             try {
                  sleep(interval);
+             } catch (x) {
+                 break;
+             }
              callback();
          }
     }).daemon();
 }
-setTimeout.docString = "calls given callback once after specified interval"
+setInterval.docString = "calls given callback every specified interval";
 
 /**
  * Cancels a timeout set earlier.
  * @param tid timeout ID returned from setTimeout
  */
-function clearTimeout(tid) {
+function clearInterval(tid) {
     // we just interrupt the timer thread
     tid.interrupt();
 }
+clearInterval.docString = "interrupt a setInterval timer";
 
 /**
  * Simple access to thread local storage.
@@ -240,7 +299,7 @@ function clearTimeout(tid) {
  */
 var __thread = (function () {
     var map = new Object();
-    return new JSAdapter() {
+    return new JSAdapter({
         __has__: function(name) {
             return map[name] != undefined;
         },
@@ -265,6 +324,6 @@ var __thread = (function () {
                 map[name].set(null);
             }
         }
-    }
+    });
 })();
 

src/share/sample/scripting/scriptpad/src/resources/gui.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * Few user interface utilities.
  */
@@ -58,7 +57,7 @@ Function.prototype.invokeLater = function() {
                            func.apply(func, args);
                        }
                   });
-}
+};
 
 /**
  * Swing invokeAndWait - invokes given function in AWT event thread
@@ -73,7 +72,7 @@ Function.prototype.invokeAndWait = function() {
                            func.apply(func, args);
                        }
                   });
-}
+};
 
 /**
  * Am I running in AWT event dispatcher thread?
@@ -97,10 +96,12 @@ function fileDialog(curDir, save) {
         if (curDir == undefined) {
             curDir = new java.io.File(".");
         }
+
         var JFileChooser = javax.swing.JFileChooser;
         var dialog = new JFileChooser(curDir);
-        var res = save? dialog.showSaveDialog(window):
+        var res = save ? dialog.showSaveDialog(window):
             dialog.showOpenDialog(window);
+
         if (res == JFileChooser.APPROVE_OPTION) {
            result = dialog.getSelectedFile();
         } else {
@@ -113,6 +114,7 @@ function fileDialog(curDir, save) {
     } else {
         _fileDialog.invokeAndWait();
     }
+
     return result;
 }
 fileDialog.docString = "show a file dialog box";
@@ -124,19 +126,21 @@ fileDialog.docString = "show a file dialog box";
  * @param color default color [optional]
  * @return choosen color or default color
  */
-
 function colorDialog(title, color) {
     var result;
+
     function _colorDialog() {
         if (title == undefined) {
             title = "Choose Color";
         }
+
         if (color == undefined) {
             color = java.awt.Color.BLACK;
         }
+
         var chooser = new javax.swing.JColorChooser();
         var res = chooser.showDialog(window, title, color);
-        result = res? res : color;
+        result = res ? res : color;
     }
 
     if (isEventThread()) {
@@ -144,6 +148,7 @@ function colorDialog(title, color) {
     } else {
         _colorDialog.invokeAndWait();
     }
+
     return result;
 }
 colorDialog.docString = "shows a color chooser dialog box";
@@ -156,15 +161,15 @@ colorDialog.docString = "shows a color chooser dialog box";
  * @param msgType type of message box [constants in JOptionPane]
  */
 function msgBox(msg, title, msgType) {
-   
     function _msgBox() {
         var JOptionPane = javax.swing.JOptionPane;
         if (msg === undefined) msg = "undefined";
         if (msg === null) msg = "null";
         if (title == undefined) title = msg;
-        if (msgType == undefined) type = JOptionPane.INFORMATION_MESSAGE;
+        if (msgType == undefined) msgType = JOptionPane.INFORMATION_MESSAGE;
         JOptionPane.showMessageDialog(window, msg, title, msgType);
     }
+
     if (isEventThread()) {
         _msgBox();
     } else {
@@ -197,7 +202,6 @@ function error(msg, title) {
 }
 error.docString = "shows an error message box to the user";
 
-
 /**
  * Shows a warning alert box
  *
@@ -210,7 +214,6 @@ function warn(msg, title) {
 }
 warn.docString = "shows a warning message box to the user";
 
-
 /**
  * Shows a prompt dialog box
  *
@@ -225,11 +228,13 @@ function prompt(question, answer) {
         if (answer == undefined) answer = "";
         result = JOptionPane.showInputDialog(window, question, answer);
     }
+
     if (isEventThread()) {
         _prompt();
     } else {
         _prompt.invokeAndWait();
     }
+
     return result;
 }
 prompt.docString = "shows a prompt box to the user and returns the answer";
@@ -244,16 +249,19 @@ prompt.docString = "shows a prompt box to the user and returns the answer";
 function confirm(msg, title) {
     var result;
     var JOptionPane = javax.swing.JOptionPane;
+
     function _confirm() {
         if (title == undefined) title = msg;
         var optionType = JOptionPane.YES_NO_OPTION;
         result = JOptionPane.showConfirmDialog(window, msg, title, optionType);
     }
+
     if (isEventThread()) {
         _confirm();
     } else {
         _confirm.invokeAndWait();
     }
+
     return result == JOptionPane.YES_OPTION;
 }
 confirm.docString = "shows a confirmation message box to the user";

src/share/sample/scripting/scriptpad/src/resources/mm.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * This is a collection of utilities for Monitoring
  * and management API.
@@ -78,7 +77,7 @@ function mbeanConnection() {
 
     return mmConnection;
 }
-mbeanConnection.docString = "returns the current MBeanServer connection"
+mbeanConnection.docString = "returns the current MBeanServer connection";
 
 /**
  * Returns a platform MXBean proxy for given MXBean name and interface class
@@ -102,7 +101,6 @@ function objectName(objName) {
 }
 objectName.docString = "creates JMX ObjectName for a given String";
 
-
 /**
  * Creates a new (M&M) Attribute object
  *
@@ -146,7 +144,6 @@ function queryNames(objName, query) {
 }
 queryNames.docString = "returns QueryNames using given ObjectName and optional query";
 
-
 /**
  * Queries with given ObjectName and QueryExp.
  * QueryExp may be null.
@@ -220,7 +217,6 @@ function getMBeanAttribute(objName, attrName) {
 }
 getMBeanAttribute.docString = "returns a single Attribute of given ObjectName";
 
-
 // sets MBean attributes
 function setMBeanAttributes(objName, attrList) {
     objName = objectName(objName);
@@ -237,7 +233,6 @@ function setMBeanAttribute(objName, attrName, attrValue) {
 }
 setMBeanAttribute.docString = "sets a single Attribute of given ObjectName";
 
-
 // invokes an operation on given MBean
 function invokeMBean(objName, operation, params, signature) {
     objName = objectName(objName);
@@ -260,16 +255,17 @@ invokeMBean.docString = "invokes MBean operation on given ObjectName";
  * will be of type FutureTask. When you need value, call 'get' on it.
  */
 function mbean(objName, async) {
+    var index;
     objName = objectName(objName);
     var info = mbeanInfo(objName);
     var attrs = info.attributes;
     var attrMap = new Object;
-    for (var index in attrs) {
+    for (index in attrs) {
         attrMap[attrs[index].name] = attrs[index];
     }
     var opers = info.operations;
     var operMap = new Object;
-    for (var index in opers) {
+    for (index in opers) {
         operMap[opers[index].name] = opers[index];
     }
 
@@ -307,7 +303,7 @@ function mbean(objName, async) {
                     } else {
                         return invokeMBean(objName, name, params, sigNames);
                     }
-                }
+                };
             } else {
                 return undefined;
             }

src/share/sample/scripting/scriptpad/src/resources/scriptpad.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * This script creates a simple Notepad-like interface, which
  * serves as a simple script editor, runner.
@@ -47,6 +46,11 @@
  *    gui.js -> for basic GUI functions
  */
 
+/*
+ * globalThis is used for actionHelpGlobals() and showFrame().
+ */
+var globalThis = this;
+
 /*
  * JavaImporter helps in avoiding pollution of JavaScript
  * global namespace. We can import multiple Java packages
@@ -57,21 +61,12 @@ var guiPkgs = new JavaImporter(java.awt, java.awt.event,
                                javax.swing, javax.swing.undo,
                                javax.swing.event, javax.swing.text);
 
-with (guiPkgs) {   
-
-     /*
-      * within this "with" statement all Java classes in
-      * packages defined in "guiPkgs" can be used as simple
-      * names instead of the fully qualified names.
-      */
-
-
-     // main entry point of the scriptpad application
-     function main() {
+// main entry point of the scriptpad application
+var main = function() {
     function createEditor() {
-            var c = new JTextArea();
+        var c = new guiPkgs.JTextArea();
         c.setDragEnabled(true);
-            c.setFont(new Font("monospaced", Font.PLAIN, 12));
+        c.setFont(new guiPkgs.Font("monospaced", guiPkgs.Font.PLAIN, 12));
         return c;
     }
 
@@ -100,8 +95,7 @@ with (guiPkgs) {
                 return;
             }
 
-                if (confirm(
-                    "Do you want to save the changes?",
+            if (confirm("Do you want to save the changes?",
                         "The document has changed")) {
                 actionSave();
             }
@@ -113,12 +107,17 @@ with (guiPkgs) {
     function setDocListener() {
         var doc = editor.getDocument();
         docChanged = false;
-            doc.addDocumentListener(new DocumentListener() {
-                    equals: function(o) { return this === o; },
-                    toString: function() { return "doc listener"; },
-                    changeUpdate: function() { docChanged = true; },
-                    insertUpdate: function() { docChanged = true; },
-                    removeUpdate: function() { docChanged = true; },
+        doc.addDocumentListener( new guiPkgs.DocumentListener() {
+                                     equals: function(o) {
+                                         return this === o; },
+                                     toString: function() {
+                                         return "doc listener"; },
+                                     changeUpdate: function() {
+                                         docChanged = true; },
+                                     insertUpdate: function() {
+                                         docChanged = true; },
+                                     removeUpdate: function() {
+                                         docChanged = true; }
                                  });
     }
 
@@ -127,10 +126,10 @@ with (guiPkgs) {
     // "File" menu
 
     // create a "new" document
-        function actionNew(){
+    function actionNew() {
         checkDocChanged();
         curFileName = null;
-            editor.setDocument(new PlainDocument());
+        editor.setDocument(new guiPkgs.PlainDocument());
         setDocListener();
         frame.setTitle(defaultTitle);
         editor.revalidate();
@@ -143,10 +142,11 @@ with (guiPkgs) {
         if (f == null) {
             return;
         }
+
         if (f.isFile() && f.canRead()) {
             frame.setTitle(f.getName() + titleSuffix);
-                editor.setDocument(new PlainDocument());
-                var progress = new JProgressBar();
+            editor.setDocument(new guiPkgs.PlainDocument());
+            var progress = new guiPkgs.JProgressBar();
             progress.setMinimum(0);
             progress.setMaximum(f.length());
             var doc = editor.getDocument();
@@ -178,9 +178,9 @@ with (guiPkgs) {
 
         try {
             var u = new java.net.URL(url);
-                editor.setDocument(new PlainDocument());
+            editor.setDocument(new guiPkgs.PlainDocument());
             frame.setTitle(url + titleSuffix);
-                var progress = new JProgressBar();
+            var progress = new guiPkgs.JProgressBar();
             progress.setMinimum(0);
             progress.setIndeterminate(true);
             var doc = editor.getDocument();
@@ -207,22 +207,25 @@ with (guiPkgs) {
         var doc = editor.getDocument();
         frame.setTitle(file.getName() + titleSuffix);
         curFileName = file;
-            var progress = new JProgressBar();
+        var progress = new guiPkgs.JProgressBar();
         progress.setMinimum(0);
         progress.setMaximum(file.length());
         var out = new java.io.FileWriter(file);
-            var text = new Segment();
+        var text = new guiPkgs.Segment();
         text.setPartialReturn(true);
         var charsLeft = doc.getLength();
         var offset = 0;
+        var min;
+
         while (charsLeft > 0) {
-                doc.getText(offset, java.lang.Math.min(4096, charsLeft), text);
+            doc.getText(offset, Math.min(4096, charsLeft), text);
             out.write(text.array, text.offset, text.count);
             charsLeft -= text.count;
             offset += text.count;
             progress.setValue(offset);
             java.lang.Thread.sleep(10);
         }
+
         out.flush();
         out.close();
         docChanged = false;
@@ -282,15 +285,15 @@ with (guiPkgs) {
         var script = doc.getText(0, doc.getLength());
         var oldFile = engine.get(javax.script.ScriptEngine.FILENAME);
         try {
-                if (this.engine == undefined) {
+            if (engine == undefined) {
                 var m = new javax.script.ScriptEngineManager();
-                    engine = m.getEngineByName("js");
+                engine = m.getEngineByName("nashorn");
             }
             engine.put(javax.script.ScriptEngine.FILENAME, frame.title);
             engine.eval(script, context);
         } catch (e) {
             error(e, "Script Error");
-                // e.rhinoException.printStackTrace();
+            e.printStackTrace();
         } finally {
             engine.put(javax.script.ScriptEngine.FILENAME, oldFile);
         }
@@ -308,7 +311,7 @@ with (guiPkgs) {
 
     // "hello world"
     function actionHello() {
-            showScript(arguments.callee.title,
+        showScript(actionEval.title,
                    "alert('Hello, world');");
     }
     actionHello.title = "Hello, World";
@@ -364,9 +367,9 @@ with (guiPkgs) {
                    "            }\n" +
                    "    };\n" +
                    "// use the above Runnable to create a Thread\n" +
-                "java.lang.Thread(r).start();\n" +
+                   "new java.lang.Thread(r).start();\n" +
                    "// For simple one method interfaces, just pass script function\n" +
-                "java.lang.Thread(function() { alert('world'); }).start();");
+                   "new java.lang.Thread(function() { alert('world'); }).start();");
     }
     actionJavaInterface.title = "Java Interfaces";
 
@@ -393,8 +396,8 @@ with (guiPkgs) {
      */
     function actionHelpGlobals() {
         var names = new java.util.ArrayList();
-            for (var i in this) {
-                var func = this[i];
+        for (var i in globalThis) {
+            var func = globalThis[i];
             if (typeof(func) == "function" &&
                 ("docString" in func)) {
                 names.add(i);
@@ -409,23 +412,23 @@ with (guiPkgs) {
             helpDoc.append("<tr><td>");
             helpDoc.append(name);
             helpDoc.append("</td><td>");
-                helpDoc.append(this[name].docString);
+            helpDoc.append(globalThis[name].docString);
             helpDoc.append("</td></tr>");
         }
         helpDoc.append("</table>");
 
-            var helpEditor = new JEditorPane();
+        var helpEditor = new guiPkgs.JEditorPane();
         helpEditor.setContentType("text/html");
         helpEditor.setEditable(false);
         helpEditor.setText(helpDoc.toString());
 
-            var scroller = new JScrollPane();
+        var scroller = new guiPkgs.JScrollPane();
         var port = scroller.getViewport();
         port.add(helpEditor);
 
-            var helpFrame = new JFrame("Help - Global Functions");
+        var helpFrame = new guiPkgs.JFrame("Help - Global Functions");
         helpFrame.getContentPane().add("Center", scroller);
-            helpFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        helpFrame.setDefaultCloseOperation(guiPkgs.WindowConstants.DISPOSE_ON_CLOSE);
         helpFrame.pack();
         helpFrame.setSize(500, 600);
         helpFrame.setVisible(true);
@@ -433,7 +436,7 @@ with (guiPkgs) {
 
     // show a simple about message for scriptpad
     function actionAbout() {
-            alert("Scriptpad\nVersion 1.0", "Scriptpad");
+        alert("Scriptpad\nVersion 1.1", "Scriptpad");
     }
 
     /*
@@ -447,31 +450,31 @@ with (guiPkgs) {
         {
             menu: "File",
             items: [
-                  { name: "New",  action: actionNew , accel: KeyEvent.VK_N },
-                  { name: "Open...", action: actionOpen, accel: KeyEvent.VK_O },                         
-                  { name: "Open URL...", action: actionOpenURL, accel: KeyEvent.VK_U },
-                  { name: "Save", action: actionSave, accel: KeyEvent.VK_S },
+                { name: "New",  action: actionNew , accel: guiPkgs.KeyEvent.VK_N },
+                { name: "Open...", action: actionOpen, accel: guiPkgs.KeyEvent.VK_O },
+                { name: "Open URL...", action: actionOpenURL, accel: guiPkgs.KeyEvent.VK_U },
+                { name: "Save", action: actionSave, accel: guiPkgs.KeyEvent.VK_S },
                 { name: "Save As...", action: actionSaveAs },
                 { name: "-" },
-                  { name: "Exit", action: actionExit }
+                { name: "Exit", action: actionExit, accel: guiPkgs.KeyEvent.VK_Q }
             ]
         },
 
         {
             menu: "Edit",
             items: [
-                  { name: "Cut", action: actionCut, accel: KeyEvent.VK_X },
-                  { name: "Copy", action: actionCopy, accel: KeyEvent.VK_C },                        
-                  { name: "Paste", action: actionPaste, accel: KeyEvent.VK_V },
+                { name: "Cut", action: actionCut, accel: guiPkgs.KeyEvent.VK_X },
+                { name: "Copy", action: actionCopy, accel: guiPkgs.KeyEvent.VK_C },
+                { name: "Paste", action: actionPaste, accel: guiPkgs.KeyEvent.VK_V },
                 { name: "-" },
-                  { name: "Select All", action: actionSelectAll, accel: KeyEvent.VK_A }
+                { name: "Select All", action: actionSelectAll, accel: guiPkgs.KeyEvent.VK_A }
             ]
         },
 
         {
             menu: "Tools",
             items: [
-                  { name: "Run", action: actionRun, accel: KeyEvent.VK_R },
+                { name: "Run", action: actionRun, accel: guiPkgs.KeyEvent.VK_R }
             ]
         },
 
@@ -484,7 +487,7 @@ with (guiPkgs) {
                 { name: actionJavaAccess.title, action: actionJavaAccess },
                 { name: actionJavaBean.title, action: actionJavaBean },
                 { name: actionJavaInterface.title, action: actionJavaInterface },
-                  { name: actionJavaImport.title, action: actionJavaImport },
+                { name: actionJavaImport.title, action: actionJavaImport }
             ]
         },
 
@@ -493,29 +496,29 @@ with (guiPkgs) {
             items: [
                 { name: "Global Functions", action: actionHelpGlobals },
                 { name: "-" },
-                  { name: "About Scriptpad", action: actionAbout },
+                { name: "About Scriptpad", action: actionAbout }
             ]
         }
     ];
 
-
     function setMenuAccelerator(mi, accel) {
-            var keyStroke = KeyStroke.getKeyStroke(accel,
-                Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
+        var keyStroke = guiPkgs.KeyStroke.getKeyStroke(accel,
+                                                       guiPkgs.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false);
         mi.setAccelerator(keyStroke);
     }
 
     // create a menubar using the above menu data
     function createMenubar() {
-            var mb = new JMenuBar();
+        var mb = new guiPkgs.JMenuBar();
         for (var m in menuData) {
             var items = menuData[m].items;
-                var menu = new JMenu(menuData[m].menu);                
+            var menu = new guiPkgs.JMenu(menuData[m].menu);
+
             for (var i in items) {
                 if (items[i].name.equals("-")) {
                     menu.addSeparator();
                 } else {
-                        var mi = new JMenuItem(items[i].name);
+                    var mi = new guiPkgs.JMenuItem(items[i].name);
                     var action = items[i].action;
                     mi.addActionListener(action);
                     var accel = items[i].accel;
@@ -525,8 +528,10 @@ with (guiPkgs) {
                     menu.add(mi);
                 }
 	        }
+
 	        mb.add(menu);
         }
+
         return mb;
     }
 
@@ -548,7 +553,7 @@ with (guiPkgs) {
             return;
         }
         var toolsMenu = frame.getJMenuBar().getMenu(toolsIndex);
-            var mi = new JMenuItem(menuItem);
+        var mi = new guiPkgs.JMenuItem(menuItem);
         mi.addActionListener(action);
         if (accel) {
             setMenuAccelerator(mi, accel);
@@ -556,28 +561,27 @@ with (guiPkgs) {
         toolsMenu.add(mi);
     }
 
-
     // create Scriptpad frame
     function createFrame() {
-            frame = new JFrame();
+        frame = new guiPkgs.JFrame();
         frame.setTitle(defaultTitle);
-            frame.setBackground(Color.lightGray);
-            frame.getContentPane().setLayout(new BorderLayout());
+        frame.setBackground(guiPkgs.Color.lightGray);
+        frame.getContentPane().setLayout(new guiPkgs.BorderLayout());
 
         // create notepad panel
-            var notepad = new JPanel();
-            notepad.setBorder(BorderFactory.createEtchedBorder());
-            notepad.setLayout(new BorderLayout());
+        var notepad = new guiPkgs.JPanel();
+        notepad.setBorder(guiPkgs.BorderFactory.createEtchedBorder());
+        notepad.setLayout(new guiPkgs.BorderLayout());
 
         // create editor
         editor = createEditor();
-            var scroller = new JScrollPane();
+        var scroller = new guiPkgs.JScrollPane();
         var port = scroller.getViewport();
         port.add(editor);
 
         // add editor to notepad panel
-            var panel = new JPanel(); 
-            panel.setLayout(new BorderLayout());        
+        var panel = new guiPkgs.JPanel();
+        panel.setLayout(new guiPkgs.BorderLayout());
         panel.add("Center", scroller);
         notepad.add("Center", panel);
 
@@ -586,7 +590,7 @@ with (guiPkgs) {
 
         // set menu bar to frame and show the frame
         frame.setJMenuBar(createMenubar());
-            frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setDefaultCloseOperation(guiPkgs.JFrame.EXIT_ON_CLOSE);
         frame.pack();
         frame.setSize(500, 600);
     }
@@ -594,7 +598,7 @@ with (guiPkgs) {
     // show Scriptpad frame
     function showFrame() {
         // set global variable by the name "window"
-            this.window = frame;     
+        globalThis.window = frame;
 
         // open new document
         actionNew();
@@ -616,8 +620,7 @@ with (guiPkgs) {
         editor: editor,
         addTool: addTool
     };
-    }
-}
+};
 
 /*
  * Call the main and store Application object
@@ -657,4 +660,3 @@ function loadUserInit() {
 }
 
 loadUserInit();
-

src/share/sample/scripting/scriptpad/src/scripts/browse.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,26 +37,24 @@
  * this sample code.
  */
 
-
 /*
  * This function uses new Swing Desktop API in JDK 6.
  * To use this with scriptpad, open this in scriptpad
  * and use "Tools->Run Script" menu.
  */
 function browse() {
-    with (guiPkgs) {
     var desktop = null;
     // Before more Desktop API is used, first check
     // whether the API is supported by this particular
     // virtual machine (VM) on this particular host.
-        if (Desktop.isDesktopSupported()) {
-            desktop = Desktop.getDesktop();
+    if (java.awt.Desktop.isDesktopSupported()) {
+        desktop = java.awt.Desktop.getDesktop();
     } else {
         alert("no desktop support");
         return;
     }
 
-        if (desktop.isSupported(Desktop.Action.BROWSE)) {
+    if (desktop.isSupported(java.awt.Desktop.Action.BROWSE)) {
         var url = prompt("Address:");
         if (url != null) {
             desktop.browse(new java.net.URI(url));
@@ -64,11 +62,9 @@ function browse() {
     } else {
         alert("no browser support");
     }
-    }
 }
 
 if (this.application != undefined) {
     // add "Browse" menu item under "Tools" menu
     this.application.addTool("Browse", browse);
 }
-

src/share/sample/scripting/scriptpad/src/scripts/insertfile.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * This script adds "Insert File" mode menu item to "Tools" menu.
  * When selected, this menu shows a file dialog box and inserts
@@ -48,18 +47,22 @@ if (this.application) {
     application.addTool("Insert File...",
         function() {
             var file = fileDialog();
+
             if (file) {
                 var reader = new java.io.FileReader(file);
                 var arr = java.lang.reflect.Array.newInstance(
                       java.lang.Character.TYPE, 8*1024); // 8K at a time
                 var buf = new java.lang.StringBuffer();
                 var numChars;
+
                 while ((numChars = reader.read(arr, 0, arr.length)) > 0) {
                     buf.append(arr, 0, numChars);
                 }
+
                 var pos = application.editor.caretPosition;
                 var doc = application.editor.document;
+
                 doc.insertString(pos, buf.toString(), null);
            }
-        })
+        });
 }

src/share/sample/scripting/scriptpad/src/scripts/linewrap.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,19 +37,15 @@
  * this sample code.
  */
 
-
 /*
  * This script adds "Line Wrap" mode menu item to "Tools" menu.
  * When selected, this menu toggles the current word wrap mode
  * of the editor.
  */
-with (guiPkgs) {
 
-    function toggleLineWrap() {
+function toggleLineWrap() {
     var wrap = application.editor.lineWrap;
     application.editor.lineWrap = !wrap;
-    }
-
-    application.addTool("Line Wrap",  toggleLineWrap);
 }
 
+application.addTool("Line Wrap",  toggleLineWrap);

src/share/sample/scripting/scriptpad/src/scripts/mail.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,32 +37,29 @@
  * this sample code.
  */
 
-
 /*
  * This function uses new Swing Desktop API in JDK 6.
  * To use this with scriptpad, open this in scriptpad
  * and use "Tools->Run Script" menu.
  */
 function mail() {
-    with (guiPkgs) {
     var desktop = null;
     // Before more Desktop API is used, first check
     // whether the API is supported by this particular
     // virtual machine (VM) on this particular host.
-        if (Desktop.isDesktopSupported()) {
-            desktop = Desktop.getDesktop();
+    if (java.awt.Desktop.isDesktopSupported()) {
+        desktop = java.awt.Desktop.getDesktop();
     } else {
         alert("no desktop support");
         return;
     }
 
-        if (desktop.isSupported(Desktop.Action.MAIL)) {
+    if (desktop.isSupported(java.awt.Desktop.Action.MAIL)) {
         var mailTo = prompt("Mail To:");
         if (mailTo != null) {
             desktop.mail(new java.net.URI("mailto", mailTo, null));
         }
     }
-    }
 }
 
 if (this.application != undefined) {

src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,29 +37,31 @@
  * this sample code.
  */
 
-
 // this checker function runs asynchronously
 function memoryChecker(memoryBean, threshold, interval) {
     while (true) {
         var memUsage = memoryBean.HeapMemoryUsage;
         var usage = memUsage.get("used") / (1024 * 1024);
-        println(usage);
+
+        println("usage: " + usage);
+
         if (usage > threshold) {
             alert("Hey! heap usage threshold exceeded!");
             // after first alert just return.
             return;
         }
-        java.lang.Thread.currentThread().sleep(interval);
+
+        java.lang.Thread.sleep(interval);
     }
 }
 
-
 // add "Tools->Memory Monitor" menu item
 if (this.application != undefined) {
     this.application.addTool("Memory Monitor",
         function () {
             // show threshold box with default of 50 MB
             var threshold = prompt("Threshold (mb)", 50);
+
             // show interval box with default of 1000 millisec.
             var interval = prompt("Sample Interval (ms):", 1000);
             var memoryBean = mbean("java.lang:type=Memory");
@@ -69,4 +71,3 @@ if (this.application != undefined) {
             memoryChecker.future(memoryBean, threshold, interval);
         });
 }
-

src/share/sample/scripting/scriptpad/src/scripts/memory.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * This script serves as a simple "monitored application".
  * Start this script using memory.bat or memory.sh in the
@@ -45,12 +44,11 @@
  */
 
 java.lang.System.out.print("Enter a number and press enter:");
-java.lang.System["in"].read();        
+var input = java.lang.System["in"].read();
 
 // allocate an integer array of "big enough" size!
 var a = java.lang.reflect.Array.newInstance(
-            java.lang.Integer.TYPE, 1024*1024);  
-
-// loop forever!
-while (true);
+    java.lang.Integer.TYPE, input * 1024 * 1024);
 
+// sleep some time...
+java.lang.Thread.sleep(10*60*1000);

src/share/sample/scripting/scriptpad/src/scripts/memory.sh

@@ -30,7 +30,3 @@
 #
 
 jrunscript -J-Dcom.sun.management.jmxremote.port=1090 -J-Dcom.sun.management.jmxremote.ssl=false -J-Dcom.sun.management.jmxremote.authenticate=false memory.js
-
-
-
-

src/share/sample/scripting/scriptpad/src/scripts/textcolor.js

 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
  * this sample code.
  */
 
-
 /*
  * This script adds "Selected Text Color" menu item to "Tools" menu.
  * When selected, this menu changes the "selected text" color.