Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 7260:0b32f8980fed | 7261:a56fe3bc6700 |
|---|---|
| 7 */ | 7 */ |
| 8 | 8 |
| 9 package org.dive4elements.river.artifacts.access; | 9 package org.dive4elements.river.artifacts.access; |
| 10 | 10 |
| 11 import org.dive4elements.river.artifacts.D4EArtifact; | 11 import org.dive4elements.river.artifacts.D4EArtifact; |
| 12 | |
| 13 import org.dive4elements.river.artifacts.model.RiverFactory; | |
| 14 | |
| 15 import org.dive4elements.river.model.River; | |
| 12 | 16 |
| 13 import org.apache.log4j.Logger; | 17 import org.apache.log4j.Logger; |
| 14 | 18 |
| 15 /** Access to river data of an artifact. */ | 19 /** Access to river data of an artifact. */ |
| 16 public class RiverAccess | 20 public class RiverAccess |
| 30 super(artifact); | 34 super(artifact); |
| 31 } | 35 } |
| 32 | 36 |
| 33 | 37 |
| 34 /** Get River name. */ | 38 /** Get River name. */ |
| 35 public String getRiver() { | 39 public String getRiverName() { |
| 36 if (river == null) { | 40 if (river == null) { |
| 37 river = getString("river"); | 41 river = getString("river"); |
| 38 } | 42 } |
| 39 if (log.isDebugEnabled()) { | 43 if (log.isDebugEnabled()) { |
| 40 log.debug("river: '" + river + "'"); | 44 log.debug("river: '" + river + "'"); |
| 41 } | 45 } |
| 42 return river; | 46 return river; |
| 43 } | 47 } |
| 48 | |
| 49 public River getRiver() { | |
| 50 getRiverName(); | |
| 51 | |
| 52 return (river != null) | |
| 53 ? RiverFactory.getRiver(river) | |
| 54 : null; | |
| 55 } | |
| 44 } | 56 } |
| 45 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : | 57 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : |