Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/TypeSection.java @ 9123:1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
author | gernotbelger |
---|---|
date | Tue, 05 Jun 2018 19:21:16 +0200 |
parents | 5e38e2924c07 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TypeSection.java Tue Jun 05 19:10:38 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/TypeSection.java Tue Jun 05 19:21:16 2018 +0200 @@ -123,26 +123,25 @@ } - public void setBooleanValue(String key, boolean value) { - Attribute attr = getAttribute(key); - if (attr == null) { - attr = new BooleanAttribute(key, value, true); - addAttribute(key, attr); - } - else { + protected final void setBooleanValue(String key, boolean value) { + final Attribute attr = getAttribute(key); + if (attr == null) + addAttribute(key, new BooleanAttribute(key, value, true)); + else attr.setValue(value); - } } - - public Boolean getBooleanValue(String key) { - Attribute attr = getAttribute(key); + protected final boolean getBooleanValue(final String key, boolean defaultValue) { + final Attribute attr = getAttribute(key); if (attr instanceof BooleanAttribute) { - return (Boolean) attr.getValue(); + final Boolean value = (Boolean) attr.getValue(); + if( value == null ) + return defaultValue; + + return value; } - return null; + return defaultValue; } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : +} \ No newline at end of file