zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another case of just because you can do something doesn't mean you should. 

Scala type inference for the implicit return types on implicit methods was a little too much for poor IntelliJ IDEA to handle, and it was breaking things like copy/paste, auto-complete, etc.
Also updated the Queue package to include all Sting utils.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5646 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
kshakir 2011-04-15 15:39:56 +00:00
parent 0d7cca169e
commit 798178b167
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Queue.xml
View File

@ -34,7 +34,7 @@
<!-- Pipeline + Utils --> <!-- Pipeline + Utils -->
<package name="org.broadinstitute.sting.datasources.pipeline.**" /> <package name="org.broadinstitute.sting.datasources.pipeline.**" />
<package name="org.broadinstitute.sting.utils.yaml.**" /> <package name="org.broadinstitute.sting.utils.**" />
<!-- Scala --> <!-- Scala -->
<package name="scala.**" /> <package name="scala.**" />

16
scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala
View File

@ -44,28 +44,28 @@ object StringFileConversions {
// and mixins all correct so this doesn't have to be duplicated with concrete implementations? // and mixins all correct so this doesn't have to be duplicated with concrete implementations?
// http://programming-scala.labs.oreilly.com/ch12.html is your friend. // http://programming-scala.labs.oreilly.com/ch12.html is your friend.
implicit def stringsAsFiles(x: List[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable]) = { implicit def stringsAsFiles(x: List[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable]): List[File] = {
x.map(_ match { x.map(_ match {
case string: String => stringAsFile(string) case string: String => stringAsFile(string)
case file: File => file case file: File => file
}) })
} }
implicit def filesAsStrings(x: List[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable]) = { implicit def filesAsStrings(x: List[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable]): List[String] = {
x.map(_ match { x.map(_ match {
case file: File => fileAsString(file) case file: File => fileAsString(file)
case string: String => string case string: String => string
}) })
} }
implicit def stringsAsFiles(x: Set[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable] with Serializable]) = { implicit def stringsAsFiles(x: Set[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable] with Serializable]): Set[File] = {
x.map(_ match { x.map(_ match {
case string: String => stringAsFile(string) case string: String => stringAsFile(string)
case file: File => file case file: File => file
}) })
} }
implicit def filesAsStrings(x: Set[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable] with Serializable]) = { implicit def filesAsStrings(x: Set[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable] with Serializable]): Set[String] = {
x.map(_ match { x.map(_ match {
case file: File => fileAsString(file) case file: File => fileAsString(file)
case string: String => string case string: String => string
@ -87,19 +87,19 @@ trait StringFileConversions {
StringFileConversions.fileAsString(x) StringFileConversions.fileAsString(x)
} }
implicit def stringsAsFiles(x: List[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable]) = { implicit def stringsAsFiles(x: List[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable]): List[File] = {
StringFileConversions.stringsAsFiles(x) StringFileConversions.stringsAsFiles(x)
} }
implicit def filesAsStrings(x: List[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable]) = { implicit def filesAsStrings(x: List[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable]): List[String] = {
StringFileConversions.filesAsStrings(x) StringFileConversions.filesAsStrings(x)
} }
implicit def stringsAsFiles(x: Set[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable] with Serializable]) = { implicit def stringsAsFiles(x: Set[Comparable[_ >: File with String <: Comparable[_ >: File with String <: Comparable[_ >: File with String <: Serializable] with Serializable] with Serializable] with Serializable]): Set[File] = {
StringFileConversions.stringsAsFiles(x) StringFileConversions.stringsAsFiles(x)
} }
implicit def filesAsStrings(x: Set[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable] with Serializable]) = { implicit def filesAsStrings(x: Set[Comparable[_ >: String with File <: Comparable[_ >: String with File <: Comparable[_ >: String with File <: Serializable] with Serializable] with Serializable] with Serializable]): Set[String] = {
StringFileConversions.filesAsStrings(x) StringFileConversions.filesAsStrings(x)
} }
} }