[Swift-commit] r2346 - in trunk: libexec src/org/griphyn/vdl/karajan/lib

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-11-26 13:31:44 -0600 (Wed, 26 Nov 2008)
New Revision: 2346

Removed:
   trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java
Modified:
   trunk/libexec/vdl-lib.xml
Log:
@filenames is only used as a SwiftScript-invoked function, not as part of the
internal library. This commit removes the internal library version of
filenames, leaving the SwiftScript-exposed version in place.


Modified: trunk/libexec/vdl-lib.xml
===================================================================
--- trunk/libexec/vdl-lib.xml	2008-11-24 03:03:18 UTC (rev 2345)
+++ trunk/libexec/vdl-lib.xml	2008-11-26 19:31:44 UTC (rev 2346)
@@ -36,8 +36,6 @@
 	<export name="createarray"><elementDef classname="org.griphyn.vdl.karajan.lib.CreateArray"/></export>
 	<!-- used from VDL2 for arguments to apps and returns relative paths -->
 	<export name="fileName"><elementDef classname="org.griphyn.vdl.karajan.lib.FileName"/></export>
-	<!-- returns multiple names instead of concatenating them -->
-	<export name="fileNames"><elementDef classname="org.griphyn.vdl.karajan.lib.FileNames"/></export>
 	<!-- for internal use and does not force relative paths -->
 	<export name="absFileName"><elementDef classname="org.griphyn.vdl.karajan.lib.AbsFileName"/></export>
 

Deleted: trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java	2008-11-24 03:03:18 UTC (rev 2345)
+++ trunk/src/org/griphyn/vdl/karajan/lib/FileNames.java	2008-11-26 19:31:44 UTC (rev 2346)
@@ -1,22 +0,0 @@
-/*
- * Created on Dec 26, 2006
- */
-package org.griphyn.vdl.karajan.lib;
-
-import org.globus.cog.karajan.arguments.Arg;
-import org.globus.cog.karajan.stack.VariableStack;
-import org.globus.cog.karajan.workflow.ExecutionException;
-
-public class FileNames extends VDLFunction {
-	static {
-		setArguments(FileNames.class, new Arg[] { PA_VAR });
-	}
-
-	public Object function(VariableStack stack) throws ExecutionException {
-		String[] f = filename(stack);
-		for (int i = 0; i < f.length; i++) {
-			f[i] = relativize(f[i]);
-		}
-		return f;
-	}
-}