[Swift-commit] r7303 - trunk/src/org/griphyn/vdl/karajan/lib/swiftscript

hategan at ci.uchicago.edu hategan at ci.uchicago.edu
Fri Nov 22 15:00:22 CST 2013


Author: hategan
Date: 2013-11-22 15:00:22 -0600 (Fri, 22 Nov 2013)
New Revision: 7303

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java
Log:
cleaned up a bit

Modified: trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java	2013-11-22 20:58:26 UTC (rev 7302)
+++ trunk/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java	2013-11-22 21:00:22 UTC (rev 7303)
@@ -29,7 +29,6 @@
 import org.globus.cog.karajan.analyzer.Signature;
 import org.griphyn.vdl.karajan.lib.SwiftFunction;
 import org.griphyn.vdl.mapping.AbstractDataNode;
-import org.griphyn.vdl.mapping.DSHandle;
 import org.griphyn.vdl.mapping.RootDataNode;
 import org.griphyn.vdl.type.Type;
 import org.griphyn.vdl.type.Types;
@@ -57,9 +56,7 @@
         Object[] p = convertInputs(method, args);
         Type type = returnType(method);
         Object value = invoke(method, p);
-        DSHandle result = swiftResult(type, value);
-
-        return result;
+        return new RootDataNode(type, value);
     }
 
     /**
@@ -145,12 +142,4 @@
         }
         return result;
     }
-
-    DSHandle swiftResult(Type type, Object value)
-    {
-        DSHandle result = new RootDataNode(type);
-        result.setValue(value);
-        result.closeShallow();
-        return result;
-    }
 }




More information about the Swift-commit mailing list