From: Seigel, J. <Jam...@av...> - 2005-08-03 16:17:46
|
Jeremy, =20 Did you leave out some CCN calculations in your changes? I noticed line 688 in HtmlReport some commented out ccn calculations, and it looks like you are missing some filefinder references in there...but I could be wrong :D =20 Cheers J =20 =20 =20 ________________________________ From: cob...@li... [mailto:cob...@li...] On Behalf Of Jeremy Thomerson Sent: Tuesday, August 02, 2005 11:39 PM To: Grzegorz Lukasik Cc: cob...@li... Subject: Re: [Cobertura-devel] Re: Cobertura 1.5 =20 Okay, all the changes are committed for the filesets changes. Grzegorz, I couldn't add your changes, I'll let you. I really wanted to, but there were so many other changes, it made it daunting. =20 =20 One thing to note: Mark committed some changes today that were from various patches, and I had to manually merge a couple of files because there were so many conflicting changes in the same class (since I pretty much entirely rewrote a couple of classes). The only one that I'm concerned about is instrumenting/Main.java. I think that came from Grzegorz's patch if I'm not mistaken. I think I got everything, but could you just check to make sure? It looked like most of your changes in it revolved around regexes being a Collection rather than a Pattern, but I had so many changes in that class it was hard to tell.=20 =20 If I messed anyone's patch up, I am sincerely sorry. I'll owe you a beer, and I'll do anything I can to help you get it back to what you had submitted. =20 Thanks to everyone! Please test this (with multiple source directories) and let me know if you find anything that needs to be looked at. If you pull down the latest code from CVS and do a build, it includes the multiple directories so we can see it work.=20 =20 The only regrettable thing that this commit did is commented out our XMLReportTest. I didn't have time to look into what it would take to switch it to be operable with the current ReportTask. It looked like it was passing in command line arguments, which has now changed to a command file, and it was just too much for right then. If someone want to convert it (and write any other unit tests for the multi-filesets), that would be great. =20 =20 JT =20 |