diff options
Diffstat (limited to 'src')
13 files changed, 34 insertions, 30 deletions
diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala index e182bb5f8a..6f2bcdb74a 100644 --- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala +++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala @@ -158,6 +158,7 @@ class InterpreterLoop(in0: Option[BufferedReader], protected val out: PrintWrite |// scala> %s""".stripMargin println(template.format(line.thread, line.code)) + // XXX no way to suppress the deprecation warning line.thread.stop() in.redrawLine() } diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala index d51997a1f9..49c6b2ffba 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala @@ -323,11 +323,12 @@ trait MarkupParsers /** Use a lookahead parser to run speculative body, and return the first char afterward. */ private def charComingAfter(body: => Unit): Char = { - input = input.lookaheadReader - body - val res = ch - input = parser.in - res + try { + input = input.lookaheadReader + body + ch + } + finally input = parser.in } /** xLiteral = element { element } diff --git a/src/continuations/library/scala/util/continuations/ControlContext.scala b/src/continuations/library/scala/util/continuations/ControlContext.scala index 6d7766f173..f183f99764 100644 --- a/src/continuations/library/scala/util/continuations/ControlContext.scala +++ b/src/continuations/library/scala/util/continuations/ControlContext.scala @@ -1,15 +1,15 @@ // $Id$ package scala.util.continuations +import annotation.{ Annotation, StaticAnnotation, TypeConstraint } - -class cpsParam[-B,+C] extends annotation.StaticAnnotation with TypeConstraint +class cpsParam[-B,+C] extends StaticAnnotation with TypeConstraint private class cpsSym[B] extends Annotation // implementation detail private class cpsSynth extends Annotation // implementation detail -private class cpsPlus extends annotation.StaticAnnotation with TypeConstraint // implementation detail +private class cpsPlus extends StaticAnnotation with TypeConstraint // implementation detail private class cpsMinus extends Annotation // implementation detail diff --git a/src/library/scala/collection/immutable/HashMap.scala b/src/library/scala/collection/immutable/HashMap.scala index f6e17e9630..e0d57b019e 100644 --- a/src/library/scala/collection/immutable/HashMap.scala +++ b/src/library/scala/collection/immutable/HashMap.scala @@ -520,16 +520,17 @@ time { mNew.iterator.foreach( p => ()) } posD += 1 elems(i) match { - case m: HashTrieMap[A,B] => // push current pos onto stack and descend + case m: HashTrieMap[_, _] => // push current pos onto stack and descend if (depth >= 0) { arrayStack(depth) = arrayD posStack(depth) = posD } depth += 1 - arrayD = m.elems + val elems = m.elems.asInstanceOf[Array[HashMap[A, B]]] + arrayD = elems posD = 0 - next0(m.elems, 0) - case m: HashMap1[A,B] => m.ensurePair + next0(elems, 0) + case m: HashMap1[_, _] => m.ensurePair case m => subIter = m.iterator subIter.next diff --git a/src/library/scala/collection/immutable/HashSet.scala b/src/library/scala/collection/immutable/HashSet.scala index 720ea29639..8868344803 100644 --- a/src/library/scala/collection/immutable/HashSet.scala +++ b/src/library/scala/collection/immutable/HashSet.scala @@ -332,16 +332,17 @@ time { mNew.iterator.foreach( p => ()) } posD += 1 elems(i) match { - case m: HashTrieSet[A] => // push current pos onto stack and descend + case m: HashTrieSet[_] => // push current pos onto stack and descend if (depth >= 0) { arrayStack(depth) = arrayD posStack(depth) = posD } depth += 1 - arrayD = m.elems + val elems = m.elems.asInstanceOf[Array[HashSet[A]]] + arrayD = elems posD = 0 - next0(m.elems, 0) - case m: HashSet1[A] => m.key + next0(elems, 0) + case m: HashSet1[_] => m.key case m => subIter = m.iterator next diff --git a/src/library/scala/collection/parallel/Tasks.scala b/src/library/scala/collection/parallel/Tasks.scala index 964e01e8d1..662a600d42 100644 --- a/src/library/scala/collection/parallel/Tasks.scala +++ b/src/library/scala/collection/parallel/Tasks.scala @@ -354,7 +354,7 @@ trait ForkJoinTasks extends Tasks with HavingForkJoinPool { def execute[R, Tp](task: Task[R, Tp]): () => R = { val fjtask = newTaskImpl(task) - if (currentThread.isInstanceOf[ForkJoinWorkerThread]) { + if (Thread.currentThread.isInstanceOf[ForkJoinWorkerThread]) { fjtask.fork } else { forkJoinPool.execute(fjtask) @@ -377,7 +377,7 @@ trait ForkJoinTasks extends Tasks with HavingForkJoinPool { def executeAndWaitResult[R, Tp](task: Task[R, Tp]): R = { val fjtask = newTaskImpl(task) - if (currentThread.isInstanceOf[ForkJoinWorkerThread]) { + if (Thread.currentThread.isInstanceOf[ForkJoinWorkerThread]) { fjtask.fork } else { forkJoinPool.execute(fjtask) diff --git a/src/library/scala/reflect/BeanDescription.scala b/src/library/scala/reflect/BeanDescription.scala index 74ce8f2d37..eb3c7bbd47 100644 --- a/src/library/scala/reflect/BeanDescription.scala +++ b/src/library/scala/reflect/BeanDescription.scala @@ -15,5 +15,5 @@ package scala.reflect * * @author Ross Judson (rjudson@managedobjects.com) */ -class BeanDescription(val description: String) extends Annotation +class BeanDescription(val description: String) extends annotation.Annotation diff --git a/src/library/scala/reflect/BeanDisplayName.scala b/src/library/scala/reflect/BeanDisplayName.scala index 414905ae93..f644ff6e1d 100644 --- a/src/library/scala/reflect/BeanDisplayName.scala +++ b/src/library/scala/reflect/BeanDisplayName.scala @@ -14,5 +14,5 @@ package scala.reflect * * @author Ross Judson (rjudson@managedobjects.com) */ -class BeanDisplayName(val name: String) extends Annotation +class BeanDisplayName(val name: String) extends annotation.Annotation diff --git a/src/library/scala/reflect/BeanInfo.scala b/src/library/scala/reflect/BeanInfo.scala index 5153263f6f..0fdbbd4e0b 100644 --- a/src/library/scala/reflect/BeanInfo.scala +++ b/src/library/scala/reflect/BeanInfo.scala @@ -18,4 +18,4 @@ package scala.reflect * * @author Ross Judson (rjudson@managedobjects.com) */ -class BeanInfo extends Annotation +class BeanInfo extends annotation.Annotation diff --git a/src/library/scala/reflect/BeanInfoSkip.scala b/src/library/scala/reflect/BeanInfoSkip.scala index f480f6c7b5..8c431c625d 100644 --- a/src/library/scala/reflect/BeanInfoSkip.scala +++ b/src/library/scala/reflect/BeanInfoSkip.scala @@ -15,4 +15,4 @@ package scala.reflect * * @author Ross Judson (rjudson@managedobjects.com) */ -class BeanInfoSkip extends Annotation +class BeanInfoSkip extends annotation.Annotation diff --git a/src/library/scala/unchecked.scala b/src/library/scala/unchecked.scala index 7cdce63380..9fe7209da5 100644 --- a/src/library/scala/unchecked.scala +++ b/src/library/scala/unchecked.scala @@ -41,4 +41,4 @@ package scala * * @since 2.4 */ -class unchecked extends Annotation {} +class unchecked extends annotation.Annotation {} diff --git a/src/library/scala/xml/parsing/MarkupParserCommon.scala b/src/library/scala/xml/parsing/MarkupParserCommon.scala index df7b4b83e9..3b31f9976e 100644 --- a/src/library/scala/xml/parsing/MarkupParserCommon.scala +++ b/src/library/scala/xml/parsing/MarkupParserCommon.scala @@ -218,7 +218,7 @@ private[scala] trait MarkupParserCommon extends TokenTests { def returning[T](x: T)(f: T => Unit): T = { f(x) ; x } /** Execute body with a variable saved and restored after execution */ - def saving[A,B](getter: A, setter: (A) => Unit)(body: => B): B = { + def saving[A, B](getter: A, setter: A => Unit)(body: => B): B = { val saved = getter try body finally setter(saved) @@ -234,8 +234,8 @@ private[scala] trait MarkupParserCommon extends TokenTests { until: String): T = { val sb = new StringBuilder - val head = until charAt 0 - val rest = until drop 1 + val head = until.head + val rest = until.tail while (true) { if (ch == head && peek(rest)) diff --git a/src/swing/scala/swing/Component.scala b/src/swing/scala/swing/Component.scala index 62344bdb45..bdc9a4ba32 100644 --- a/src/swing/scala/swing/Component.scala +++ b/src/swing/scala/swing/Component.scala @@ -205,16 +205,16 @@ abstract class Component extends UIElement { // TODO: deprecated, remove after 2.8 peer.addComponentListener(new java.awt.event.ComponentListener { def componentHidden(e: java.awt.event.ComponentEvent) { - publish(ComponentHidden(Component.this)) + publish(UIElementHidden(Component.this)) } def componentShown(e: java.awt.event.ComponentEvent) { - publish(ComponentShown(Component.this)) + publish(UIElementShown(Component.this)) } def componentMoved(e: java.awt.event.ComponentEvent) { - publish(ComponentMoved(Component.this)) + publish(UIElementMoved(Component.this)) } def componentResized(e: java.awt.event.ComponentEvent) { - publish(ComponentResized(Component.this)) + publish(UIElementResized(Component.this)) } }) |