~ fix some import issues, not caught by sbt (but idea did)
authorAlexandre Bertails <bertails@gmail.com>
Sun, 23 Oct 2011 17:57:04 -0400
changeset 110 0e18d31cd4c1
parent 109 b1b79130b870
child 118 df96d8590cd2
~ fix some import issues, not caught by sbt (but idea did)
src/main/scala/Filesystem.scala
src/main/scala/Resource.scala
src/main/scala/plan.scala
--- a/src/main/scala/Filesystem.scala	Sun Oct 23 17:56:24 2011 -0400
+++ b/src/main/scala/Filesystem.scala	Sun Oct 23 17:57:04 2011 -0400
@@ -1,16 +1,16 @@
 package org.w3.readwriteweb
 
-import org.w3.readwriteweb.util._
-
 import java.io._
 import java.net.URL
 import org.slf4j.{Logger, LoggerFactory}
-import com.hp.hpl.jena.rdf.model._
+import com.hp.hpl.jena.rdf.model.{Resource => _, _}
 import com.hp.hpl.jena.shared.JenaException
 
-import scalaz.{sys => _, _}
+import scalaz.{Resource => _, _}
 import Scalaz._
 
+import scala.sys
+
 class Filesystem(
   baseDirectory: File,
   val basePath: String,
--- a/src/main/scala/Resource.scala	Sun Oct 23 17:56:24 2011 -0400
+++ b/src/main/scala/Resource.scala	Sun Oct 23 17:57:04 2011 -0400
@@ -4,7 +4,7 @@
 
 import java.net.URL
 import com.hp.hpl.jena.rdf.model._
-import scalaz._
+import scalaz.{Resource => _, _}
 import Scalaz._
 
 trait ResourceManager {
--- a/src/main/scala/plan.scala	Sun Oct 23 17:56:24 2011 -0400
+++ b/src/main/scala/plan.scala	Sun Oct 23 17:57:04 2011 -0400
@@ -10,7 +10,6 @@
 
 import org.slf4j.{Logger, LoggerFactory}
 
-import com.hp.hpl.jena.rdf.model.Model
 import com.hp.hpl.jena.query.{Query, QueryExecution, QueryExecutionFactory}
 import com.hp.hpl.jena.update.UpdateAction
 import Query.{QueryTypeSelect => SELECT,
@@ -18,9 +17,11 @@
               QueryTypeConstruct => CONSTRUCT,
               QueryTypeDescribe => DESCRIBE}
 
-import scalaz._
+import scalaz.{Resource => _, _}
 import Scalaz._
 
+import com.hp.hpl.jena.rdf.model.Model
+
 //object ReadWriteWeb {
 //  
 //  val defaultHandler: PartialFunction[Throwable, HttpResponse[_]] = {
@@ -58,7 +59,7 @@
   val plan = unfiltered.filter.Planify {
     case req @ Path(path) if path startsWith rm.basePath => {
       val Authoritative(uri, representation) = req
-      val r: Resource = rm.resource(uri)
+      val r = rm.resource(uri)
       req match {
         case GET(_) if representation == HTMLRepr => {
           val source = Source.fromFile("src/main/resources/skin.html")("UTF-8")