class types are better resolved where doable

commons/src/main/java/lcsb/mapviewer/common/Comparator.java

@@ -26,6 +26,7 @@ public abstract class Comparator<T extends Object> implements java.util.Comparat
     this.exactClassMatch = exactClassMatch;
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   @Override
   public final int compare(T arg0, T arg1) {
     if (arg0 == null) {
@@ -58,8 +59,8 @@ public abstract class Comparator<T extends Object> implements java.util.Comparat
     }
   }
 
-  private Comparator getSubClassComparatorForClass(Class<? extends Object> clazz) {
-    for (Comparator comparator : subClassComparatorList) {
+  private Comparator<? extends T> getSubClassComparatorForClass(Class<? extends Object> clazz) {
+    for (Comparator<? extends T> comparator : subClassComparatorList) {
       if (comparator.getComparatorClazz().isAssignableFrom(clazz)) {
         return comparator;
       }
@@ -67,6 +68,7 @@ public abstract class Comparator<T extends Object> implements java.util.Comparat
     return null;
   }
 
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   private int compareParents(T arg0, T arg1) {
     Comparator parentComparator = getParentComparator();
     while (parentComparator != null) {
@@ -80,7 +82,7 @@ public abstract class Comparator<T extends Object> implements java.util.Comparat
 
   }
 
-  protected Comparator getParentComparator() {
+  protected Comparator<?> getParentComparator() {
     return null;
   }