Update of /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/src/java/org/commonjava/dirdigester
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20013/src/java/org/commonjava/dirdigester
Modified Files:
DirectoryDigester.java
Log Message:
added junit config for maven, and added the
compareAndWriteDirectoryDigest() method to allow
for incremental calculation and recording...
Index: DirectoryDigester.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/src/java/org/commonjava/dirdigester/DirectoryDigester.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DirectoryDigester.java 2 Feb 2004 15:09:50 -0000 1.3
+++ DirectoryDigester.java 2 Feb 2004 15:28:52 -0000 1.4
@@ -12,7 +12,6 @@
import java.io.ObjectOutputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -50,15 +49,21 @@
private DirectoryDigest _writeDirectoryDigest(DirDigestOptions info)
throws DirectoryDigestException
{
+ DirectoryDigest digest = _generateDigests(info);
+ doDigestWrite(digest);
+
+ return digest;
+ }
+
+ private void doDigestWrite(DirectoryDigest digest) throws DirectoryDigestException{
try {
- DirectoryDigest digest = _generateDigests(info);
- BufferedOutputStream bufferOut = new BufferedOutputStream(new FileOutputStream(info.getFile()));
+ BufferedOutputStream bufferOut = new BufferedOutputStream(
+ new FileOutputStream(digest.getOptions().getFile())
+ );
ObjectOutputStream out = new ObjectOutputStream(bufferOut);
out.writeObject(digest);
out.flush();
out.close();
-
- return digest;
}
catch (FileNotFoundException e){
throw new DirectoryDigestException("Error opening digest info file for writing.", e);
@@ -77,14 +82,23 @@
public String[] compareDirectoryWithDigest(DirDigestOptions info)
throws DirectoryDigestException
{
- ArrayList deltas = new ArrayList();
-
DirectoryDigest stored = _readDirectoryDigest(info);
DirectoryDigest generated = _generateDigests(info);
return generated.compareWithoutOptions(stored);
}
+ public String[] compareAndWriteDirectoryDigest(DirDigestOptions info)
+ throws DirectoryDigestException
+ {
+ DirectoryDigest stored = _readDirectoryDigest(info);
+ DirectoryDigest generated = _generateDigests(info);
+
+ String[] results = generated.compareWithoutOptions(stored);
+ doDigestWrite(generated);
+ return results;
+ }
+
private DirectoryDigest _readDirectoryDigest(DirDigestOptions info)
throws DirectoryDigestException
{
|
