User: vharcq  
  Date: 02/04/14 10:00:59

  Modified:    src/xjavadoc XJavaDoc.java
  Log:
  1. Reset cache of sourceclasses when adding a sourceset (case of 2 ejbdoclet runs 
one after the other)
  2. Throw exception of duplicate files found only if they are really different files
  
  Revision  Changes    Path
  1.32      +2 -1      xjavadoc/src/xjavadoc/XJavaDoc.java
  
  Index: XJavaDoc.java
  ===================================================================
  RCS file: /cvsroot/xdoclet/xjavadoc/src/xjavadoc/XJavaDoc.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -w -r1.31 -r1.32
  --- XJavaDoc.java     12 Apr 2002 21:00:58 -0000      1.31
  +++ XJavaDoc.java     14 Apr 2002 17:00:59 -0000      1.32
  @@ -154,6 +154,7 @@
        public void addSourceSet(SourceSet sourceSet) {
                _sourceSets.add(sourceSet);
                _sourceFileCount += sourceSet.size();
  +             _xsourceClasses = null;
        }
   
   
  @@ -501,7 +502,7 @@
                        SourceSet sourceSet = (SourceSet)i.next();
                        File javaFile = sourceSet.getSourceFile(qualifiedName);
                        if (javaFile != null) {
  -                             if (found != null) {
  +                             if (found != null && 
!found.getAbsolutePath().equals(javaFile.getAbsolutePath())) {
                                        throw new IllegalStateException("Ambiguous 
sources for " + qualifiedName + " : " + found.getAbsolutePath() + " or " + 
javaFile.getAbsolutePath());
                                }
                                found = javaFile;
  
  
  

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to