1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed May 20 19:10:06 2009 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu May 21 10:56:36 2009 +0100
1.3 @@ -1165,3 +1165,64 @@
1.4 compiler.err.enums.not.supported.in.source=\
1.5 enums are not supported in -source {0}\n\
1.6 (use -source 5 or higher to enable enums)
1.7 +
1.8 +########################################
1.9 +# Diagnostics for where clause implementation
1.10 +# used by the RichDiagnosticFormatter.
1.11 +########################################
1.12 +
1.13 +compiler.misc.type.null=\
1.14 + <null>
1.15 +
1.16 +# X#n (where n is an int id) is disambiguated tvar name
1.17 +compiler.misc.type.var=\
1.18 + {0}#{1}
1.19 +
1.20 +# CAP#n (where n is an int id) is an abbreviation for 'captured type'
1.21 +compiler.misc.captured.type=\
1.22 + CAP#{0}
1.23 +
1.24 +# <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
1.25 +compiler.misc.intersection.type=\
1.26 + INT#{0}
1.27 +
1.28 +# where clause for captured type: contains upper ('extends {1}') and lower
1.29 +# ('super {2}') bound along with the wildcard that generated this captured type ({3})
1.30 +compiler.misc.where.captured=\
1.31 + {0} extends {1} super: {2} from capture of {3}
1.32 +
1.33 +# compact where clause for captured type: contains upper ('extends {1}') along
1.34 +# with the wildcard that generated this captured type ({3})
1.35 +compiler.misc.where.captured.1=\
1.36 + {0} extends {1} from capture of {3}
1.37 +
1.38 +# where clause for type variable: contains upper bound(s) ('extends {1}') along with
1.39 +# the kindname ({2}) and location ({3}) in which the typevar has been declared
1.40 +compiler.misc.where.typevar=\
1.41 + {0} extends {1} declared in {2} {3}
1.42 +
1.43 +# compact where clause for type variable: contains the kindname ({2}) and location ({3})
1.44 +# in which the typevar has been declared
1.45 +compiler.misc.where.typevar.1=\
1.46 + {0} declared in {2} {3}
1.47 +
1.48 +# where clause for type variable: contains all the upper bound(s) ('extends {1}')
1.49 +# of this intersection type
1.50 +compiler.misc.where.intersection=\
1.51 + {0} extends {1}
1.52 +
1.53 +### Where clause headers ###
1.54 +compiler.misc.where.description.captured=\
1.55 + where {0} is a fresh type-variable:
1.56 +compiler.misc.where.description.typevar=\
1.57 + where {0} is a type-variable:
1.58 +compiler.misc.where.description.intersection=\
1.59 + where {0} is an intersection type:
1.60 +compiler.misc.where.description.captured.1=\
1.61 + where {0} are fresh type-variables:
1.62 +compiler.misc.where.description.typevar.1=\
1.63 + where {0} are type-variables:
1.64 +compiler.misc.where.description.intersection.1=\
1.65 + where {0} are intersection types:
1.66 +
1.67 +
