From aef85a32f43f5be035e2a7c7be0efabf3298b9d9 Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Fri, 4 Sep 2015 22:10:47 +0200
Subject: [PATCH] Added scaa docs
---
.../scala/nl/lumc/sasc/biopet/core/config/Configurable.scala | 2 ++
1 file changed, 2 insertions(+)
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Configurable.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Configurable.scala
index e11dc477f..79992b82b 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Configurable.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Configurable.scala
@@ -38,6 +38,7 @@ trait Configurable extends ImplicitConversions {
/** Map to store defaults for config */
def defaults: Map[String, Any] = Map()
+ /** This method merge defaults from the root to it's own */
protected def internalDefaults: Map[String, Any] = {
(root != null, defaults.isEmpty) match {
case (true, true) => root.defaults
@@ -50,6 +51,7 @@ trait Configurable extends ImplicitConversions {
/** All values found in this map will be skipped from the user config */
def fixedValues: Map[String, Any] = Map()
+ /** This method merge fixedValues from the root to it's own */
protected def internalFixedValues: Map[String, Any] = {
(root != null, fixedValues.isEmpty) match {
case (true, true) => root.fixedValues
--
GitLab