# HG changeset patch
# User jjg
# Date 1278977866 25200
# Node ID 03b276d8e6a6468667facaf6ed2b5eba07e9b596
# Parent  50004868a7875fe917059f3bc51d4bfebe697bc6
6968497: localized text appears in raw diagnostic
Reviewed-by: darcy

diff -r 50004868a787 -r 03b276d8e6a6 langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed Jun 30 18:06:29 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Mon Jul 12 16:37:46 2010 -0700
@@ -563,7 +563,7 @@
             while (args.nonEmpty()) {
                 if (args.head.tag == WILDCARD)
                     return typeTagError(pos,
-                                        Log.getLocalizedString("type.req.exact"),
+                                        diags.fragment("type.req.exact"),
                                         args.head);
                 args = args.tail;
             }
diff -r 50004868a787 -r 03b276d8e6a6 langtools/test/tools/javac/generics/6946618/T6946618c.java
--- a/langtools/test/tools/javac/generics/6946618/T6946618c.java	Wed Jun 30 18:06:29 2010 -0700
+++ b/langtools/test/tools/javac/generics/6946618/T6946618c.java	Mon Jul 12 16:37:46 2010 -0700
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug     6946618
+ * @bug     6946618 6968497
  * @summary sqe test fails: javac/generics/NewOnTypeParm  in pit jdk7 b91 in all platforms.
  * @author  mcimadamore
  * @compile/fail/ref=T6946618c.out -XDrawDiagnostics T6946618c.java
diff -r 50004868a787 -r 03b276d8e6a6 langtools/test/tools/javac/generics/6946618/T6946618c.out
--- a/langtools/test/tools/javac/generics/6946618/T6946618c.out	Wed Jun 30 18:06:29 2010 -0700
+++ b/langtools/test/tools/javac/generics/6946618/T6946618c.out	Mon Jul 12 16:37:46 2010 -0700
@@ -1,4 +1,4 @@
-T6946618c.java:13:24: compiler.err.type.found.req: ? extends java.lang.String, class or interface without bounds
-T6946618c.java:14:24: compiler.err.type.found.req: ? super java.lang.String, class or interface without bounds
-T6946618c.java:15:24: compiler.err.type.found.req: ?, class or interface without bounds
+T6946618c.java:13:24: compiler.err.type.found.req: ? extends java.lang.String, (compiler.misc.type.req.exact)
+T6946618c.java:14:24: compiler.err.type.found.req: ? super java.lang.String, (compiler.misc.type.req.exact)
+T6946618c.java:15:24: compiler.err.type.found.req: ?, (compiler.misc.type.req.exact)
 3 errors