From 8dedd28ab27f09d3dd4be4885629c5cbc5f985ab Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Fri, 9 Oct 2015 20:25:49 +0200
Subject: [PATCH] Fixed default values
---
.../nl/lumc/sasc/biopet/utils/config/Configurable.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/config/Configurable.scala b/public/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/config/Configurable.scala
index 1613109b2..68fe36e30 100644
--- a/public/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/config/Configurable.scala
+++ b/public/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/config/Configurable.scala
@@ -39,10 +39,10 @@ trait Configurable extends ImplicitConversions {
def defaults: Map[String, Any] = Map()
/** This method merge defaults from the root to it's own */
- protected def internalDefaults: Map[String, Any] = {
+ protected[config] def internalDefaults: Map[String, Any] = {
(root != null, defaults.isEmpty) match {
- case (true, true) => root.defaults
- case (true, false) => ConfigUtils.mergeMaps(defaults, root.defaults)
+ case (true, true) => root.internalDefaults
+ case (true, false) => ConfigUtils.mergeMaps(defaults, root.internalDefaults)
case (false, true) => globalConfig.defaults
case (false, false) => ConfigUtils.mergeMaps(defaults, globalConfig.defaults)
}
--
GitLab