lol

Author: dfriveros11

src/main/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashOrder.java

@@ -1,7 +1,7 @@
 package edu.uniandes.tsdl.mutapk.hashfunction.sha3;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * University of Los Andes
@@ -18,7 +18,7 @@ public final class ApkHashOrder {
 	private static volatile ApkHashOrder instance;
 
 	private int id = 0;
-	private Map<ApkHashSeparator, ApkHashSeparator> apkHashesSeparator = new HashMap<ApkHashSeparator, ApkHashSeparator>();
+	private Set<ApkHashSeparator> apkHashesSeparator = new HashSet<ApkHashSeparator>();
 
 	/**
 	 * Enforce private constructor
@@ -37,15 +37,19 @@ public static ApkHashOrder getInstance() {
 	}
 
 	public synchronized ApkHashSeparator setApkHashSeparator(ApkHashSeparator nuevoApkHashSeparator) {
-		ApkHashSeparator apkHashSeparatorDuplicate = apkHashesSeparator.get(nuevoApkHashSeparator);
-		if(apkHashSeparatorDuplicate != null && nuevoApkHashSeparator.equals(apkHashSeparatorDuplicate)) {
-			return apkHashSeparatorDuplicate;
-		} else {
+		boolean isDuplicate = apkHashesSeparator.contains(nuevoApkHashSeparator);
+		if(isDuplicate) {
+			for(ApkHashSeparator apk : apkHashesSeparator) {
+				if(apk.equals(nuevoApkHashSeparator)) {
+					return apk;
+				}
+			}
+		}else {
 			nuevoApkHashSeparator.setId(id);
-			apkHashesSeparator.put(nuevoApkHashSeparator, nuevoApkHashSeparator);
+			apkHashesSeparator.add(nuevoApkHashSeparator);
 			id++;
-			return null;
 		}
+		return null;
 	}
 
 	public synchronized int getId() {

src/main/java/edu/uniandes/tsdl/mutapk/hashfunction/sha3/ApkHashSeparator.java

@@ -56,25 +56,33 @@ public String getHashResource() {
 	public int getMutanteId() {
 		return mutanteId;
 	}
-	
+
 	@Override
 	public boolean equals(Object o) {
 		if (o == this) {
 			return true;
-		} else if (!(o instanceof ApkHashSeparator)) {
+		}
+		if(o == null){
 			return false;
-		} else {
-			ApkHashSeparator apkHashseparator = (ApkHashSeparator) o;
-			return hashManifest.equals(apkHashseparator.getHashManifest())
-					&& hashSmali.equals(apkHashseparator.getHashSmali())
-					&& hashResource.equals(apkHashseparator.getHashResource());
 		}
+		if (!(o instanceof ApkHashSeparator)) {
+			return false;
+		}
+
+		ApkHashSeparator apkHashseparator = (ApkHashSeparator) o;
+		return (hashManifest.equals(apkHashseparator.getHashManifest())
+				&& hashSmali.equals(apkHashseparator.getHashSmali())
+				&& hashResource.equals(apkHashseparator.getHashResource()));
 
 	}
 
 	@Override
 	public int hashCode() {
-		return 1;
+		int hash = 7;
+        hash = 31 * hash + hashManifest.hashCode();
+        hash = 31 * hash + hashSmali.hashCode();
+        hash = 31 * hash + hashResource.hashCode();
+        return hash;
 	}
 
 	@Override