[zipdiff-cvs] zipdiff/src/main/zipdiff DifferenceCalculator.java,1.4,1.5

[Sean S. <su...@us...>]

Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23069/src/main/zipdiff

Modified Files:
	DifferenceCalculator.java 
Log Message:
improved method: isCVSFile


Index: DifferenceCalculator.java
===================================================================
RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/DifferenceCalculator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DifferenceCalculator.java	27 Jun 2004 19:06:41 -0000	1.4
--- DifferenceCalculator.java	7 Jul 2004 20:32:15 -0000	1.5
***************
*** 104,120 ****
       * @return true if the file should be ignored.
       */
!     protected boolean ignoreThisFile(String filepath, String filename) {
!         if (filename == null) {
              return false;
          }
!         else if (isCVSFile(filepath, filename) && (ignoreCVSFiles() ) ) {
          	return true;
          } else if (filesToIgnorePattern == null) {
              return false;
          } else {
!             Matcher m = filesToIgnorePattern.matcher(filename);
              boolean match = m.matches();
              if (match) {
!                 logger.log(Level.FINEST, "Found a match against : " + filename + " so excluding");
              }
              return match;
--- 104,120 ----
       * @return true if the file should be ignored.
       */
!     protected boolean ignoreThisFile(String filepath, String entryName) {
!         if (entryName == null) {
              return false;
          }
!         else if (isCVSFile(filepath, entryName) && (ignoreCVSFiles() ) ) {
          	return true;
          } else if (filesToIgnorePattern == null) {
              return false;
          } else {
!             Matcher m = filesToIgnorePattern.matcher(entryName);
              boolean match = m.matches();
              if (match) {
!                 logger.log(Level.FINEST, "Found a match against : " + entryName + " so excluding");
              }
              return match;
***************
*** 122,132 ****
      }
  
!     protected boolean isCVSFile(String filepath, String filename)
      {
!     	if (filename == null)
      	{
      		return false;
      	}
!     	else if ( (filepath.indexOf("CVS") != -1) || (filename.equals("CVS")))
  		{
  			return true;
--- 122,132 ----
      }
  
!     protected boolean isCVSFile(String filepath, String entryName)
      {
!     	if (entryName == null)
      	{
      		return false;
      	}
!     	else if ( (filepath.indexOf("CVS/") != -1) || (entryName.indexOf("CVS/") != -1))
  		{
  			return true;