[Nice-commit] Nice/src/bossa/modules JarCompiledContent.java,1.6,1.7

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1064/src/bossa/modules

Modified Files:
	JarCompiledContent.java 
Log Message:
Take into account the date of the jar file itself, to be sure to recompile
importing packages when the jar was created after compilation.


Index: JarCompiledContent.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/modules/JarCompiledContent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JarCompiledContent.java	3 May 2002 10:05:53 -0000	1.6
--- JarCompiledContent.java	23 Jul 2004 21:55:51 -0000	1.7
***************
*** 47,52 ****
        (pkg, jar, itfEntry, bytecodeEntry, dispatchEntry);
    }
!   
!   JarCompiledContent(Package pkg, JarFile jar, JarEntry itfEntry, 
  		     JarEntry bytecodeEntry, JarEntry dispatchEntry)
    {
--- 47,52 ----
        (pkg, jar, itfEntry, bytecodeEntry, dispatchEntry);
    }
! 
!   JarCompiledContent(Package pkg, JarFile jar, JarEntry itfEntry,
  		     JarEntry bytecodeEntry, JarEntry dispatchEntry)
    {
***************
*** 58,64 ****
      this.dispatchEntry = dispatchEntry;
  
!     this.lastCompilation = 
        Math.min(itfEntry.getTime(),
! 	       Math.min(bytecodeEntry.getTime(), dispatchEntry.getTime()));
    }
  
--- 58,73 ----
      this.dispatchEntry = dispatchEntry;
  
!     this.lastCompilation =
        Math.min(itfEntry.getTime(),
!       Math.min(bytecodeEntry.getTime(),
!                dispatchEntry.getTime()));
! 
!     /* Use the date of creation of the jar file if it is later.
!        The package might have been compiled earlier, but we probably did
!        not get to see it before it was put into this jar.
!        This is in particular the case if the jar is an upgraded library.
!     */
!     this.lastCompilation =
!       Math.max(new File(jar.getName()).lastModified(), this.lastCompilation);
    }