Moved compareTo to CprSimple

Author: GreenWizard2015

src/Tests/Test_CFixedMinHeap.java

@@ -166,7 +166,7 @@ public void returnOrderedItems() {
 	}
 }
 
-class CItem extends CprSimple<String> implements Comparable<CItem> {
+class CItem extends CprSimple<String> {
 	public CItem(String value, int priority) {
 		super(value, priority);
 	}
@@ -179,12 +179,4 @@ public void setPriority(int i) {
 	public String toString() {
 		return value.toString() + " " + Priority();
 	}
-
-	@Override
-	public int compareTo(CItem o) {
-		final int diff = o._priority - _priority;
-		if (0 != diff)
-			return diff;
-		return o.value.compareTo(value);
-	}
 }

src/YASL/Collectors/Heap/CprSimple.java

@@ -1,6 +1,6 @@
 package YASL.Collectors.Heap;
 
-public class CprSimple<T> implements IPrioritizedItem<T> {
+public class CprSimple<T> implements IPrioritizedItem<T>, Comparable<CprSimple<T>> {
 	public final T	value;
 	protected int		_priority;
 
@@ -18,4 +18,13 @@ public int Priority() {
 	public T Value() {
 		return value;
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public int compareTo(CprSimple<T> o) {
+		final int diff = o._priority - _priority;
+		if (0 != diff)
+			return diff;
+		return ((Comparable<T>) o.value).compareTo(value);
+	}
 }