Handle Annotations as well in java export
Improve the handling of base classes in java export