diff src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties @ 50383:0798eab12791

8201281: Truncated error message with Incompatible : null Reviewed-by: mcimadamore
author vromero
date Tue, 24 Apr 2018 08:13:30 -0700
parents 53aae0c219e6
children aa4fef2d96aa ba40e4b23672 e675675e008f 3a28f370bb31 99505cbf13d7 1b996bb06569 bd67c4c39953 66b0f0134aad
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	Mon Apr 23 19:32:41 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	Tue Apr 24 08:13:30 2018 -0700
@@ -2302,6 +2302,7 @@
 compiler.misc.no.unique.maximal.instance.exists=\
     no unique maximal instance exists for type variable {0} with upper bounds {1}
 
+# 0: type, 1: list of type
 compiler.misc.no.unique.minimal.instance.exists=\
     no unique minimal instance exists for type variable {0} with lower bounds {1}
 
@@ -2313,23 +2314,23 @@
 compiler.misc.incompatible.eq.bounds=\
     inference variable {0} has incompatible equality constraints {1}
 
-# 0: type, 1: list of type, 2: list of type
-compiler.misc.incompatible.eq.upper.bounds=\
+# 0: type, 1: fragment, 2: fragment
+compiler.misc.incompatible.bounds=\
     inference variable {0} has incompatible bounds\n\
-    equality constraints: {1}\n\
-    upper bounds: {2}
-
-# 0: type, 1: list of type, 2: list of type
-compiler.misc.incompatible.upper.lower.bounds=\
-    inference variable {0} has incompatible bounds\n\
-    upper bounds: {1}\n\
-    lower bounds: {2}
-
-# 0: type, 1: list of type, 2: list of type
-compiler.misc.incompatible.eq.lower.bounds=\
-    inference variable {0} has incompatible bounds\n\
-    equality constraints: {1}\n\
-    lower bounds: {2}
+    {1}\n\
+    {2}
+
+# 0: list of type
+compiler.misc.lower.bounds=\
+        lower bounds: {0}
+
+# 0: list of type
+compiler.misc.eq.bounds=\
+        equality constraints: {0}
+
+# 0: list of type
+compiler.misc.upper.bounds=\
+        lower bounds: {0}
 
 # 0: list of type, 1: type, 2: type
 compiler.misc.infer.no.conforming.instance.exists=\