[zipdiff-cvs] zipdiff/src/main/zipdiff DifferenceCalculator.java,1.5,1.6
Status: Alpha
Brought to you by:
sullis
From: Sean S. <su...@us...> - 2004-07-07 20:46:48
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25877/src/main/zipdiff Modified Files: DifferenceCalculator.java Log Message: cleanup code that detects CVS folders Index: DifferenceCalculator.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/DifferenceCalculator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DifferenceCalculator.java 7 Jul 2004 20:32:15 -0000 1.5 --- DifferenceCalculator.java 7 Jul 2004 20:46:38 -0000 1.6 *************** *** 293,297 **** while (iterAllNames.hasNext()) { String name = (String) iterAllNames.next(); ! if (names1.contains(name) && (!names2.contains(name))) { d.fileRemoved(name, (ZipEntry) m1.get(name)); } else if (names2.contains(name) && (!names1.contains(name))) { --- 293,300 ---- while (iterAllNames.hasNext()) { String name = (String) iterAllNames.next(); ! if (ignoreThisFile("", name)) { ! // do nothing ! } ! else if (names1.contains(name) && (!names2.contains(name))) { d.fileRemoved(name, (ZipEntry) m1.get(name)); } else if (names2.contains(name) && (!names1.contains(name))) { |