Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/access/RiverAccess.java @ 7261:a56fe3bc6700
Refactoring: Let RiverAccess.getRiver return an River.
Renamed getRiver in getRiverName. Update Callers.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 08 Oct 2013 14:50:58 +0200 |
| parents | af13ceeba52a |
| children | e4606eae8ea5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RiverAccess.java Tue Oct 08 12:07:18 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RiverAccess.java Tue Oct 08 14:50:58 2013 +0200 @@ -10,6 +10,10 @@ import org.dive4elements.river.artifacts.D4EArtifact; +import org.dive4elements.river.artifacts.model.RiverFactory; + +import org.dive4elements.river.model.River; + import org.apache.log4j.Logger; /** Access to river data of an artifact. */ @@ -32,7 +36,7 @@ /** Get River name. */ - public String getRiver() { + public String getRiverName() { if (river == null) { river = getString("river"); } @@ -41,5 +45,13 @@ } return river; } + + public River getRiver() { + getRiverName(); + + return (river != null) + ? RiverFactory.getRiver(river) + : null; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :