commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r670180 - in /commons/sandbox/js2j/trunk: pom.xml src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java src/main/java/org/apache/commons/js2j/ScriptableMap.java
Date Sat, 21 Jun 2008 10:49:03 GMT
Author: mrdon
Date: Sat Jun 21 03:49:03 2008
New Revision: 670180

URL: http://svn.apache.org/viewvc?rev=670180&view=rev
Log:
Removing debugging, uping to Java 1.5

Modified:
    commons/sandbox/js2j/trunk/pom.xml
    commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java
    commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java

Modified: commons/sandbox/js2j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/js2j/trunk/pom.xml?rev=670180&r1=670179&r2=670180&view=diff
==============================================================================
--- commons/sandbox/js2j/trunk/pom.xml (original)
+++ commons/sandbox/js2j/trunk/pom.xml Sat Jun 21 03:49:03 2008
@@ -95,8 +95,8 @@
 
   <!-- Compiler source and target JVM (see parent pom) -->
   <properties>
-    <maven.compile.source>1.4</maven.compile.source>
-    <maven.compile.target>1.4</maven.compile.target>
+    <maven.compile.source>1.5</maven.compile.source>
+    <maven.compile.target>1.5</maven.compile.target>
     <commons.componentid>js2j</commons.componentid>
     <commons.jira.componentid>12311558</commons.jira.componentid>
   </properties> 

Modified: commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java
URL: http://svn.apache.org/viewvc/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java?rev=670180&r1=670179&r2=670180&view=diff
==============================================================================
--- commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java
(original)
+++ commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java
Sat Jun 21 03:49:03 2008
@@ -45,18 +45,17 @@
     }
 
     public Object get(String name, Scriptable start) {
-        //System.out.println("looking up function "+name);
         Method func = (Method)functions.get(name);
         if (func != null) {
             try {
                 if (func.getParameterTypes().length == 2) {
-                    Object val = func.invoke(null, new Object[]{javaObject, start});
+                    Object val = func.invoke(null, javaObject, start);
                     Class type = func.getReturnType();
                     start = ScriptableObject.getTopLevelScope(start);
                     Context cx = Context.getCurrentContext();
                     return cx.getWrapFactory().wrap(cx, start, val, type);
                 } else {
-                    ExtensionFunction f = (ExtensionFunction)func.invoke(null, new Object[]{javaObject});
+                    ExtensionFunction f = (ExtensionFunction)func.invoke(null, javaObject);
                     f.setTarget(javaObject);
                     f.setWrapper(this);
                     return f;

Modified: commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java
URL: http://svn.apache.org/viewvc/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java?rev=670180&r1=670179&r2=670180&view=diff
==============================================================================
--- commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java (original)
+++ commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java Sat
Jun 21 03:49:03 2008
@@ -82,7 +82,6 @@
         if (value instanceof NativeJavaObject) {
             value = ((NativeJavaObject)value).unwrap();
         }
-        System.out.println("putting:"+value+" class:"+value.getClass());
         map.put(name, value);
     }
 



Mime
View raw message