Reverted probably unintentional change to Enume...

Reverted probably unintentional change to Enumeration (the method
formerly called valueOf and now called withName needs to return
Option[Value], not Value) and updated the failing tests to use the new
Enumeration interface.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala
index e752fcd523..3dfd9bb740 100644
--- a/src/library/scala/Enumeration.scala
+++ b/src/library/scala/Enumeration.scala
@@ -113,12 +113,12 @@ abstract class Enumeration(initial: Int, names: String*) {
    * the argument <var>s</var>.
    * You must pass a String* set of names to the constructor,
    * or initialize each Enumeration with Value(String),
-   * for valueOf to work.
+   * for withName to work.
    * @param s an enumeration name
    * @return <tt>Some(Value)</tt> if an enumeration's name matches <var>s</var>,
    * else <tt>None</tt>
    */
-  def withName(s: String): Value = values.find(_.toString == s).get
+  def withName(s: String): Option[Value] = values.find(_.toString == s)
 
   /** Creates a fresh value, part of this enumeration. */
   protected final def Value: Value = Value(nextId)