diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-01-08 22:04:14 +0100 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-01-08 22:04:14 +0100 |
| commit | 61caba4bc51b0da5e8ddd0dffc8481df0432b876 (patch) | |
| tree | ac8734c30b47911ad21dff39c8929305b1066b4b /src | |
| parent | 3fafbc204fe2ce94e64c6893e74e3855dc875ae8 (diff) | |
| parent | ade2ce8623e0d923d922809f2b705732918281bc (diff) | |
| download | scala-61caba4bc51b0da5e8ddd0dffc8481df0432b876.tar.gz scala-61caba4bc51b0da5e8ddd0dffc8481df0432b876.tar.bz2 scala-61caba4bc51b0da5e8ddd0dffc8481df0432b876.zip | |
Merge pull request #4229 from Kornel/feature/SI-9067-enumeration-with-name-improvement
SI-9067: Enumeration withName improvement
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/Enumeration.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index e11d1b35d7..c4aa511cd7 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -121,7 +121,8 @@ abstract class Enumeration (initial: Int) extends Serializable { * @throws NoSuchElementException if no `Value` with a matching * name is in this `Enumeration` */ - final def withName(s: String): Value = values.find(_.toString == s).get + final def withName(s: String): Value = values.find(_.toString == s).getOrElse( + throw new NoSuchElementException(s"No value found for '$s'")) /** Creates a fresh value, part of this enumeration. */ protected final def Value: Value = Value(nextId) |