lcsim/src/org/lcsim/job

diff -u -r1.43 -r1.44
--- JobControlManager.java	4 Jun 2010 19:05:03 -0000	1.43
+++ JobControlManager.java	4 Jun 2010 19:23:03 -0000	1.44
@@ -46,7 +46,7 @@

  * The command line syntax is <code>java -jar ./lib/lcsim.jar steeringFile.xml</code>.
  * 
  * @author jeremym

- * @verbose $Id: JobControlManager.java,v 1.43 2010/06/04 19:05:03 jeremy Exp $

+ * @verbose $Id: JobControlManager.java,v 1.44 2010/06/04 19:23:03 jeremy Exp $

  */
 public class JobControlManager
 {

@@ -483,9 +483,9 @@

 		            Matcher matcher = pattern.matcher(file);
 		            if (matcher.matches())
 		            {

-		                inputFiles.add(new File(basedir + File.separator + file));

+		                processFileText(basedir + File.separator + file, inputFiles);

 		                if (verbose)

-		                    logStream.println("Matched file <" + file.toString() + "> to pattern <" + pattern.toString() + ">");		                

+		                    logStream.println("Matched file <" + file.toString() + "> to pattern <" + pattern.toString() + ">");   

 		            }
 		            else
 		            {

@@ -499,7 +499,6 @@

 		// Check that all files exist.
 		for (File file : inputFiles)
         {

-            // Check that input LCIO file exists.    

             if (!file.exists())
             {
                 logStream.println("The file " + file.getAbsolutePath() + " does not exist!");

@@ -513,9 +512,11 @@

             logStream.println();
             logStream.println("--- Input Files ---");
 

+            int index = 1;

             for (File file : inputFiles)
             {

-                logStream.println(file.getAbsolutePath());

+                logStream.println("[" + index + "] " + file.getAbsolutePath());
+                ++index;

             }
 
             logStream.println("--- End Input Files ---");