Added missing super call when generating hashCode in J7+. Fixed broken
outer type usage when generating hashCode and equals in J7+. Refactored
some code.

Change-Id: I4ba0ba1e0c6d48b8d2fa3980378cef0790023d58
Signed-off-by: Pierre-Yves B. <pyvesdev@gmail.com>