diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-11-13 18:38:50 -0800 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-11-13 18:38:50 -0800 |
commit | af74217c9643a87cbd9df333aefbc7840b0cd188 (patch) | |
tree | d124bdafbd46eeb6e580f66b39f5bace8d1f07a9 /src | |
parent | b84769a1073fde76a1a7efad51bf73ac1ee6db2a (diff) | |
download | spark-af74217c9643a87cbd9df333aefbc7840b0cd188.tar.gz spark-af74217c9643a87cbd9df333aefbc7840b0cd188.tar.bz2 spark-af74217c9643a87cbd9df333aefbc7840b0cd188.zip |
Undo JLine fix that turns out to only be needed when buildr is running
on JRuby. This is quite ugly: JRuby has its own version of JLine which
is older than Scala's, and JLine changed API in such a way that code
written for the new version won't compile with the old one and vice
versa. Sadly, this might be a reason to drop buildr, unless we can
package a JRuby with it that uses the right version, or we ask people to
only use the C Ruby version of buildr (which doesn't work on OS X right
now!)
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/spark/repl/SparkCompletion.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/spark/repl/SparkCompletion.scala b/src/main/scala/spark/repl/SparkCompletion.scala index ac70db4dbe..9fa41736f3 100644 --- a/src/main/scala/spark/repl/SparkCompletion.scala +++ b/src/main/scala/spark/repl/SparkCompletion.scala @@ -310,7 +310,7 @@ class SparkCompletion(val repl: SparkInterpreter) extends SparkCompletionOutput else xs.reduceLeft(_ zip _ takeWhile (x => x._1 == x._2) map (_._1) mkString) // This is jline's entry point for completion. - override def complete(_buf: String, cursor: Int, candidates: JList[_]): Int = { + override def complete(_buf: String, cursor: Int, candidates: java.util.List[java.lang.String]): Int = { val buf = onull(_buf) verbosity = if (isConsecutiveTabs(buf, cursor)) verbosity + 1 else 0 DBG("complete(%s, %d) last = (%s, %d), verbosity: %s".format(buf, cursor, lastBuf, lastCursor, verbosity)) @@ -321,7 +321,7 @@ class SparkCompletion(val repl: SparkInterpreter) extends SparkCompletionOutput case Nil => None case xs => // modify in place and return the position - xs.foreach(x => candidates.asInstanceOf[JList[AnyRef]].add(x)) + xs.foreach(x => candidates.add(x)) // update the last buffer unless this is an alternatives list if (xs contains "") Some(p.cursor) |