Fixed deprecation warnings for things that are deprecated since 2.9.0…

… and may be removed in 2.10.
scala-ide · May 16, 2012 · 4714a0d · 4714a0d
1 parent 93cf236
commit 4714a0d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaProject.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaProject.scala
@@ -361,7 +361,7 @@ class ScalaProject private (val underlying: IProject) extends HasLogger {
     for {
       srcEntry <- javaProject.getResolvedClasspath(true)
       if srcEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE
-      val srcFolder = ScalaPlugin.plugin.workspaceRoot.findMember(srcEntry.getPath()) 
+      srcFolder = ScalaPlugin.plugin.workspaceRoot.findMember(srcEntry.getPath()) 
       if srcFolder ne null
     } {
       val inclusionPatterns = fullPatternChars(srcEntry, srcEntry.getInclusionPatterns())

diff --git a/...sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/EclipseSbtBuildManager.scala b/...sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/EclipseSbtBuildManager.scala
@@ -55,7 +55,7 @@ private object SbtConverter {
 		if(!line.isEmpty)
 		{
 			val lineContent = pos.lineContent.stripLineEnd
-			val offsetO = o(pos.offset)
+			val offsetO = o(pos.point)
 			val opt(pointer, pointerSpace) =
 				for(offset <- offsetO; src <- srcO) yield
 				{

diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/interpreter/EclipseRepl.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/interpreter/EclipseRepl.scala
@@ -2,7 +2,7 @@ package scala.tools.eclipse.interpreter
 
 import scala.actors.Actor
 import scala.collection.mutable.ListBuffer
-import scala.tools.nsc.InterpreterResults.Result
+import scala.tools.nsc.interpreter.Results.Result
 import scala.tools.nsc.Settings
 
 // Unit tests found in org.scala-ide.sdt.core.tests/src:
@@ -145,7 +145,7 @@ object EclipseRepl
   {
     def interpreter(i: Init) = new Interpreter
     {
-      val intp = new scala.tools.nsc.Interpreter(i)
+      val intp = new scala.tools.nsc.interpreter.IMain(i)
       intp.initializeSynchronous()
 
       def interpret(e: Exec) = {

diff --git a/...sdt.core/src/scala/tools/eclipse/interpreter/InterpreterLaunchConfigurationDelegate.scala b/...sdt.core/src/scala/tools/eclipse/interpreter/InterpreterLaunchConfigurationDelegate.scala
@@ -101,7 +101,7 @@ class InterpreterLaunchConfigurationDelegate extends AbstractJavaLaunchConfigura
       def seedInterpreter(namespace : Option[String], asNamespace : Boolean) {
        for {pkg <- namespace
            process <- launch.getProcesses
-           val streamProxy = process.getStreamsProxy
+           streamProxy = process.getStreamsProxy
            if streamProxy != null
        } {
          //TODO - Don't just write, flush!

diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/interpreter/ReplConsoleView.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/interpreter/ReplConsoleView.scala
@@ -57,7 +57,7 @@ class ReplConsoleView extends ViewPart {
     new EclipseRepl.Client {
       def run(f: => Unit) = SWTUtils.asyncExec(if (view != null) f)
       import EclipseRepl._
-      import scala.tools.nsc.InterpreterResults._
+      import scala.tools.nsc.interpreter.Results._
 
       override def done(exec: Exec, result: Result, output: String) {run{
         if (exec ne ReplConsoleView.HideBareExit) {
@@ -173,7 +173,7 @@ class ReplConsoleView extends ViewPart {
     for { opt <- Seq( ScalaPlugin.plugin.swingClasses,
                       ScalaPlugin.plugin.dbcClasses,
                       ScalaPlugin.plugin.libClasses )
-          p <- opt ; val s = p.toOSString }
+          p <- opt ; s = p.toOSString }
       if(!cp.contains(s))
         cp = s + java.io.File.pathSeparator + cp
     settings.classpath.value = cp