Making some recent changes less breaky so sbt c...

Making some recent changes less breaky so sbt can be used with trunk
again. Mainly, renamed scala.reflect.internal's AbstractFile to
AbstractFileType. I can't see a way around renaming it and it's becoming
quite a problem not to have sbt. I inspected scala-ide and I don't think
this is going to break it, but in general I don't know how plausible it
is that we can avoid periodic breakage given that we have at least three
source bases (scala, sbt, scala-ide) each with multiple branches with
interdependencies which are not being continuously integrated. Review by
odersky.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/reporters/Reporter.scala b/src/compiler/scala/tools/nsc/reporters/Reporter.scala
index 063181b061..d08e9288c3 100644
--- a/src/compiler/scala/tools/nsc/reporters/Reporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/Reporter.scala
@@ -7,7 +7,8 @@ package scala.tools.nsc
 package reporters
 
 import scala.tools.nsc.util._
-import scala.tools.util.StringOps._
+import scala.tools.util.StringOps
+import StringOps._
 
 /**
  * This interface provides methods to issue information, warning and
@@ -66,4 +67,10 @@ abstract class Reporter {
     WARNING.count     = 0
     cancelled         = false
   }
+
+  // sbt compat
+  @deprecated("Moved to scala.tools.util.StringOps", "2.10.0")
+  def countElementsAsString(n: Int, elements: String): String = StringOps.countElementsAsString(n, elements)
+  @deprecated("Moved to scala.tools.util.StringOps", "2.10.0")
+  def countAsString(n: Int): String = StringOps.countAsString(n)
 }