summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRocky Madden <git@rockymadden.com>2012-11-14 15:45:59 -0700
committerRocky Madden <git@rockymadden.com>2012-11-14 15:45:59 -0700
commit6ceea492bacd491a93c77195eef4c3f5856e2fcd (patch)
tree21d8b9acd39384d0c184f4c439b4589357d00965 /core
parent05d9d671e2b30e072387773e50a47ebe4f956a52 (diff)
downloadstringmetric-6ceea492bacd491a93c77195eef4c3f5856e2fcd.tar.gz
stringmetric-6ceea492bacd491a93c77195eef4c3f5856e2fcd.tar.bz2
stringmetric-6ceea492bacd491a93c77195eef4c3f5856e2fcd.zip
Moved StringFilterDelegate into filter package, as it is essentially a concretion.
Diffstat (limited to 'core')
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/filter/StringFilterDelegate.scala (renamed from core/source/core/scala/org/hashtree/stringmetric/StringFilterDelegate.scala)4
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/package.scala2
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala3
-rwxr-xr-xcore/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala3
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala1
-rwxr-xr-xcore/source/test/scala/org/hashtree/stringmetric/filter/StringFilterDelegateSpec.scala (renamed from core/source/test/scala/org/hashtree/stringmetric/StringFilterDelegateSpec.scala)3
31 files changed, 39 insertions, 30 deletions
diff --git a/core/source/core/scala/org/hashtree/stringmetric/StringFilterDelegate.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/StringFilterDelegate.scala
index e5154b4..b29db70 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/StringFilterDelegate.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/StringFilterDelegate.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
class StringFilterDelegate extends StringFilter {
override def filter(charArray: Array[Char]): Array[Char] = charArray
diff --git a/core/source/core/scala/org/hashtree/stringmetric/package.scala b/core/source/core/scala/org/hashtree/stringmetric/package.scala
index e46661f..1fb4ac3 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/package.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/package.scala
@@ -1,5 +1,7 @@
package org.hashtree
+import org.hashtree.stringmetric.filter.StringFilterDelegate
+
/** Provides core string metric functionality. */
package object stringmetric {
type CompareTuple[T] = Tuple2[Array[T], Array[T]]
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala
index 0387c86..bd60637 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.annotation.tailrec
/** An implementation of the Metaphone [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala
index 71125f5..7cfc23a 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/** An implementation of the Metaphone [[org.hashtree.stringmetric.StringMetric]]. */
object MetaphoneMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala
index 09a4c40..020df3d 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.annotation.tailrec
/** An implementation of the NYSIIS [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala
index a27bbe0..a7c84e0 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/** An implementation of the NYSIIS [[org.hashtree.stringmetric.StringMetric]]. */
object NysiisMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala
index 1eec7ed..7f2191a 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.annotation.tailrec
/** An implementation of the refined Soundex [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala
index 0e1c3d9..326b654 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/** An implementation of the refined Soundex [[org.hashtree.stringmetric.StringMetric]]. */
object RefinedSoundexMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala
index 57477cf..648edc7 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.annotation.tailrec
/** An implementation of the Soundex [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala
index 0644f1e..a111df4 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.phonetic
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/** An implementation of the Soundex [[org.hashtree.stringmetric.StringMetric]]. */
object SoundexMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala
index c800c77..2fed038 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/**
* An implementation of the Dice, and lesser known Sorensen, [[org.hashtree.stringmetric.StringMetric]]. This
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala
index 6ebc9f2..e10cfad 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/** An implementation of the Hamming [[org.hashtree.stringmetric.StringMetric]]. */
object HammingMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala
index 0ed8030..92a373e 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, MatchTuple, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.collection.mutable.{ ArrayBuffer, HashSet }
/**
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala
index fcbbd41..49ff5cf 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/**
* An implementation of the Jaro-Winkler [[org.hashtree.stringmetric.StringMetric]]. One differing detail in this
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala
index 1d115b3..d91fb37 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
/** An implementation of the Levenshtein [[org.hashtree.stringmetric.StringMetric]]. */
object LevenshteinMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala
index cd1ea5f..977f857 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ FilterableConfigurableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableConfigurableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.annotation.tailrec
/** An implementation of the N-Gram [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala
index fde161c..4fe581c 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.math
/** An implementation of the N-Gram [[org.hashtree.stringmetric.StringMetric]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala
index fab9476..63ae527 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala
@@ -1,6 +1,7 @@
package org.hashtree.stringmetric.similarity
-import org.hashtree.stringmetric.{ CompareTuple, FilterableConfigurableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableConfigurableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
import scala.math.BigDecimal
/** An implementation of a weighted Levenshtein [[org.hashtree.stringmetric.StringMetric]]. */
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
index ef99b27..e6d24fc 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
index 6e4c722..292f5ec 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
index 60daf52..86fe2c5 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
index e50fae0..6619825 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
index 25caf98..14929c8 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
index fc67ccb..b3352e8 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
index fec58fd..7e03cba 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
index 97e1ab2..c7d6103 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
index 55f8905..f86db83 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
index 0860fc2..8f5b9cd 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
index fab4fb4..167ae8a 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
index 32c98e4..1948a74 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
@@ -1,7 +1,6 @@
package org.hashtree.stringmetric.filter
import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
diff --git a/core/source/test/scala/org/hashtree/stringmetric/StringFilterDelegateSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/StringFilterDelegateSpec.scala
index 7b1b3c6..ed98482 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/StringFilterDelegateSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/StringFilterDelegateSpec.scala
@@ -1,5 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+import org.hashtree.stringmetric.ScalaTest
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner