Skip to content
GitLab
Menu
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
2d1626f6
Commit
2d1626f6
authored
Apr 06, 2015
by
Peter van 't Hof
Browse files
Change scala docs
parent
8fc4872e
Changes
1
Hide whitespace changes
Inline
Side-by-side
public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Config.scala
View file @
2d1626f6
...
@@ -31,9 +31,7 @@ class Config(var map: Map[String, Any],
...
@@ -31,9 +31,7 @@ class Config(var map: Map[String, Any],
protected
[
core
]
var
defaults
:
Map
[
String
,
Any
]
=
Map
())
extends
Logging
{
protected
[
core
]
var
defaults
:
Map
[
String
,
Any
]
=
Map
())
extends
Logging
{
logger
.
debug
(
"Init phase of config"
)
logger
.
debug
(
"Init phase of config"
)
/**
/** Default constructor */
* Default constructor
*/
def
this
()
=
{
def
this
()
=
{
this
(
Map
())
this
(
Map
())
loadDefaultConfig
()
loadDefaultConfig
()
...
@@ -42,6 +40,7 @@ class Config(var map: Map[String, Any],
...
@@ -42,6 +40,7 @@ class Config(var map: Map[String, Any],
/**
/**
* Loading a environmental variable as location of config files to merge into the config
* Loading a environmental variable as location of config files to merge into the config
* @param valueName Name of value
* @param valueName Name of value
* @param default if true files are added to default instead of normal map
*/
*/
def
loadConfigEnv
(
valueName
:
String
,
default
:
Boolean
)
{
def
loadConfigEnv
(
valueName
:
String
,
default
:
Boolean
)
{
sys
.
env
.
get
(
valueName
)
match
{
sys
.
env
.
get
(
valueName
)
match
{
...
@@ -58,9 +57,7 @@ class Config(var map: Map[String, Any],
...
@@ -58,9 +57,7 @@ class Config(var map: Map[String, Any],
}
}
}
}
/**
/** Loading default value for biopet */
* Loading default value for biopet
*/
def
loadDefaultConfig
()
{
def
loadDefaultConfig
()
{
loadConfigEnv
(
"BIOPET_CONFIG"
,
true
)
loadConfigEnv
(
"BIOPET_CONFIG"
,
true
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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