From 798178b167e1671cae3b17aada91c399c3e8a39d Mon Sep 17 00:00:00 2001
From: kshakir <kshakir@348d0f76-0448-11de-a6fe-93d51630548a>
Date: Fri, 15 Apr 2011 15:39:56 +0000
Subject: [PATCH] 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
---
 packages/Queue.xml                               |  2 +-
 .../sting/queue/util/StringFileConversions.scala | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/Queue.xml b/packages/Queue.xml
index b88eee8ca..37732db21 100644
--- a/packages/Queue.xml
+++ b/packages/Queue.xml
@@ -34,7 +34,7 @@
 
             <!-- Pipeline + Utils -->
             <package name="org.broadinstitute.sting.datasources.pipeline.**" />
-            <package name="org.broadinstitute.sting.utils.yaml.**" />
+            <package name="org.broadinstitute.sting.utils.**" />
 
             <!-- Scala -->
             <package name="scala.**" />
diff --git a/scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala b/scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala
index b4c123bbe..185f86c4a 100644
--- a/scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala
+++ b/scala/src/org/broadinstitute/sting/queue/util/StringFileConversions.scala
@@ -44,28 +44,28 @@ object StringFileConversions {
   // 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.
 
-  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 {
       case string: String => stringAsFile(string)
       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 {
       case file: File => fileAsString(file)
       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 {
       case string: String => stringAsFile(string)
       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 {
       case file: File => fileAsString(file)
       case string: String => string
@@ -87,19 +87,19 @@ trait StringFileConversions {
     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)
   }
 
-  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)
   }
 
-  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)
   }
 
-  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)
   }
 }