I'll second the Eclipse vote. Sure, it has plenty of Enterprise-y cruft, but if you peel off (close) most of it, you've got a really great editor with version control integration for all major flavors(svn,cvs,git,etc...) and you can probably find an editor plugin for any language under the sun that is half decent. I don't love Java, but I sure do like Eclipse.