7020043: Project Coin: diamond allowed on non-generic type Summary: Diamond oerator should be disallowed on non-generic class types (i.e. String) Reviewed-by: jjg

6990136: Cleanup use of Type.clone() Summary: Introduced factory methods in class Types which can be used rather than clone(). Reviewed-by: jjg, mcimadamore

Merge

7017104: improve error reporting for uncaught/undeclared exceptions from try-with-resources Summary: twr should generate better error message when uncaught exceptions are thrown by implicit call of close() method Reviewed-by: jjg

7017664: Add listeners infrastracture to javac scopes Summary: Add listeners to javac scopes, added CompoundScope and correct invalidation logic for ImplementationCache Reviewed-by: jjg

7008433: Minor copyright changes Reviewed-by: jjg Contributed-by: kelly.ohair@oracle.com

6505047: javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter Reviewed-by: darcy

6485027: javac incorrectly handles relative paths in manifest classpath Reviewed-by: mcimadamore

7018452: langtools not buildable on Mac Reviewed-by: ohair

7018098: CacheFSInfo persists too long Reviewed-by: mcimadamore

7018447: langtools launcher template fails if tools run from their own directory Reviewed-by: jjg Contributed-by: daniel.smith@oracle.com

7010792: remove bad debugging method from javac Reviewed-by: mcimadamore

7016750: tools/javac/nio/CompileTest failing in nightly test Reviewed-by: mcimadamore

Added tag jdk7-b131 for changeset 4de608132976

Merge

Added tag jdk7-b131 for changeset a13a950d71df