Changed deprecated attribute
Fixed javadoc incompatibility with jdk1.7