Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
8dedd28a
Commit
8dedd28a
authored
Oct 09, 2015
by
Peter van 't Hof
Browse files
Fixed default values
parent
ca9c7e5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
public/biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/config/Configurable.scala
View file @
8dedd28a
...
...
@@ -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
.
d
efaults
case
(
true
,
false
)
=>
ConfigUtils
.
mergeMaps
(
defaults
,
root
.
d
efaults
)
case
(
true
,
true
)
=>
root
.
internalD
efaults
case
(
true
,
false
)
=>
ConfigUtils
.
mergeMaps
(
defaults
,
root
.
internalD
efaults
)
case
(
false
,
true
)
=>
globalConfig
.
defaults
case
(
false
,
false
)
=>
ConfigUtils
.
mergeMaps
(
defaults
,
globalConfig
.
defaults
)
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment