[Tm4j-commits] tm4j/src/org/tm4j/ant/taskdefs EclipseProjectTask.java,1.1,1.2

[<ha...@us...>]

Update of /cvsroot/tm4j/tm4j/src/org/tm4j/ant/taskdefs
In directory sc8-pr-cvs1:/tmp/cvs-serv2175/taskdefs

Modified Files:
	EclipseProjectTask.java 
Log Message:
Fixed several problem in EclipseProjectTask, added test case.


Index: EclipseProjectTask.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/ant/taskdefs/EclipseProjectTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EclipseProjectTask.java	6 Oct 2003 13:26:49 -0000	1.1
--- EclipseProjectTask.java	26 Oct 2003 14:26:28 -0000	1.2
***************
*** 229,239 ****
       * @param src the nested <code>src</code> element. */
      public void addConfiguredSrc(DirSet src) {
!         if (sourceDirs != null) {
!             String msg =
!                 "Both a srcdir attribute and a nested src element were found. " +
!                 "The nested element takes precedence.";
!             log(msg, Project.MSG_WARN);
!         }
! 
          DirectoryScanner ds = src.getDirectoryScanner(getProject());
          String[] includedDirs = ds.getIncludedDirectories();
--- 229,234 ----
       * @param src the nested <code>src</code> element. */
      public void addConfiguredSrc(DirSet src) {
!         // TODO: generate a warning if a source directory has already been
!         // set using srcdir attribute
          DirectoryScanner ds = src.getDirectoryScanner(getProject());
          String[] includedDirs = ds.getIncludedDirectories();
***************
*** 297,303 ****
          boolean fileCreated;
  
!         // attempt to open the file, rethrow any I/O exceptions
          fileCreated = file.createNewFile();
!         ret = new FileOutputStream(file, false);
  
          // log a debug message
--- 292,298 ----
          boolean fileCreated;
  
!         // attempt to open the file
          fileCreated = file.createNewFile();
!         ret = new FileOutputStream(file);
  
          // log a debug message
***************
*** 387,404 ****
  
          // scan through the classpath and add corresponding lib entries
!         String[] classpathElements = classPath.list();
  
!         for (int i = 0; i < classpathElements.length; i++) {
!             String pathElement = classpathElements[i];
  
!             if (new File(pathElement).equals(output)) {
!                 // skip -- should not include the output dir as a lib entry
!             } else {
!                 Element cpEntry = generateEntry(classpathDoc,
!                         CLASSPATHENTRY_LIB, pathElement);
!                 classpathElement.appendChild(cpEntry);
!                 log("Added classpathentry of type " + CLASSPATHENTRY_LIB +
!                     " for " + pathElement + ".", Project.MSG_DEBUG);
              }
          }
  
--- 382,406 ----
  
          // scan through the classpath and add corresponding lib entries
!         if (classPath != null) {
!             String[] classpathElements = classPath.list();
  
!             for (int i = 0; i < classpathElements.length; i++) {
!                 String pathElement = classpathElements[i];
!                 File pathElementFile = new File(pathElement);
  
!                 if (new File(pathElement).equals(output)) {
!                     // skip -- should not include the output dir as a lib entry
!                 } else {
!                     Element cpEntry = generateEntry(classpathDoc,
!                             CLASSPATHENTRY_LIB, pathElementFile.getPath());
!                     classpathElement.appendChild(cpEntry);
!                     log("Added classpathentry of type " + CLASSPATHENTRY_LIB +
!                         " for " + pathElement + ".", Project.MSG_DEBUG);
!                 }
              }
+         } else {
+             String msg = "No classpath set, omitting any " +
+                 CLASSPATHENTRY_LIB + " entries in classpath file.";
+             log(msg, Project.MSG_WARN);
          }
  
***************
*** 686,689 ****
--- 688,694 ----
  
          try {
+             // initialize sourceDirs
+             sourceDirs = new File[1];
+ 
              // get a new TransformerFactory
              transformerFactory = TransformerFactory.newInstance();
***************
*** 703,719 ****
                  destDir = new File(System.getProperty("user.dir"));
                  output = new File(System.getProperty("user.dir"));
! 
!                 //sourcePath = new Path(getProject(), System.getProperty("user.dir"));
              } else {
                  destDir = baseDir;
                  output = baseDir;
! 
!                 //sourcePath = new Path(getProject(), baseDir.getAbsolutePath());
              }
  
              // set the Eclipse project name. This is required, so if it is null, we'll
              // leave it as such so as to give checkConfiguration() a chance to scream.
!             String name = getProject().getName();
!             projectName = name;
  
              // set the Eclipse project comment. This is optional, so we'll silently convert
--- 708,721 ----
                  destDir = new File(System.getProperty("user.dir"));
                  output = new File(System.getProperty("user.dir"));
!                 sourceDirs[0] = new File(System.getProperty("user.dir"));
              } else {
                  destDir = baseDir;
                  output = baseDir;
!                 sourceDirs[0] = baseDir;
              }
  
              // set the Eclipse project name. This is required, so if it is null, we'll
              // leave it as such so as to give checkConfiguration() a chance to scream.
!             projectName = getProject().getName();
  
              // set the Eclipse project comment. This is optional, so we'll silently convert
***************
*** 790,794 ****
          if (descendant.equals(ancestor)) {
              if ((descendant.getParentFile() != null) &&
!                     (descendant.toString().startsWith(fileSep))) {
                  // remove leading "/" or "\"
                  buffer.deleteCharAt(0);
--- 792,796 ----
          if (descendant.equals(ancestor)) {
              if ((descendant.getParentFile() != null) &&
!                     (buffer.toString().startsWith(fileSep))) {
                  // remove leading "/" or "\"
                  buffer.deleteCharAt(0);