Integrate the TrIPE server into the Java edifice.

[tripe-android] / keys.scala

diff --git a/keys.scala b/keys.scala
index b9595eca8c1e31c6afa7af9ee0d0fddf407b1cab..bdbede98b887675066805be0e340e1df69cb51b1 100644 (file)
--- a/keys.scala
+++ b/keys.scala
@@ -120,7 +120,7 @@ private val DEFAULTS: Seq[(String, Config => String)] =
       "sig-fresh" -> { _ => "always" },
       "fingerprint-hash" -> { _("hash") });
 
       "sig-fresh" -> { _ => "always" },
       "fingerprint-hash" -> { _("hash") });
 

-private def parseConfig(file: File): Config = {
+private def parseConfig(file: File): HashMap[String, String] = {

 
   /* Build the new configuration in a temporary place. */
   var m = HashMap[String, String]();
 
   /* Build the new configuration in a temporary place. */
   var m = HashMap[String, String]();


@@ -131,7 +131,7 @@ private def parseConfig(file: File): Config = {
     for (line <- lines(in)) {
       line match {
        case RX_COMMENT() => ok;
     for (line <- lines(in)) {
       line match {
        case RX_COMMENT() => ok;

-       case RX_KEYVAL(key, value) => m += key -> value;
+       case RX_KEYVAL(key, value) => m(key) = value;

        case _ =>
          throw new ConfigSyntaxError(file.getPath, lno,
                                      "failed to parse line");
        case _ =>
          throw new ConfigSyntaxError(file.getPath, lno,
                                      "failed to parse line");


@@ -150,7 +150,7 @@ private def readConfig(file: File): Config = {
   /* Fill in defaults where things have been missed out. */
   for ((key, dflt) <- DEFAULTS) {
     if (!(m contains key)) {
   /* Fill in defaults where things have been missed out. */
   for ((key, dflt) <- DEFAULTS) {
     if (!(m contains key)) {

-      try { m += key -> dflt(m); }
+      try { m(key) = dflt(m); }

       catch {
        case e: DefaultFailed =>
          throw new ConfigDefaultFailed(file.getPath, key,
       catch {
        case e: DefaultFailed =>
          throw new ConfigDefaultFailed(file.getPath, key,