Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18536/src/main/zipdiff
Modified Files:
DifferenceCalculator.java
Log Message:
Index: DifferenceCalculator.java
===================================================================
RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/DifferenceCalculator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DifferenceCalculator.java 12 Jun 2004 14:57:24 -0000 1.3
--- DifferenceCalculator.java 27 Jun 2004 19:06:41 -0000 1.4
***************
*** 24,27 ****
--- 24,28 ----
private ZipFile file2;
private boolean ignoreTimestamps = false;
+ private boolean ignoreCVSFiles = false;
private boolean compareCRCValues = true;
private Pattern filesToIgnorePattern;
***************
*** 99,108 ****
/**
* returns true if fileToIgnorePattern matches the filename given.
* @param filename The name of the file to check to see if it should be ignored.
* @return true if the file should be ignored.
*/
! protected boolean ignoreThisFile(String filename) {
if (filename == null) {
return false;
} else if (filesToIgnorePattern == null) {
return false;
--- 100,113 ----
/**
* returns true if fileToIgnorePattern matches the filename given.
+ * @param filepath
* @param filename The name of the file to check to see if it should be ignored.
* @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;
***************
*** 117,120 ****
--- 122,140 ----
}
+ protected boolean isCVSFile(String filepath, String filename)
+ {
+ if (filename == null)
+ {
+ return false;
+ }
+ else if ( (filepath.indexOf("CVS") != -1) || (filename.equals("CVS")))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
/**
* Ensure that the comparison checks against the CRCs of the entries.
***************
*** 177,181 ****
*/
protected void processZipEntry(String prefix, ZipEntry zipEntry, InputStream is, Map zipEntryMap) throws IOException {
! if (ignoreThisFile(zipEntry.getName())) {
logger.log(Level.FINE, "ignoring file: " + zipEntry.getName());
} else {
--- 197,201 ----
*/
protected void processZipEntry(String prefix, ZipEntry zipEntry, InputStream is, Map zipEntryMap) throws IOException {
! if (ignoreThisFile(prefix, zipEntry.getName())) {
logger.log(Level.FINE, "ignoring file: " + zipEntry.getName());
} else {
***************
*** 284,288 ****
}
} else {
! throw new IllegalStateException("todo");
}
}
--- 304,308 ----
}
} else {
! throw new IllegalStateException("unexpected state");
}
}
***************
*** 325,328 ****
--- 345,358 ----
}
+ public boolean ignoreCVSFiles()
+ {
+ return ignoreCVSFiles;
+ }
+
+ public void setIgnoreCVSFiles(boolean b)
+ {
+ ignoreCVSFiles = b;
+ }
+
/**
*
|
