diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-01-17 20:05:30 +0100 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-01-17 20:52:24 +0100 |
| commit | 2ee85683cdd2f8f41508fef0880edb31c1d97a4c (patch) | |
| tree | bba4b392fd016508538949978ad6cecdc9173aa9 /src/library/scala/Enumeration.scala | |
| parent | 167fc0acb9bc75f3f378d2bfbabd61a2782a3568 (diff) | |
| download | scala-2ee85683cdd2f8f41508fef0880edb31c1d97a4c.tar.gz scala-2ee85683cdd2f8f41508fef0880edb31c1d97a4c.tar.bz2 scala-2ee85683cdd2f8f41508fef0880edb31c1d97a4c.zip | |
SI-6811 Remove deprecated constructors
Diffstat (limited to 'src/library/scala/Enumeration.scala')
| -rw-r--r-- | src/library/scala/Enumeration.scala | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 47d7840e27..21f0c8fd3e 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -56,14 +56,6 @@ abstract class Enumeration (initial: Int) extends Serializable { def this() = this(0) - @deprecated("Names should be specified individually or discovered via reflection", "2.10.0") - def this(initial: Int, names: String*) = { - this(initial) - this.nextName = names.iterator - } - @deprecated("Names should be specified individually or discovered via reflection", "2.10.0") - def this(names: String*) = this(0, names: _*) - /* Note that `readResolve` cannot be private, since otherwise the JVM does not invoke it when deserializing subclasses. */ protected def readResolve(): AnyRef = thisenum.getClass.getField(MODULE_INSTANCE_NAME).get(null) @@ -71,7 +63,7 @@ abstract class Enumeration (initial: Int) extends Serializable { /** The name of this enumeration. */ override def toString = - ((getClass.getName stripSuffix MODULE_SUFFIX_STRING split '.').last split + ((getClass.getName stripSuffix MODULE_SUFFIX_STRING split '.').last split Pattern.quote(NAME_JOIN_STRING)).last /** The mapping from the integer used to identify values to the actual @@ -126,7 +118,7 @@ abstract class Enumeration (initial: Int) extends Serializable { * * @param s an `Enumeration` name * @return the `Value` of this `Enumeration` if its name matches `s` - * @throws java.util.NoSuchElementException if no `Value` with a matching + * @throws NoSuchElementException if no `Value` with a matching * name is in this `Enumeration` */ final def withName(s: String): Value = values.find(_.toString == s).get |