Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
6d575903
Commit
6d575903
authored
Oct 17, 2018
by
Stefan Schuhbaeck
Browse files
do not include a file multiple times
parent
2cf0fcc3
Changes
1
Show whitespace changes
Inline
Side-by-side
VadereUtils/src/org/vadere/util/lang/ModuleResourceBundle.java
View file @
6d575903
...
...
@@ -5,6 +5,7 @@ import org.jetbrains.annotations.NotNull;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.Enumeration
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Properties
;
...
...
@@ -18,13 +19,16 @@ public class ModuleResourceBundle extends ResourceBundle {
protected
static
final
Control
CONTROL
=
new
MultiResourceBundleControl
();
private
Properties
properties
;
private
HashSet
<
String
>
usedProperties
;
public
ModuleResourceBundle
(
String
baseName
,
Locale
locale
){
setParent
(
ResourceBundle
.
getBundle
(
baseName
,
locale
,
CONTROL
));
}
protected
ModuleResourceBundle
(
Properties
properties
){
protected
ModuleResourceBundle
(
Properties
properties
,
HashSet
<
String
>
usedProperties
){
this
.
properties
=
properties
;
this
.
usedProperties
=
usedProperties
;
}
@Override
...
...
@@ -70,12 +74,15 @@ public class ModuleResourceBundle extends ResourceBundle {
Properties
properties
=
load
(
baseName
,
locale
,
loader
);
String
include
=
properties
.
getProperty
(
"include"
);
HashSet
<
String
>
usedProperties
=
new
HashSet
<>();
if
(
include
!=
null
){
for
(
String
includeBasename
:
include
.
split
(
"\\s*,\\s*"
)){
if
(
usedProperties
.
add
(
includeBasename
)){
properties
.
putAll
(
load
(
includeBasename
,
locale
,
loader
));
}
}
return
new
ModuleResourceBundle
(
properties
);
}
return
new
ModuleResourceBundle
(
properties
,
usedProperties
);
}
private
Properties
load
(
String
baseName
,
Locale
locale
,
ClassLoader
loader
)
throws
IOException
{
...
...
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