Skip to content
Snippets Groups Projects
Commit aef85a32 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Added scaa docs

parent 85ee753e
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,7 @@ trait Configurable extends ImplicitConversions { ...@@ -38,6 +38,7 @@ trait Configurable extends ImplicitConversions {
/** Map to store defaults for config */ /** Map to store defaults for config */
def defaults: Map[String, Any] = Map() def defaults: Map[String, Any] = Map()
/** This method merge defaults from the root to it's own */
protected def internalDefaults: Map[String, Any] = { protected def internalDefaults: Map[String, Any] = {
(root != null, defaults.isEmpty) match { (root != null, defaults.isEmpty) match {
case (true, true) => root.defaults case (true, true) => root.defaults
...@@ -50,6 +51,7 @@ trait Configurable extends ImplicitConversions { ...@@ -50,6 +51,7 @@ trait Configurable extends ImplicitConversions {
/** All values found in this map will be skipped from the user config */ /** All values found in this map will be skipped from the user config */
def fixedValues: Map[String, Any] = Map() def fixedValues: Map[String, Any] = Map()
/** This method merge fixedValues from the root to it's own */
protected def internalFixedValues: Map[String, Any] = { protected def internalFixedValues: Map[String, Any] = {
(root != null, fixedValues.isEmpty) match { (root != null, fixedValues.isEmpty) match {
case (true, true) => root.fixedValues case (true, true) => root.fixedValues
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment