EP / me2day-scala / changeset / 9c052701c27c

Up to file-list src/main/scala/net/me2day/scala/Me2Day.scala:

@@ -32,34 +32,38 @@ object Me2Day {
 class Me2Day(val application : Application, val user : User) {
     val baseUrl = "http://me2day.net/api"
     def this(application : Application) = this(application, null)
     def execute[T](command : Command[T]) : T = {
         val invocation = prepareInvocation(command.name, command.method)
         command.parameters.foreach { x =>
             invocation.addParameter(x._1, x._2)
+        }
         val document = invocation.execute()
         println(command.name + ":" + document)
         command.parseResponse(document)
+    }
-    def url(name : String) : String = baseUrl + "/" + name + ".xml"
+    def commandUrl(name : String) : String = baseUrl + "/" + name + ".xml"
     def basicAuthorization() : String = {
         val base64 = new BASE64Encoder()
         "Basic " + base64.encode((user.name + ":" + user.generatePassword).getBytes)
+    }
     def prepareInvocation(name : String, httpMethod : String) : HttpInvocation = {
         val invocation = new HttpInvocation(url(name), httpMethod)
         invocation.addHeader("Authorization", basicAuthorization)
         val invocation = new HttpInvocation(commandUrl(name), httpMethod)
         invocation.addHeader("me2_application_key", application.key)
         if (user != null) {
             val authentication = new BasicHttpAuthentication(user.name, user.generatePassword)
             invocation.addHeader("Authorization", authentication.credentials)
+        }
         invocation.addHeader("Content-Type", "application/x-www-form-urlencoded")
         return invocation
+    }
+}
 import java.util.Date
 class BasicHttpAuthentication(userid : String, password : String) {
     private val base64 = new BASE64Encoder()
     def credentials = "Basic " + basicCredentials
     def basicCredentials = base64.encode((userid + ":" + password).getBytes)
+}
 case class ErrorResult(code : Int, message : String, description : String)

commit 38:	9c052701c27c
parent 37:	2dafd3e5ce81
branch:	default