src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties

rev 51258 : imported patch switch.diff

*** 47,56 ****
--- 47,57 ----
  # symbol            the name of a declared type
  # symbol kind       the kind of a symbol (i.e. method, variable)
  # kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
  # target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
  # token             the name of a non-terminal in source code; see compiler.misc.token.*
+ # tree tag          the name of a non-terminal in source code; see compiler.misc.token.*
  # type              a Java type; e.g. int, X, X<T>
  # url               a URL
  # object            a Java object (unspecified)
  # unused            the value is not used in this message
  #
*** 185,194 ****
--- 186,222 ----
      bad initializer for {0}
  
  compiler.err.break.outside.switch.loop=\
      break outside switch or loop
  
+ compiler.err.break.missing.value=\
+     missing break value
+ 
+ compiler.err.break.outside.switch.expression=\
+     break outside of enclosing switch expression
+ 
+ compiler.err.continue.outside.switch.expression=\
+     continue outside of enclosing switch expression
+ 
+ compiler.err.return.outside.switch.expression=\
+     return outside of enclosing switch expression
+ 
+ # 0: name
+ compiler.err.break.ambiguous.target=\
+     ambiguous reference to ''{0}''\n\
+     (''{0}'' is both a label and an expression)
+ 
+ # 0: tree tag
+ compiler.err.break.expr.not.immediate=\
+     value break not supported in ''{0}''
+ 
+ compiler.err.break.complex.value.no.switch.expression=\
+     unexpected value break
+ 
+ compiler.err.switch.expression.empty=\
+     switch expression does not have any case clauses
+ 
  # 0: name
  compiler.err.call.must.be.first.stmt.in.ctor=\
      call to {0} must be first statement in constructor
  
  # 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
*** 797,821 ****
      {0} is reserved for internal use
  
  compiler.err.native.meth.cant.have.body=\
      native methods cannot have a body
  
- # 0: type, 1: type
- compiler.err.neither.conditional.subtype=\
-     incompatible types for ?: neither is a subtype of the other\n\
-     second operand: {0}\n\
-     third operand : {1}
- 
  
  # 0: message segment
  compiler.misc.incompatible.type.in.conditional=\
      bad type in conditional expression\n\
      {0}
  
  compiler.misc.conditional.target.cant.be.void=\
      target-type for conditional expression cannot be void
  
  # 0: message segment
  compiler.misc.incompatible.ret.type.in.lambda=\
      bad return type in lambda expression\n\
      {0}
  
--- 825,851 ----
      {0} is reserved for internal use
  
  compiler.err.native.meth.cant.have.body=\
      native methods cannot have a body
  
  
  # 0: message segment
  compiler.misc.incompatible.type.in.conditional=\
      bad type in conditional expression\n\
      {0}
  
  compiler.misc.conditional.target.cant.be.void=\
      target-type for conditional expression cannot be void
  
+ compiler.misc.switch.expression.target.cant.be.void=\
+     target-type for switch expression cannot be void
+ 
+ # 0: message segment
+ compiler.misc.incompatible.type.in.switch.expression=\
+     bad type in switch expression\n\
+     {0}
+ 
  # 0: message segment
  compiler.misc.incompatible.ret.type.in.lambda=\
      bad return type in lambda expression\n\
      {0}
  
*** 1287,1296 ****
--- 1317,1329 ----
      reason: {1}
  
  compiler.err.unreachable.stmt=\
      unreachable statement
  
+ compiler.err.not.exhaustive=\
+     the switch expression does not cover all possible input values
+ 
  compiler.err.initializer.must.be.able.to.complete.normally=\
      initializer must be able to complete normally
  
  compiler.err.initializer.not.allowed=\
      initializers not allowed in interfaces
*** 2577,2586 ****
--- 2610,2635 ----
      static initializer
  
  compiler.misc.kindname.instance.init=\
      instance initializer
  
+ # the following are names of tree kinds:
+ compiler.misc.tree.tag.forloop=\
+     for
+ 
+ compiler.misc.tree.tag.foreachloop=\
+     enhanced for
+ 
+ compiler.misc.tree.tag.whileloop=\
+     while
+ 
+ compiler.misc.tree.tag.doloop=\
+     do
+ 
+ compiler.misc.tree.tag.switch=\
+     switch
+ 
  #####
  
  compiler.misc.no.args=\
      no arguments
  
*** 2766,2775 ****
--- 2815,2833 ----
      static interface method invocations
  
  compiler.misc.feature.private.intf.methods=\
      private interface methods
  
+ compiler.misc.feature.multiple.case.labels=\
+     multiple case labels
+ 
+ compiler.misc.feature.switch.rules=\
+     switch rules
+ 
+ compiler.misc.feature.switch.expressions=\
+     switch expressions
+ 
  compiler.warn.underscore.as.identifier=\
      as of release 9, ''_'' is a keyword, and may not be used as an identifier
  
  compiler.err.underscore.as.identifier=\
      as of release 9, ''_'' is a keyword, and may not be used as an identifier
*** 3255,3264 ****
--- 3313,3330 ----
  
  # 0: string, 1: string
  compiler.err.illegal.argument.for.option=\
      illegal argument for {0}: {1}
  
+ compiler.err.switch.null.not.allowed=\
+     null label in case is not allowed
+ 
+ compiler.err.switch.case.unexpected.statement=\
+     unexpected statement in case, expected is an expression, a block or a throw statement
+ 
+ compiler.err.switch.mixing.case.types=\
+     different case kinds used in the switch
  
  ############################################
  # messages previouly at javac.properties
  
  compiler.err.empty.A.argument=\