Revision: 750
http://assorted.svn.sourceforge.net/assorted/?rev=750&view=rev
Author: yangzhang
Date: 2008-05-08 12:35:24 -0700 (Thu, 08 May 2008)
Log Message:
-----------
adapted for scala 2.7.0
Modified Paths:
--------------
scala-commons/trunk/src/commons/extras/JavaBib.scala
scala-commons/trunk/src/commons/extras/SunHttpServer.scala
Modified: scala-commons/trunk/src/commons/extras/JavaBib.scala
===================================================================
--- scala-commons/trunk/src/commons/extras/JavaBib.scala 2008-05-08 19:34:26 UTC (rev 749)
+++ scala-commons/trunk/src/commons/extras/JavaBib.scala 2008-05-08 19:35:24 UTC (rev 750)
@@ -7,17 +7,17 @@
object JavaBib {
type Entry = Map[String, Seq[String]]
- def list2buffer[a](xs: java.util.List) = new jcl.BufferWrapper[a] {
+ def list2buffer[a](xs: java.util.List[a]) = new jcl.BufferWrapper[a] {
override def underlying = xs
}
def convert(entry: BibtexEntry): Entry = {
val map = new jcl.MapWrapper[String, BibtexAbstractValue] {
- override def underlying = entry.getFields
+ override def underlying = entry.getFields.asInstanceOf[java.util.Map[String,BibtexAbstractValue]]
}
val mappings = for ((k,uncasted) <- map.elements) yield {
val newV = uncasted match {
- case v: BibtexPersonList => list2buffer(v getList)
- case v: BibtexString => List(v getContent)
+ case v: BibtexPersonList => list2buffer(v.getList.asInstanceOf[java.util.List[String]])
+ case v: BibtexString => List(v.getContent)
}
(k,newV)
}
@@ -29,7 +29,7 @@
val file = new BibtexFile
val parser = new BibtexParser(false)
parser parse (file, reader)
- val entries = list2buffer[BibtexEntry](file getEntries) map convert
+ val entries = list2buffer[BibtexEntry](file.getEntries.asInstanceOf[java.util.List[BibtexEntry]]) map convert
(entries, parser.getExceptions)
}
}
Modified: scala-commons/trunk/src/commons/extras/SunHttpServer.scala
===================================================================
--- scala-commons/trunk/src/commons/extras/SunHttpServer.scala 2008-05-08 19:34:26 UTC (rev 749)
+++ scala-commons/trunk/src/commons/extras/SunHttpServer.scala 2008-05-08 19:35:24 UTC (rev 750)
@@ -21,7 +21,7 @@
server createContext ("/", new HttpHandler {
override def handle(t: HttpExchange) {
val headers = {
- val hs = new jcl.MapWrapper[String,java.util.List] {
+ val hs = new jcl.MapWrapper[String,java.util.List[String]] {
override def underlying = t.getRequestHeaders
}
Map(hs.elements map { case (k,v) =>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
