Fixed GenericWhiteSpace for complex generics

This should fix issue https://github.com/checkstyle/checkstyle/issues/17