There are many tools as per your requirement.
But I felt this one will suit your the best.
Please follow the link.Its free too.
Eclipse Plugin Central :: Eclipse plugin resource center and marketplace for Eclipse and Plugin Ecosystem
If you want more plug-ins like that and you were not happy with the earlier one.
Also in that particular page you can find UML on the left side of the page.
Just click on that there some 34 plug-ins related to your requirement I think.
I am working for basically the Reverse Engineering part.
So if you have any idea of any plugin just let me know.
Regards,
Vipin Nair.