summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-09-25 15:04:11 +0200
committerBjörn Hagemeister2014-09-25 15:04:11 +0200
commitbb4133db6e54b86c93a8134357756d669bca5f75 (patch)
tree047d3d6e112959b5749b4ecd78298066e073fa76 /src/main/java/org/openslx/imagemaster
parentRenamed *Infos -> *Data (diff)
downloadmaster-sync-shared-bb4133db6e54b86c93a8134357756d669bca5f75.tar.gz
master-sync-shared-bb4133db6e54b86c93a8134357756d669bca5f75.tar.xz
master-sync-shared-bb4133db6e54b86c93a8134357756d669bca5f75.zip
adapted to changes in CrcFile.
Diffstat (limited to 'src/main/java/org/openslx/imagemaster')
-rw-r--r--src/main/java/org/openslx/imagemaster/crcchecker/ClassTest.java1
-rw-r--r--src/main/java/org/openslx/imagemaster/crcchecker/CrcChecker.java12
-rw-r--r--src/main/java/org/openslx/imagemaster/crcchecker/CrcFile.java9
3 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/org/openslx/imagemaster/crcchecker/ClassTest.java b/src/main/java/org/openslx/imagemaster/crcchecker/ClassTest.java
index f1e878d..ba113c6 100644
--- a/src/main/java/org/openslx/imagemaster/crcchecker/ClassTest.java
+++ b/src/main/java/org/openslx/imagemaster/crcchecker/ClassTest.java
@@ -16,7 +16,6 @@ public class ClassTest
CrcFile f = new CrcFile( filenameCrc );
System.out.println( "Master sum: '" + f.getMasterSum() + "'" );
- System.out.println( f.getCrcSums() );
System.out.println( "CRC file is '" + ( ( f.isValid() ) ? "valid" : "invalid" ) + "'" );
ImageFile imageFile = new ImageFile( filename, blockSize );
diff --git a/src/main/java/org/openslx/imagemaster/crcchecker/CrcChecker.java b/src/main/java/org/openslx/imagemaster/crcchecker/CrcChecker.java
index 882f565..05fcfe3 100644
--- a/src/main/java/org/openslx/imagemaster/crcchecker/CrcChecker.java
+++ b/src/main/java/org/openslx/imagemaster/crcchecker/CrcChecker.java
@@ -31,11 +31,7 @@ public class CrcChecker
public boolean hasValidCrcFile()
{
- try {
- return crcFile.isValid();
- } catch ( IOException e ) {
- return false;
- }
+ return crcFile.isValid();
}
/**
@@ -69,11 +65,7 @@ public class CrcChecker
int crcSum = Integer.reverseBytes( (int)crcCalc.getValue() );
int crcSumFromFile;
- try {
- crcSumFromFile = crcFile.getCRCSum( blockNumber );
- } catch ( IOException e ) {
- throw new IOException( "crc", e );
- }
+ crcSumFromFile = crcFile.getCRCSum( blockNumber );
return ( crcSum == crcSumFromFile );
}
diff --git a/src/main/java/org/openslx/imagemaster/crcchecker/CrcFile.java b/src/main/java/org/openslx/imagemaster/crcchecker/CrcFile.java
index 370c714..e7a7970 100644
--- a/src/main/java/org/openslx/imagemaster/crcchecker/CrcFile.java
+++ b/src/main/java/org/openslx/imagemaster/crcchecker/CrcFile.java
@@ -6,6 +6,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.zip.CRC32;
@@ -138,6 +139,14 @@ public class CrcFile
return crcSums[blockNumber];
}
+ public List<Integer> getCrcSums()
+ {
+ List<Integer> ret = new ArrayList<Integer>( crcSums.length );
+ for ( int i = 0; i < crcSums.length; i++ )
+ ret.add( crcSums[i] );
+ return ret;
+ }
+
public int getMasterSum()
{
return masterCrc;