[Swift-commit] r3443 - in trunk/src/org/griphyn/vdl/karajan: functions lib

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-07-19 13:38:36 -0500 (Mon, 19 Jul 2010)
New Revision: 3443

Modified:
   trunk/src/org/griphyn/vdl/karajan/functions/ConfigProperty.java
   trunk/src/org/griphyn/vdl/karajan/lib/Execute.java
   trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
Log:
Drop unused imports; whitespace


Modified: trunk/src/org/griphyn/vdl/karajan/functions/ConfigProperty.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/functions/ConfigProperty.java	2010-07-19 18:36:58 UTC (rev 3442)
+++ trunk/src/org/griphyn/vdl/karajan/functions/ConfigProperty.java	2010-07-19 18:38:36 UTC (rev 3443)
@@ -33,19 +33,19 @@
         boolean instance = TypeUtil.toBoolean(INSTANCE.getValue(stack));
         Object host = HOST.getValue(stack);
         if(logger.isDebugEnabled()) {
-		logger.debug("Getting property "+name+" with host "+host);
-	}
-	if(host!= null) {
-		// see if the host has this property defined, and if so
-		// get its value
-		BoundContact h = (BoundContact)host;
-		String prop = (String) h.getProperty(name);
-		if(prop != null) {
-			logger.debug("Found property "+name+" in BoundContact");
-			return prop;
-		}
-			logger.debug("Could not find property "+name+" in BoundContact");
-	}
+            logger.debug("Getting property "+name+" with host "+host);
+        }
+        if(host!= null) {
+            // see if the host has this property defined, and if so
+            // get its value
+            BoundContact h = (BoundContact)host;
+            String prop = (String) h.getProperty(name);
+            if(prop != null) {
+                logger.debug("Found property "+name+" in BoundContact");
+                return prop;
+            }
+            logger.debug("Could not find property "+name+" in BoundContact");
+        }
         return getProperty(name, instance, stack);
     }
 

Modified: trunk/src/org/griphyn/vdl/karajan/lib/Execute.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/Execute.java	2010-07-19 18:36:58 UTC (rev 3442)
+++ trunk/src/org/griphyn/vdl/karajan/lib/Execute.java	2010-07-19 18:38:36 UTC (rev 3443)
@@ -46,7 +46,7 @@
 			Object constraints) throws ExecutionException {
 		try {
 			registerReplica(stack, task);
-                        log(task, stack);
+			log(task, stack);
 			scheduler.addJobStatusListener(this, task);
 			synchronized (tasks) {
 				tasks.put(task, stack);
@@ -61,32 +61,32 @@
 		}
 	}
 
-        void log(Task task, VariableStack stack)
-            throws ExecutionException
-        {
-            if (logger.isDebugEnabled()) {
-                logger.debug(task);
-                logger.debug("Submitting task " + task);
-            }
-            String jobid = (String)A_JOBID.getValue(stack,null);
-            if (logger.isDebugEnabled()) {
-                logger.debug("jobid="+jobid+" task=" + task);
-            }
-            else if (logger.isInfoEnabled()) {
-                Specification spec = task.getSpecification();
-                if (spec instanceof JobSpecification) {
-                    JobSpecification jobspec = (JobSpecification) spec;
-                    logger.info("Submit: " +
-                                "in: " + jobspec.getDirectory() +
-                                " command: " + jobspec.getExecutable() + 
-                                " " + jobspec.getArguments());
-                }
-                else {
-                    logger.info("Submit: " + spec);
-                }
-            }
-        }
-            
+	void log(Task task, VariableStack stack)
+	throws ExecutionException
+	{
+	    if (logger.isDebugEnabled()) {
+	        logger.debug(task);
+	        logger.debug("Submitting task " + task);
+	    }
+	    String jobid = (String) A_JOBID.getValue(stack,null);
+	    if (logger.isDebugEnabled()) {
+	        logger.debug("jobid="+jobid+" task=" + task);
+	    }
+	    else if (logger.isInfoEnabled()) {
+	        Specification spec = task.getSpecification();
+	        if (spec instanceof JobSpecification) {
+	            JobSpecification jobspec = (JobSpecification) spec;
+	            logger.info("Submit: " +
+	                "in: " + jobspec.getDirectory() +
+	                " command: " + jobspec.getExecutable() + 
+	                " " + jobspec.getArguments());
+	        }
+	        else {
+	            logger.info("Submit: " + spec);
+	        }
+	    }
+	}
+
 	protected void registerReplica(VariableStack stack, Task task) throws CanceledReplicaException {
 		setTaskIdentity(stack, task);
 		try {

Modified: trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java	2010-07-19 18:36:58 UTC (rev 3442)
+++ trunk/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java	2010-07-19 18:38:36 UTC (rev 3443)
@@ -15,9 +15,6 @@
 import org.griphyn.vdl.mapping.InvalidPathException;
 import org.griphyn.vdl.mapping.Path;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
-
 public class SetFieldValue extends VDLFunction {
 	public static final Logger logger = Logger.getLogger(SetFieldValue.class);
 
@@ -69,10 +66,10 @@
 	    else if (logger.isInfoEnabled()) {
 	        if (leaf instanceof AbstractDataNode) {
 	            AbstractDataNode data = (AbstractDataNode) leaf;
-                    Path path = data.getPathFromRoot();
-                    String p = path.toString();
-                    if (p.equals("$"))
-                        p = "";
+	            Path path = data.getPathFromRoot();
+	            String p = path.toString();
+	            if (p.equals("$"))
+	                p = "";
 	            String name = data.getDisplayableName() + p;
 	            logger.info("Set: " + name + "=" + value);
 	        }