1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Mar 07 14:11:48 2011 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Mar 07 14:31:50 2011 +0000
1.3 @@ -1588,14 +1588,6 @@
1.4 compiler.misc.diamond.non.generic=\
1.5 cannot use ''<>'' with non-generic class {0}
1.6
1.7 -# 0: list of type, 1: message segment
1.8 -compiler.misc.diamond.invalid.arg=\
1.9 - type argument {0} inferred for {1} is not allowed in this context
1.10 -
1.11 -# 0: list of type, 1: message segment
1.12 -compiler.misc.diamond.invalid.args=\
1.13 - type arguments {0} inferred for {1} are not allowed in this context
1.14 -
1.15 # 0: type, 1: list of type
1.16 compiler.misc.explicit.param.do.not.conform.to.bounds=\
1.17 explicit type argument {0} does not conform to declared bound(s) {1}
1.18 @@ -1803,8 +1795,8 @@
1.19 compiler.misc.varargs.clash.with=\
1.20 {0} in {1} overrides {2} in {3}
1.21
1.22 -compiler.misc.non.denotable.type=\
1.23 - Non-denotable type {0} not allowed here
1.24 +compiler.misc.diamond.and.anon.class=\
1.25 + cannot use ''<>'' with anonymous inner classes
1.26
1.27 # 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
1.28 compiler.misc.inapplicable.method=\
