updated new error/warning settings for eclipse
removed unnecessary generics in then and thenEqual