From 35cfba21c046c8845d4fe1a6c94f6f8cdfbd654b Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Tue, 10 Jul 2012 20:51:34 +0400 Subject: [PATCH] Break compiler dependency from 'collection' project. --- util/collection/Util.scala | 7 ------- util/{collection => relation}/Relation.scala | 2 +- .../src/test/scala/RelationTest.scala | 0 3 files changed, 1 insertion(+), 8 deletions(-) rename util/{collection => relation}/Relation.scala (99%) rename util/{collection => relation}/src/test/scala/RelationTest.scala (100%) diff --git a/util/collection/Util.scala b/util/collection/Util.scala index 429a1b61d..a886c233d 100644 --- a/util/collection/Util.scala +++ b/util/collection/Util.scala @@ -20,13 +20,6 @@ object Util case Left(l) => (l +: acc._1, acc._2) case Right(r) => (acc._1, r +: acc._2) } - def counted(prefix: String, single: String, plural: String, count: Int): Option[String] = - count match - { - case 0 => None - case 1 => Some("1 " + prefix + single) - case x => Some(x.toString + " " + prefix + plural) - } def pairID[A,B] = (a: A, b: B) => (a,b) } diff --git a/util/collection/Relation.scala b/util/relation/Relation.scala similarity index 99% rename from util/collection/Relation.scala rename to util/relation/Relation.scala index dce3d9048..0128333bd 100644 --- a/util/collection/Relation.scala +++ b/util/relation/Relation.scala @@ -119,4 +119,4 @@ private final class MRelation[A,B](fwd: Map[A, Set[B]], rev: Map[B, Set[A]]) ext def contains(a: A, b: B): Boolean = forward(a)(b) override def toString = all.map { case (a,b) => a + " -> " + b }.mkString("Relation [", ", ", "]") -} \ No newline at end of file +} diff --git a/util/collection/src/test/scala/RelationTest.scala b/util/relation/src/test/scala/RelationTest.scala similarity index 100% rename from util/collection/src/test/scala/RelationTest.scala rename to util/relation/src/test/scala/RelationTest.scala