From 9f83974b4cb228d1ae6d1c6d61da54da8f6c9223 Mon Sep 17 00:00:00 2001 From: Peter van 't Hof <p.j.van_t_hof@lumc.nl> Date: Fri, 13 May 2016 11:23:24 +0200 Subject: [PATCH] Moved package --- .../nl/lumc/sasc/biopet/BiopetExecutableMain.scala | 5 +++-- .../{ => generateindexes}/GenerateIndexes.scala | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) rename generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/{ => generateindexes}/GenerateIndexes.scala (97%) diff --git a/biopet-package/src/main/scala/nl/lumc/sasc/biopet/BiopetExecutableMain.scala b/biopet-package/src/main/scala/nl/lumc/sasc/biopet/BiopetExecutableMain.scala index c70555e0d..69078a59b 100644 --- a/biopet-package/src/main/scala/nl/lumc/sasc/biopet/BiopetExecutableMain.scala +++ b/biopet-package/src/main/scala/nl/lumc/sasc/biopet/BiopetExecutableMain.scala @@ -15,7 +15,8 @@ */ package nl.lumc.sasc.biopet -import nl.lumc.sasc.biopet.utils.{ BiopetExecutable, MainCommand } +import nl.lumc.sasc.biopet.pipelines.generateindexes.GenerateIndexes +import nl.lumc.sasc.biopet.utils.{BiopetExecutable, MainCommand} object BiopetExecutableMain extends BiopetExecutable { def pipelines: List[MainCommand] = List( @@ -36,7 +37,7 @@ object BiopetExecutableMain extends BiopetExecutable { nl.lumc.sasc.biopet.pipelines.shiva.ShivaVariantcalling, nl.lumc.sasc.biopet.pipelines.basty.Basty, nl.lumc.sasc.biopet.pipelines.shiva.Shiva, - nl.lumc.sasc.biopet.pipelines.GenerateIndexes + GenerateIndexes ) def tools: List[MainCommand] = BiopetToolsExecutable.tools diff --git a/generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/GenerateIndexes.scala b/generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/generateindexes/GenerateIndexes.scala similarity index 97% rename from generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/GenerateIndexes.scala rename to generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/generateindexes/GenerateIndexes.scala index af762ed2d..8fe983029 100644 --- a/generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/GenerateIndexes.scala +++ b/generate-indexes/src/main/scala/nl/lumc/sasc/biopet/pipelines/generateindexes/GenerateIndexes.scala @@ -13,26 +13,26 @@ * license; For commercial users or users who do not want to follow the AGPL * license, please contact us to obtain a separate license. */ -package nl.lumc.sasc.biopet.pipelines +package nl.lumc.sasc.biopet.pipelines.generateindexes import java.io.PrintWriter import java.util import nl.lumc.sasc.biopet.core.extensions.Md5sum -import nl.lumc.sasc.biopet.utils.config.Configurable -import nl.lumc.sasc.biopet.core.{ BiopetCommandLineFunction, BiopetQScript, PipelineCommand } +import nl.lumc.sasc.biopet.core.{BiopetCommandLineFunction, BiopetQScript, PipelineCommand} import nl.lumc.sasc.biopet.extensions._ -import nl.lumc.sasc.biopet.extensions.bowtie.{ Bowtie2Build, BowtieBuild } +import nl.lumc.sasc.biopet.extensions.bowtie.{Bowtie2Build, BowtieBuild} import nl.lumc.sasc.biopet.extensions.bwa.BwaIndex import nl.lumc.sasc.biopet.extensions.gatk.CombineVariants import nl.lumc.sasc.biopet.extensions.gmap.GmapBuild import nl.lumc.sasc.biopet.extensions.picard.CreateSequenceDictionary import nl.lumc.sasc.biopet.extensions.samtools.SamtoolsFaidx import nl.lumc.sasc.biopet.utils.ConfigUtils +import nl.lumc.sasc.biopet.utils.config.Configurable import org.broadinstitute.gatk.queue.QScript -import scala.language.reflectiveCalls import scala.collection.JavaConversions._ +import scala.language.reflectiveCalls class GenerateIndexes(val root: Configurable) extends QScript with BiopetQScript { def this() = this(null) -- GitLab