Revision: 1983
http://svn.sourceforge.net/vexi/?rev=1983&view=rev
Author: mkpg2
Date: 2007-07-12 08:46:01 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
Forward porting from Vexi2
- putting null to an obj property removes key
- xmlrpc returned from servers have type "remote"
- refactoring of xml unit tests
- browser Launching
Modified Paths:
--------------
core/trunk/org.ibex.js/src/org/ibex/js/Constants.java
core/trunk/org.ibex.js/src/org/ibex/js/JS.jpp
core/trunk/org.ibex.js/src/org/ibex/js/XMLRPC.jpp
core/trunk/org.ibex.js/src_dev/org/ibex/js/DevUtil.java
core/trunk/org.ibex.js/src_dev/org/ibex/js/RunJS.java
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/TestXmlRpc.java
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/emptyline.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/lib.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_object.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector2.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/no_handler.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/simple.js
core/trunk/org.ibex.util/src/org/ibex/util/Basket.java
core/trunk/org.vexi.core/src/org/vexi/plat/Platform.java
Added Paths:
-----------
core/trunk/org.ibex.js/src_junit/test/js/exec/general/remove.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/ioException.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException.js
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException2.js
core/trunk/org.ibex.util/src/org/ibex/util/EjAlbertBrowserLauncher.java
Modified: core/trunk/org.ibex.js/src/org/ibex/js/Constants.java
===================================================================
--- core/trunk/org.ibex.js/src/org/ibex/js/Constants.java 2007-07-12
14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src/org/ibex/js/Constants.java 2007-07-12
15:46:01 UTC (rev 1983)
@@ -22,6 +22,7 @@
static final JS SC_next = JSU.S("next",true);
static final JS SC_number = JSU.S("number",true);
static final JS SC_object = JSU.S("object",true);
+ static final JS SC_remote = JSU.S("remote",true);
static final JS SC_Progress = JSU.S("Progress",true);
static final JS SC_some = JSU.S("some",true);
static final JS SC_string = JSU.S("string",true);
Modified: core/trunk/org.ibex.js/src/org/ibex/js/JS.jpp
===================================================================
--- core/trunk/org.ibex.js/src/org/ibex/js/JS.jpp 2007-07-12 14:57:32 UTC
(rev 1982)
+++ core/trunk/org.ibex.js/src/org/ibex/js/JS.jpp 2007-07-12 15:46:01 UTC
(rev 1983)
@@ -212,7 +212,7 @@
}
protected JS remove(JS key) throws JSExn {
JS r = Obj.this.get(key);
- Obj.super.remove(key);
+ Obj.super.remove(key,0);
return r;
}
protected JS size() throws JSExn {return
JSU.N(JS.Obj.this.size());}
@@ -239,7 +239,10 @@
throw new JSExn(method==null ? "cannot call a " +
getClass().getName() : "method not found: " + JSU.toString(method)); }
*/
- public void put(JS key, JS val) throws JSExn { super.put(key, val, 0);
}
+ public void put(JS key, JS val) throws JSExn {
+ if(val==null){ super.remove(key, 0); return;}
+ super.put(key, val, 0);
+ }
public JS getAndTriggerTraps(JS key) throws JSExn {
Trap t = (Trap)super.get(key, 1);
Modified: core/trunk/org.ibex.js/src/org/ibex/js/XMLRPC.jpp
===================================================================
--- core/trunk/org.ibex.js/src/org/ibex/js/XMLRPC.jpp 2007-07-12 14:57:32 UTC
(rev 1982)
+++ core/trunk/org.ibex.js/src/org/ibex/js/XMLRPC.jpp 2007-07-12 15:46:01 UTC
(rev 1983)
@@ -356,7 +356,7 @@
try {
new Helper().parse(br);
if (fault)
- return new
JSExn(((JS)objects.get(0)).get(SC_faultString),SC_xmlrpc);
+ return new
JSExn(((JS)objects.get(0)).get(SC_faultString),SC_remote);
final JS result = (objects.size() == 0 ? (JS)null :
((JS)objects.get(0)));
return result;
Modified: core/trunk/org.ibex.js/src_dev/org/ibex/js/DevUtil.java
===================================================================
--- core/trunk/org.ibex.js/src_dev/org/ibex/js/DevUtil.java 2007-07-12
14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_dev/org/ibex/js/DevUtil.java 2007-07-12
15:46:01 UTC (rev 1983)
@@ -8,6 +8,7 @@
import org.ibex.js.Interpreter.CallMarker;
import org.ibex.js.Interpreter.JSArgs;
import org.ibex.js.Parser.ScopeInfo;
+import org.ibex.util.Log;
/**
*
@@ -30,6 +31,15 @@
static public String dump(JS f){
return ((JSFunction)f).dump();
}
+
+ public static void logJSExn(String message){
+ try{
+ throw new JSExn(message);
+ }catch(JSExn e){
+ Log.warn("!", e);
+ }
+ }
+
// Stuff in Interpreter not visible (wait for bc optimisation before not
// using private
/* static public void printStack(Interpreter I, int n) throws JSExn{
Modified: core/trunk/org.ibex.js/src_dev/org/ibex/js/RunJS.java
===================================================================
--- core/trunk/org.ibex.js/src_dev/org/ibex/js/RunJS.java 2007-07-12
14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_dev/org/ibex/js/RunJS.java 2007-07-12
15:46:01 UTC (rev 1983)
@@ -321,6 +321,7 @@
if("math".equals(key)) return vexiMath;
if("string".equals(key)) return
vexiString;
if("proxy".equals(key)) return new
JSProxy();
+ if("xmlrpc".equals(key)) return METHOD;
/*
if("bgget".equals(key)) {
action = "bgget";
@@ -393,7 +394,9 @@
JSU.schedule(callback, null);
}}.start();
}
-
+ if( "xmlrpc".equals(methName)){
+ return new XMLRPC(JSU.toString(args[0]), "");
+ }
return null;
}
}
Added: core/trunk/org.ibex.js/src_junit/test/js/exec/general/remove.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/general/remove.js
(rev 0)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/general/remove.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -0,0 +1,6 @@
+//////
+var x = {a:"1",b:"2",c:"3"};
+var keys = keysof(x);
+x.a = null;
+assert(keys.size==2);
+assert(x.a==null);
Modified:
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/TestXmlRpc.java
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/TestXmlRpc.java
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/TestXmlRpc.java
2007-07-12 15:46:01 UTC (rev 1983)
@@ -40,7 +40,7 @@
Object r =
xmlrpc.execute("testServer.stringWithEmptyline", params);
System.out.println(r);*/
- RunJS.runJSFile(new String[]{resourceDir},
"emptyline.js", new String[]{"testXmlrpc"}, new JS[]{new
TestXmlRpcJSInterface()});
+ RunJS.runJSFile(new String[]{resourceDir},
"serverException.js");
}finally{
testwebserver.shutdown();
}
@@ -57,6 +57,7 @@
// Use the same webserver for all the tests
testwebserver = new WebServer(8091);
testwebserver.start();
+ testServer.start();
super.run(result);
testwebserver.shutdown();
}
@@ -75,60 +76,17 @@
}
protected void runTest() throws Throwable {
try{
- RunJS.runJSFile(resourceDirs, main,new
String[]{"testXmlrpc"}, new JS[]{new TestXmlRpcJSInterface()} );
+ RunJS.runJSFile(resourceDirs, main);
}catch(JSExn e){
fail(e.getMessage());
}
}
}
+ TestServer testServer = new TestServer();
-
- ////////////////////////////////////////////////////////////
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- //
- // Interface exposed in js, for controlling the testserver
- // and for creating the xmlrpc object!
- //
- ////////////////////////////////////////////////////////////
-
- // Object used in js tests to control the test server (start stop it)
- static class TestXmlRpcJSInterface extends JS.Immutable{
-
- TestServer testServer;
- TestXmlRpcJSInterface(){
- this.testServer = new TestServer();
- }
-
- public JS get(JS jsKey) throws JSExn {
- String key = JSU.toString(jsKey);
- if( "startTestServer".equals(key)
- || "stopTestServer".equals(key)
- || "xmlrpc".equals(key)){
- return METHOD;
- }
- return super.get(jsKey);
- }
-
- public JS call(JS method, JS[] args) throws JSExn {
- String key = JSU.toString(method);
- if( "startTestServer".equals(key)){
- testServer.start();
- return null;
- }
- if( "stopTestServer".equals(key)){
- testServer.stop();
- return null;
- }
- if( "xmlrpc".equals(key)){
- return new XMLRPC(JSU.toString(args[0]), "");
- }
- return super.call(method, args);
- }
-
- }
-
+
////////////////////////////////////////////////////////////
@@ -183,6 +141,10 @@
return "blah\n\nblah";
}
+ public String throwsException() throws Exception{
+ throw new Exception("argh!");
+ }
+
// factored out here for tests so we don't have to
start/stop the
// webserver for each test (which is slow)
void start(){
Modified: core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/emptyline.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/emptyline.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/emptyline.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,8 +1,6 @@
sys.import("lib");
-
-sys.testXmlrpc.startTestServer();
var xmlrpc = getServer();
var r = xmlrpc.stringWithEmptyline();
assert(r=="blah\n\nblah");
Added: core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/ioException.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/ioException.js
(rev 0)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/ioException.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -0,0 +1,14 @@
+sys.import("lib");
+
+try{
+ // no server on this port
+ var xmlrpc = sys.xmlrpc("http://localhost:31173/";).testServer;
+ var r = xmlrpc.thowsException();
+ assert(false);
+}
+catch(e){
+ sys.print(e.type);
+ assert(e.type=="xmlrpc");
+ sys.print(e.message);
+}
+
Modified: core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/lib.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/lib.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/lib.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,4 +1,4 @@
export.getServer = function(){
- return sys.testXmlrpc.xmlrpc("http://localhost:8091/";).testServer;
+ return sys.xmlrpc("http://localhost:8091/";).testServer;
};
\ No newline at end of file
Modified:
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_object.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_object.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_object.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,6 +1,5 @@
sys.import("lib");
-sys.testXmlrpc.startTestServer();
var xmlrpc = getServer();
var r = xmlrpc.nestedObject();
assert(r.A == "A");
Modified:
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,6 +1,5 @@
sys.import("lib");
-sys.testXmlrpc.startTestServer();
var xmlrpc = getServer();
var r = xmlrpc.nestedVector();
assert(r.x[0] == "melon");
\ No newline at end of file
Modified:
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector2.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector2.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/nested_vector2.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,6 +1,5 @@
sys.import("lib");
-sys.testXmlrpc.startTestServer();
var xmlrpc = getServer();
var r = xmlrpc.nestedVector2();
sys.log.info(r.vars[0] +","+r.vars[1] +","+r.vars[2]);
Modified: core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/no_handler.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/no_handler.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/no_handler.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,13 +0,0 @@
-sys.import("lib");
-
-sys.testXmlrpc.stopTestServer();
-try{
- var xmlrpc = getServer();
- var r = xmlrpc.addOne(2);
- assert(false);
-}
-catch(e){
- sys.log.info(e.type);
- assert(e.type=="xmlrpc");
- sys.log.info(e.message);
-}
Added:
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException.js
(rev 0)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -0,0 +1,13 @@
+sys.import("lib");
+
+try{
+ var xmlrpc = getServer();
+ var r = xmlrpc.thowsException();
+ assert(false);
+}
+catch(e){
+ sys.print(e.type);
+ assert(e.type=="remote");
+ sys.print(e.message);
+}
+
Added:
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException2.js
===================================================================
---
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException2.js
(rev 0)
+++
core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/serverException2.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -0,0 +1,12 @@
+sys.import("lib");
+
+try{
+ var xmlrpc = sys.xmlrpc("http://localhost:8091/";).notAHandler;
+ var r = xmlrpc.addOne(2);
+ assert(false);
+}
+catch(e){
+ sys.print(e.type);
+ assert(e.type=="remote");
+ sys.print(e.message);
+}
Modified: core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/simple.js
===================================================================
--- core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/simple.js
2007-07-12 14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.js/src_junit/test/js/exec/rpc/xmlrpc/simple.js
2007-07-12 15:46:01 UTC (rev 1983)
@@ -1,8 +1,6 @@
sys.import("lib");
-
-sys.testXmlrpc.startTestServer();
var xmlrpc = getServer();
var r = xmlrpc.addOne(2);
assert(r==3);
Modified: core/trunk/org.ibex.util/src/org/ibex/util/Basket.java
===================================================================
--- core/trunk/org.ibex.util/src/org/ibex/util/Basket.java 2007-07-12
14:57:32 UTC (rev 1982)
+++ core/trunk/org.ibex.util/src/org/ibex/util/Basket.java 2007-07-12
15:46:01 UTC (rev 1983)
@@ -220,6 +220,7 @@
public Object put(Object key, Object val) { return put(key, val, 0); }
public Object put(Object key, Object val, int whichval) {
maps[whichval].put(key, val); return null; }
public void remove(Object key) { for(int i=0; indexMultiple+1>i; i++)
maps[i].remove(key); }
+ public void remove(Object key, int i) { maps[0].remove(key);}
public int size() { return maps[0].size(); }
}
Added: core/trunk/org.ibex.util/src/org/ibex/util/EjAlbertBrowserLauncher.java
===================================================================
--- core/trunk/org.ibex.util/src/org/ibex/util/EjAlbertBrowserLauncher.java
(rev 0)
+++ core/trunk/org.ibex.util/src/org/ibex/util/EjAlbertBrowserLauncher.java
2007-07-12 15:46:01 UTC (rev 1983)
@@ -0,0 +1,588 @@
+package org.ibex.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * BrowserLauncher is a class that provides one static method, openURL, which
opens the default
+ * web browser for the current user of the system to the given URL. It may
support other
+ * protocols depending on the system -- mailto, ftp, etc. -- but that has not
been rigorously
+ * tested and is not guaranteed to work.
+ * <p>
+ * Yes, this is platform-specific code, and yes, it may rely on classes on
certain platforms
+ * that are not part of the standard JDK. What we're trying to do, though, is
to take something
+ * that's frequently desirable but inherently platform-specific -- opening a
default browser --
+ * and allow programmers (you, for example) to do so without worrying about
dropping into native
+ * code or doing anything else similarly evil.
+ * <p>
+ * Anyway, this code is completely in Java and will run on all JDK
1.1-compliant systems without
+ * modification or a need for additional libraries. All classes that are
required on certain
+ * platforms to allow this to run are dynamically loaded at runtime via
reflection and, if not
+ * found, will not cause this to do anything other than returning an error
when opening the
+ * browser.
+ * <p>
+ * There are certain system requirements for this class, as it's running
through Runtime.exec(),
+ * which is Java's way of making a native system call. Currently, this
requires that a Macintosh
+ * have a Finder which supports the GURL event, which is true for Mac OS 8.0
and 8.1 systems that
+ * have the Internet Scripting AppleScript dictionary installed in the
Scripting Additions folder
+ * in the Extensions folder (which is installed by default as far as I know
under Mac OS 8.0 and
+ * 8.1), and for all Mac OS 8.5 and later systems. On Windows, it only runs
under Win32 systems
+ * (Windows 95, 98, and NT 4.0, as well as later versions of all). On other
systems, this drops
+ * back from the inherently platform-sensitive concept of a default browser
and simply attempts
+ * to launch Netscape via a shell command.
+ * <p>
+ * This code is Copyright 1999-2001 by Eric Albert ([EMAIL PROTECTED]) and may
be
+ * redistributed or modified in any form without restrictions as long as the
portion of this
+ * comment from this paragraph through the end of the comment is not removed.
The author
+ * requests that he be notified of any application, applet, or other binary
that makes use of
+ * this code, but that's more out of curiosity than anything and is not
required. This software
+ * includes no warranty. The author is not repsonsible for any loss of data
or functionality
+ * or any adverse or unexpected effects of using this software.
+ * <p>
+ * Credits:
+ * <br>Steven Spencer, JavaWorld magazine (<a
href="http://www.javaworld.com/javaworld/javatips/jw-javatip66.html";>Java Tip
66</a>)
+ * <br>Thanks also to Ron B. Yeh, Eric Shapiro, Ben Engber, Paul Teitlebaum,
Andrea Cantatore,
+ * Larry Barowski, Trevor Bedzek, Frank Miedrich, and Ron Rabakukk
+ *
+ * @author Eric Albert (<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>)
+ * @version 1.4b1 (Released June 20, 2001)
+ */
+public class EjAlbertBrowserLauncher {
+
+ /**
+ * The Java virtual machine that we are running on. Actually, in most
cases we only care
+ * about the operating system, but some operating systems require us to
switch on the VM. */
+ private static int jvm;
+
+ /** The browser for the system */
+ private static Object browser;
+
+ /**
+ * Caches whether any classes, methods, and fields that are not part of
the JDK and need to
+ * be dynamically loaded at runtime loaded successfully.
+ * <p>
+ * Note that if this is <code>false</code>, <code>openURL()</code> will
always return an
+ * IOException.
+ */
+ private static boolean loadedWithoutErrors;
+
+ /** The com.apple.mrj.MRJFileUtils class */
+ private static Class mrjFileUtilsClass;
+
+ /** The com.apple.mrj.MRJOSType class */
+ private static Class mrjOSTypeClass;
+
+ /** The com.apple.MacOS.AEDesc class */
+ private static Class aeDescClass;
+
+ /** The <init>(int) method of com.apple.MacOS.AETarget */
+ private static Constructor aeTargetConstructor;
+
+ /** The <init>(int, int, int) method of com.apple.MacOS.AppleEvent */
+ private static Constructor appleEventConstructor;
+
+ /** The <init>(String) method of com.apple.MacOS.AEDesc */
+ private static Constructor aeDescConstructor;
+
+ /** The findFolder method of com.apple.mrj.MRJFileUtils */
+ private static Method findFolder;
+
+ /** The getFileCreator method of com.apple.mrj.MRJFileUtils */
+ private static Method getFileCreator;
+
+ /** The getFileType method of com.apple.mrj.MRJFileUtils */
+ private static Method getFileType;
+
+ /** The openURL method of com.apple.mrj.MRJFileUtils */
+ private static Method openURLm;
+
+ /** The makeOSType method of com.apple.MacOS.OSUtils */
+ private static Method makeOSType;
+
+ /** The putParameter method of com.apple.MacOS.AppleEvent */
+ private static Method putParameter;
+
+ /** The sendNoReply method of com.apple.MacOS.AppleEvent */
+ private static Method sendNoReply;
+
+ /** Actually an MRJOSType pointing to the System Folder on a Macintosh
*/
+ private static Object kSystemFolderType;
+
+ /** The keyDirectObject AppleEvent parameter type */
+ private static Integer keyDirectObject;
+
+ /** The kAutoGenerateReturnID AppleEvent code */
+ private static Integer kAutoGenerateReturnID;
+
+ /** The kAnyTransactionID AppleEvent code */
+ private static Integer kAnyTransactionID;
+
+ /** The linkage object required for JDirect 3 on Mac OS X. */
+ private static Object linkage;
+
+ /** The framework to reference on Mac OS X */
+ private static final String JDirect_MacOSX =
"/System/Library/Frameworks/Carbon.framework/Frameworks/HIToolbox.framework/HIToolbox";
+
+ /** JVM constant for MRJ 2.0 */
+ private static final int MRJ_2_0 = 0;
+
+ /** JVM constant for MRJ 2.1 or later */
+ private static final int MRJ_2_1 = 1;
+
+ /** JVM constant for Java on Mac OS X 10.0 (MRJ 3.0) */
+ private static final int MRJ_3_0 = 3;
+
+ /** JVM constant for MRJ 3.1 */
+ private static final int MRJ_3_1 = 4;
+
+ /** JVM constant for any Windows NT JVM */
+ private static final int WINDOWS_NT = 5;
+
+ /** JVM constant for any Windows 9x JVM */
+ private static final int WINDOWS_9x = 6;
+
+ /** JVM constant for any other platform */
+ private static final int OTHER = -1;
+
+ /**
+ * The file type of the Finder on a Macintosh. Hardcoding "Finder"
would keep non-U.S. English
+ * systems from working properly.
+ */
+ private static final String FINDER_TYPE = "FNDR";
+
+ /**
+ * The creator code of the Finder on a Macintosh, which is needed to
send AppleEvents to the
+ * application.
+ */
+ private static final String FINDER_CREATOR = "MACS";
+
+ /** The name for the AppleEvent type corresponding to a GetURL event. */
+ private static final String GURL_EVENT = "GURL";
+
+ /**
+ * The first parameter that needs to be passed into Runtime.exec() to
open the default web
+ * browser on Windows.
+ */
+ private static final String FIRST_WINDOWS_PARAMETER = "/c";
+
+ /** The second parameter for Runtime.exec() on Windows. */
+ private static final String SECOND_WINDOWS_PARAMETER = "start";
+
+ /**
+ * The third parameter for Runtime.exec() on Windows. This is a "title"
+ * parameter that the command line expects. Setting this parameter allows
+ * URLs containing spaces to work.
+ */
+ private static final String THIRD_WINDOWS_PARAMETER = "\"\"";
+
+ /**
+ * The shell parameters for Netscape that opens a given URL in an
already-open copy of Netscape
+ * on many command-line systems.
+ */
+ private static final String NETSCAPE_REMOTE_PARAMETER = "-remote";
+ private static final String NETSCAPE_OPEN_PARAMETER_START = "'openURL(";
+ private static final String NETSCAPE_OPEN_PARAMETER_END = ")'";
+
+ /**
+ * The message from any exception thrown throughout the initialization
process.
+ */
+ private static String errorMessage;
+
+ /**
+ * An initialization block that determines the operating system and
loads the necessary
+ * runtime data.
+ */
+ static {
+ loadedWithoutErrors = true;
+ String osName = System.getProperty("os.name");
+ if (osName.startsWith("Mac OS")) {
+ String mrjVersion = System.getProperty("mrj.version");
+ String majorMRJVersion = mrjVersion.substring(0, 3);
+ try {
+ double version =
Double.valueOf(majorMRJVersion).doubleValue();
+ if (version == 2) {
+ jvm = MRJ_2_0;
+ } else if (version >= 2.1 && version < 3) {
+ // Assume that all 2.x versions of MRJ
work the same. MRJ 2.1 actually
+ // works via Runtime.exec() and 2.2
supports that but has an openURL() method
+ // as well that we currently ignore.
+ jvm = MRJ_2_1;
+ } else if (version == 3.0) {
+ jvm = MRJ_3_0;
+ } else if (version >= 3.1) {
+ // Assume that all 3.1 and later
versions of MRJ work the same.
+ jvm = MRJ_3_1;
+ } else {
+ loadedWithoutErrors = false;
+ errorMessage = "Unsupported MRJ
version: " + version;
+ }
+ } catch (NumberFormatException nfe) {
+ loadedWithoutErrors = false;
+ errorMessage = "Invalid MRJ version: " +
mrjVersion;
+ }
+ } else if (osName.startsWith("Windows")) {
+ if (osName.indexOf("9") != -1) {
+ jvm = WINDOWS_9x;
+ } else {
+ jvm = WINDOWS_NT;
+ }
+ } else {
+ jvm = OTHER;
+ }
+
+ if (loadedWithoutErrors) { // if we haven't hit any errors
yet
+ loadedWithoutErrors = loadClasses();
+ }
+ }
+
+ /**
+ * This class should be never be instantiated; this just ensures so.
+ */
+ private EjAlbertBrowserLauncher() { }
+
+ /**
+ * Called by a static initializer to load any classes, fields, and
methods required at runtime
+ * to locate the user's web browser.
+ * @return <code>true</code> if all intialization succeeded
+ * <code>false</code> if any portion of the
initialization failed
+ */
+ private static boolean loadClasses() {
+ switch (jvm) {
+ case MRJ_2_0:
+ try {
+ Class aeTargetClass =
Class.forName("com.apple.MacOS.AETarget");
+ Class osUtilsClass =
Class.forName("com.apple.MacOS.OSUtils");
+ Class appleEventClass =
Class.forName("com.apple.MacOS.AppleEvent");
+ Class aeClass =
Class.forName("com.apple.MacOS.ae");
+ aeDescClass =
Class.forName("com.apple.MacOS.AEDesc");
+
+ aeTargetConstructor =
aeTargetClass.getDeclaredConstructor(new Class [] { int.class });
+ appleEventConstructor =
appleEventClass.getDeclaredConstructor(new Class[] { int.class, int.class,
aeTargetClass, int.class, int.class });
+ aeDescConstructor =
aeDescClass.getDeclaredConstructor(new Class[] { String.class });
+
+ makeOSType =
osUtilsClass.getDeclaredMethod("makeOSType", new Class [] { String.class });
+ putParameter =
appleEventClass.getDeclaredMethod("putParameter", new Class[] { int.class,
aeDescClass });
+ sendNoReply =
appleEventClass.getDeclaredMethod("sendNoReply", new Class[] { });
+
+ Field keyDirectObjectField =
aeClass.getDeclaredField("keyDirectObject");
+ keyDirectObject = (Integer)
keyDirectObjectField.get(null);
+ Field autoGenerateReturnIDField =
appleEventClass.getDeclaredField("kAutoGenerateReturnID");
+ kAutoGenerateReturnID = (Integer)
autoGenerateReturnIDField.get(null);
+ Field anyTransactionIDField =
appleEventClass.getDeclaredField("kAnyTransactionID");
+ kAnyTransactionID = (Integer)
anyTransactionIDField.get(null);
+ } catch (ClassNotFoundException cnfe) {
+ errorMessage = cnfe.getMessage();
+ return false;
+ } catch (NoSuchMethodException nsme) {
+ errorMessage = nsme.getMessage();
+ return false;
+ } catch (NoSuchFieldException nsfe) {
+ errorMessage = nsfe.getMessage();
+ return false;
+ } catch (IllegalAccessException iae) {
+ errorMessage = iae.getMessage();
+ return false;
+ }
+ break;
+ case MRJ_2_1:
+ try {
+ mrjFileUtilsClass =
Class.forName("com.apple.mrj.MRJFileUtils");
+ mrjOSTypeClass =
Class.forName("com.apple.mrj.MRJOSType");
+ Field systemFolderField =
mrjFileUtilsClass.getDeclaredField("kSystemFolderType");
+ kSystemFolderType =
systemFolderField.get(null);
+ findFolder =
mrjFileUtilsClass.getDeclaredMethod("findFolder", new Class[] { mrjOSTypeClass
});
+ getFileCreator =
mrjFileUtilsClass.getDeclaredMethod("getFileCreator", new Class[] { File.class
});
+ getFileType =
mrjFileUtilsClass.getDeclaredMethod("getFileType", new Class[] { File.class });
+ } catch (ClassNotFoundException cnfe) {
+ errorMessage = cnfe.getMessage();
+ return false;
+ } catch (NoSuchFieldException nsfe) {
+ errorMessage = nsfe.getMessage();
+ return false;
+ } catch (NoSuchMethodException nsme) {
+ errorMessage = nsme.getMessage();
+ return false;
+ } catch (SecurityException se) {
+ errorMessage = se.getMessage();
+ return false;
+ } catch (IllegalAccessException iae) {
+ errorMessage = iae.getMessage();
+ return false;
+ }
+ break;
+ case MRJ_3_0:
+ try {
+ Class linker =
Class.forName("com.apple.mrj.jdirect.Linker");
+ Constructor constructor =
linker.getConstructor(new Class[]{ Class.class });
+ linkage = constructor.newInstance(new
Object[] { EjAlbertBrowserLauncher.class });
+ } catch (ClassNotFoundException cnfe) {
+ errorMessage = cnfe.getMessage();
+ return false;
+ } catch (NoSuchMethodException nsme) {
+ errorMessage = nsme.getMessage();
+ return false;
+ } catch (InvocationTargetException ite) {
+ errorMessage = ite.getMessage();
+ return false;
+ } catch (InstantiationException ie) {
+ errorMessage = ie.getMessage();
+ return false;
+ } catch (IllegalAccessException iae) {
+ errorMessage = iae.getMessage();
+ return false;
+ }
+ break;
+ case MRJ_3_1:
+ try {
+ mrjFileUtilsClass =
Class.forName("com.apple.mrj.MRJFileUtils");
+ openURLm =
mrjFileUtilsClass.getDeclaredMethod("openURL", new Class[] { String.class });
+ } catch (ClassNotFoundException cnfe) {
+ errorMessage = cnfe.getMessage();
+ return false;
+ } catch (NoSuchMethodException nsme) {
+ errorMessage = nsme.getMessage();
+ return false;
+ }
+ break;
+ default:
+ break;
+ }
+ return true;
+ }
+
+ /**
+ * Attempts to locate the default web browser on the local system.
Caches results so it
+ * only locates the browser once for each use of this class per JVM
instance.
+ * @return The browser for the system. Note that this may not be what
you would consider
+ * to be a standard web browser; instead, it's the
application that gets called to
+ * open the default web browser. In some cases,
this will be a non-String object
+ * that provides the means of calling the default
browser.
+ */
+ private static Object locateBrowser() {
+ if (browser != null) {
+ return browser;
+ }
+ switch (jvm) {
+ case MRJ_2_0:
+ try {
+ Integer finderCreatorCode = (Integer)
makeOSType.invoke(null, new Object[] { FINDER_CREATOR });
+ Object aeTarget =
aeTargetConstructor.newInstance(new Object[] { finderCreatorCode });
+ Integer gurlType = (Integer)
makeOSType.invoke(null, new Object[] { GURL_EVENT });
+ Object appleEvent =
appleEventConstructor.newInstance(new Object[] { gurlType, gurlType, aeTarget,
kAutoGenerateReturnID, kAnyTransactionID });
+ // Don't set browser = appleEvent
because then the next time we call
+ // locateBrowser(), we'll get the same
AppleEvent, to which we'll already have
+ // added the relevant parameter.
Instead, regenerate the AppleEvent every time.
+ // There's probably a way to do this
better; if any has any ideas, please let
+ // me know.
+ return appleEvent;
+ } catch (IllegalAccessException iae) {
+ browser = null;
+ errorMessage = iae.getMessage();
+ return browser;
+ } catch (InstantiationException ie) {
+ browser = null;
+ errorMessage = ie.getMessage();
+ return browser;
+ } catch (InvocationTargetException ite) {
+ browser = null;
+ errorMessage = ite.getMessage();
+ return browser;
+ }
+ case MRJ_2_1:
+ File systemFolder;
+ try {
+ systemFolder = (File)
findFolder.invoke(null, new Object[] { kSystemFolderType });
+ } catch (IllegalArgumentException iare) {
+ browser = null;
+ errorMessage = iare.getMessage();
+ return browser;
+ } catch (IllegalAccessException iae) {
+ browser = null;
+ errorMessage = iae.getMessage();
+ return browser;
+ } catch (InvocationTargetException ite) {
+ browser = null;
+ errorMessage =
ite.getTargetException().getClass() + ": " +
ite.getTargetException().getMessage();
+ return browser;
+ }
+ String[] systemFolderFiles =
systemFolder.list();
+ // Avoid a FilenameFilter because that can't be
stopped mid-list
+ for(int i = 0; i < systemFolderFiles.length;
i++) {
+ try {
+ File file = new
File(systemFolder, systemFolderFiles[i]);
+ if (!file.isFile()) {
+ continue;
+ }
+ // We're looking for a file
with a creator code of 'MACS' and
+ // a type of 'FNDR'. Only
requiring the type results in non-Finder
+ // applications being picked up
on certain Mac OS 9 systems,
+ // especially German ones, and
sending a GURL event to those
+ // applications results in a
logout under Multiple Users.
+ Object fileType =
getFileType.invoke(null, new Object[] { file });
+ if
(FINDER_TYPE.equals(fileType.toString())) {
+ Object fileCreator =
getFileCreator.invoke(null, new Object[] { file });
+ if
(FINDER_CREATOR.equals(fileCreator.toString())) {
+ browser =
file.toString(); // Actually the Finder, but that's OK
+ return browser;
+ }
+ }
+ } catch (IllegalArgumentException iare)
{
+ errorMessage =
iare.getMessage();
+ return null;
+ } catch (IllegalAccessException iae) {
+ browser = null;
+ errorMessage = iae.getMessage();
+ return browser;
+ } catch (InvocationTargetException ite)
{
+ browser = null;
+ errorMessage =
ite.getTargetException().getClass() + ": " +
ite.getTargetException().getMessage();
+ return browser;
+ }
+ }
+ browser = null;
+ break;
+ case MRJ_3_0:
+ case MRJ_3_1:
+ browser = ""; // Return something non-null
+ break;
+ case WINDOWS_NT:
+ browser = "cmd.exe";
+ break;
+ case WINDOWS_9x:
+ browser = "command.com";
+ break;
+ case OTHER:
+ default:
+ browser = "netscape";
+ break;
+ }
+ return browser;
+ }
+
+ /**
+ * Attempts to open the default web browser to the given URL.
+ * @param url The URL to open
+ * @throws IOException If the web browser could not be located or does
not run
+ */
+ public static void openURL(String url) throws IOException {
+ if (!loadedWithoutErrors) {
+ throw new IOException("Exception in finding browser: "
+ errorMessage);
+ }
+ Object browser = locateBrowser();
+ if (browser == null) {
+ throw new IOException("Unable to locate browser: " +
errorMessage);
+ }
+
+ switch (jvm) {
+ case MRJ_2_0:
+ Object aeDesc = null;
+ try {
+ aeDesc =
aeDescConstructor.newInstance(new Object[] { url });
+ putParameter.invoke(browser, new
Object[] { keyDirectObject, aeDesc });
+ sendNoReply.invoke(browser, new
Object[] { });
+ } catch (InvocationTargetException ite) {
+ throw new
IOException("InvocationTargetException while creating AEDesc: " +
ite.getMessage());
+ } catch (IllegalAccessException iae) {
+ throw new
IOException("IllegalAccessException while building AppleEvent: " +
iae.getMessage());
+ } catch (InstantiationException ie) {
+ throw new
IOException("InstantiationException while creating AEDesc: " + ie.getMessage());
+ } finally {
+ aeDesc = null; // Encourage it to get
disposed if it was created
+ browser = null; // Ditto
+ }
+ break;
+ case MRJ_2_1:
+ Runtime.getRuntime().exec(new String[] {
(String) browser, url } );
+ break;
+ case MRJ_3_0:
+ int[] instance = new int[1];
+ int result = ICStart(instance, 0);
+ if (result == 0) {
+ int[] selectionStart = new int[] { 0 };
+ byte[] urlBytes = url.getBytes();
+ int[] selectionEnd = new int[] {
urlBytes.length };
+ result = ICLaunchURL(instance[0], new
byte[] { 0 }, urlBytes,
+
urlBytes.length, selectionStart,
+
selectionEnd);
+ if (result == 0) {
+ // Ignore the return value; the
URL was launched successfully
+ // regardless of what happens
here.
+ ICStop(instance);
+ } else {
+ throw new IOException("Unable
to launch URL: " + result);
+ }
+ } else {
+ throw new IOException("Unable to create
an Internet Config instance: " + result);
+ }
+ break;
+ case MRJ_3_1:
+ try {
+ openURLm.invoke(null, new Object[] {
url });
+ } catch (InvocationTargetException ite) {
+ throw new
IOException("InvocationTargetException while calling openURL: " +
ite.getMessage());
+ } catch (IllegalAccessException iae) {
+ throw new
IOException("IllegalAccessException while calling openURL: " +
iae.getMessage());
+ }
+ break;
+ case WINDOWS_NT:
+ case WINDOWS_9x:
+ // Add quotes around the URL to allow ampersands and
other special
+ // characters to work.
+ Process process = Runtime.getRuntime().exec(new
String[] { (String) browser,
+
FIRST_WINDOWS_PARAMETER,
+
SECOND_WINDOWS_PARAMETER,
+
(jvm==WINDOWS_9x?"":THIRD_WINDOWS_PARAMETER),
+
'"' + url + '"' });
+ // This avoids a memory leak on some versions
of Java on Windows.
+ // That's hinted at in
<http://developer.java.sun.com/developer/qow/archive/68/>.
+ try {
+ process.waitFor();
+ process.exitValue();
+ } catch (InterruptedException ie) {
+ throw new
IOException("InterruptedException while launching browser: " + ie.getMessage());
+ }
+ break;
+ case OTHER:
+ // Assume that we're on Unix and that Netscape
is installed
+
+ // First, attempt to open the URL in a
currently running session of Netscape
+ process = Runtime.getRuntime().exec(new
String[] { (String) browser,
+
NETSCAPE_REMOTE_PARAMETER,
+
NETSCAPE_OPEN_PARAMETER_START +
+
url +
+
NETSCAPE_OPEN_PARAMETER_END });
+ try {
+ int exitCode = process.waitFor();
+ if (exitCode != 0) { // if Netscape
was not open
+ Runtime.getRuntime().exec(new
String[] { (String) browser, url });
+ }
+ } catch (InterruptedException ie) {
+ throw new
IOException("InterruptedException while launching browser: " + ie.getMessage());
+ }
+ break;
+ default:
+ // This should never occur, but if it does,
we'll try the simplest thing possible
+ Runtime.getRuntime().exec(new String[] {
(String) browser, url });
+ break;
+ }
+ }
+
+ /**
+ * Methods required for Mac OS X. The presence of native methods does
not cause
+ * any problems on other platforms.
+ */
+ /*
+ private native static int ICStart(int[] instance, int signature);
+ private native static int ICStop(int[] instance);
+ private native static int ICLaunchURL(int instance, byte[] hint, byte[]
data, int len,
+
int[] selectionStart, int[] selectionEnd);
+ */
+ private static int ICStart(int[] instance, int signature) { return 0; }
+ private static int ICStop(int[] instance) { return 0; }
+ private static int ICLaunchURL(int instance, byte[] hint, byte[] data, int
len,
+ int[] selectionStart, int[] selectionEnd) { return 0; }
+}
Modified: core/trunk/org.vexi.core/src/org/vexi/plat/Platform.java
===================================================================
--- core/trunk/org.vexi.core/src/org/vexi/plat/Platform.java 2007-07-12
14:57:32 UTC (rev 1982)
+++ core/trunk/org.vexi.core/src/org/vexi/plat/Platform.java 2007-07-12
15:46:01 UTC (rev 1983)
@@ -243,8 +243,9 @@
Class c = Class.forName("org.ibex.util.EjAlbertBrowserLauncher");
Method m = c.getMethod("openURL", new Class[] { String.class });
m.invoke(null, new String[] { url });
+ } catch(ClassNotFoundException e){
+ Log.warn(this, "browser launching not available");
} catch (Exception e) {
- Log.warn(this, "exception trying to open a browser window");
Log.warn(this, e);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
