hg: jdk7/tl/jdk: 7011095: revert diamond changes from 6880112 that occur in method args

[stuart.marks at oracle.com]

Changeset: 6d0217114886
Author:    smarks
Date:      2011-01-11 13:42 -0800
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/6d0217114886

7011095: revert diamond changes from 6880112 that occur in method args
Reviewed-by: darcy, alanb

! src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
! src/share/classes/java/io/ObjectStreamClass.java
! src/share/classes/java/lang/StringCoding.java
! src/share/classes/java/util/logging/Logger.java