Updated JDK and Netbeans

Changed versions, made sure the source used is java 7, and regenerated
the javadoc.