[CJ-dev] commonjava-projects/commonjava-opl/src/java/org/commonjava/opl/generics/multifile ImportDirParser.java,1.5,1.6

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/java/org/commonjava/opl/generics/multifile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12005/src/java/org/commonjava/opl/generics/multifile

Modified Files:
	ImportDirParser.java 
Log Message:
corrected versioning differences...everything is up to date.

Index: ImportDirParser.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/java/org/commonjava/opl/generics/multifile/ImportDirParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ImportDirParser.java	16 Jan 2004 01:37:33 -0000	1.5
+++ ImportDirParser.java	20 Feb 2004 21:16:04 -0000	1.6
@@ -8,6 +8,8 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.commonjava.opl.DocumentDriver;
 import org.commonjava.opl.ElementInfo;
 import org.commonjava.opl.NodeParser;
@@ -24,6 +26,8 @@
  */
 public class ImportDirParser extends NodeParser implements DirTuningParent
 {
+  private static final Log LOG = LogFactory.getLog(ImportDirParser.class);
+  
   private static final String DIRECTORY = "dir";
   
   private Set inclusions = new HashSet();
@@ -64,6 +68,10 @@
   }
   
   private String[] getFiles(String dir) {
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("Looking for files to import in directory: " + dir);
+    }
+    
     OrLogicFilenameFilter includeFilter = new OrLogicFilenameFilter();
     for (Iterator it = inclusions.iterator(); it.hasNext(); )
     {
@@ -83,6 +91,16 @@
     allFilter.addFilter(excludeFilter);
     
     String[] files = FileFinder.getFileNames(dir, allFilter, true);
+    
+    
+    if (LOG.isDebugEnabled()) {
+      StringBuffer buffer = new StringBuffer("Found files to import:");
+      for (int i = 0; i < files.length; i++) {
+        buffer.append("\n").append(files[i]);
+      }
+      LOG.debug(buffer.toString());
+    }
+    
     return files;
   }
   
@@ -90,9 +108,13 @@
     for (int i = 0; i < files.length; i++)
     {
       String file = files[i];
+      if (LOG.isDebugEnabled()) {LOG.debug("Parsing/importing file: " + file + " under element: " + getContext().getLastElement());}
+      
       DocumentDriver driver = new DocumentDriver(getParent());
       BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
       OPLEngine.getInstance(driver).parse(in);
+      
+      if (LOG.isDebugEnabled()) {LOG.debug("Parsed/imported file: " + file + " under element: " + getContext().getLastElement());}
     }
   }