Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjphillips2011-04-18 18:33:18 +0000
committerRyan D. Brooks2011-04-18 18:33:18 +0000
commit2d073757354746d5fb1b31d788e4d57c8e4bf9a6 (patch)
tree129e85c1de459c02bb8196ccb4cd7cde9f185340
parent3e9c7daa8e80066c9f5e0d111f76d3344758c34f (diff)
downloadorg.eclipse.osee-2d073757354746d5fb1b31d788e4d57c8e4bf9a6.tar.gz
org.eclipse.osee-2d073757354746d5fb1b31d788e4d57c8e4bf9a6.tar.xz
org.eclipse.osee-2d073757354746d5fb1b31d788e4d57c8e4bf9a6.zip
refactor: Improve method naming
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/imageDetection/WordImageCompare.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/imageDetection/WordImageCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/imageDetection/WordImageCompare.java
index e60281a8f58..8a88254bd52 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/imageDetection/WordImageCompare.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/imageDetection/WordImageCompare.java
@@ -16,6 +16,10 @@ import javax.xml.bind.DatatypeConverter;
*/
public class WordImageCompare {
+ /**
+ * Compares images by detecting if they are compressed and using GZIPInputStream to deflate them or compares images
+ * by using the equals method.
+ */
public boolean compareFiles(String firstFile, String secondFile) throws IOException {
return handleCompare(firstFile, secondFile);
}
@@ -28,7 +32,7 @@ public class WordImageCompare {
InputStream secondStream = getInputStream(secondFile);
if (handler.isValid(firstStream) && handler.isValid(secondStream)) {
- isEqual = compareBytes(getConvertedByteArray(firstStream), getConvertedByteArray(secondStream));
+ isEqual = compareGZIPImages(getUncompressedByteArray(firstStream), getUncompressedByteArray(secondStream));
} else {
isEqual = firstFile.equals(secondFile);
}
@@ -40,7 +44,7 @@ public class WordImageCompare {
return new ByteArrayInputStream(data);
}
- private byte[] getConvertedByteArray(InputStream inputStream) throws IOException {
+ private byte[] getUncompressedByteArray(InputStream inputStream) throws IOException {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
EMZHtmlImageHandler handler = new EMZHtmlImageHandler();
@@ -48,10 +52,10 @@ public class WordImageCompare {
return outputStream.toByteArray();
}
- private boolean compareBytes(byte[] firstbytes, byte[] secondbytes) {
+ private boolean compareGZIPImages(byte[] firstbytes, byte[] secondbytes) {
boolean isEqual = false;
- if (firstbytes.length == secondbytes.length) {
+ if (firstbytes.length == secondbytes.length && secondbytes.length > 0) {
isEqual = true;
for (int i = 0; i < firstbytes.length; i++) {

Back to the top