Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 443:5d65fe4c08d5
Separated the WST table loading logic from the calculations.
flys-artifacts/trunk@1931 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 17 May 2011 08:55:38 +0000 |
| parents | eb22ffe4d74c |
| children | 5606ba4139e0 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Tue May 17 07:39:33 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Tue May 17 08:55:38 2011 +0000 @@ -31,6 +31,7 @@ import de.intevation.flys.artifacts.model.WQDay; import de.intevation.flys.artifacts.model.WQKms; import de.intevation.flys.artifacts.model.WstValueTable; +import de.intevation.flys.artifacts.model.WstValueTableFactory; /** @@ -259,7 +260,7 @@ qs = getQsForWs(ws); } - WstValueTable wst = WstValueTable.getTable(river); + WstValueTable wst = WstValueTableFactory.getTable(river); if (wst == null) { throw new NullPointerException("No Wst found for selected river."); } @@ -336,7 +337,7 @@ throw new NullPointerException("Cannot determine location."); } - WstValueTable wst = WstValueTable.getTable(r); + WstValueTable wst = WstValueTableFactory.getTable(r); if (wst == null) { throw new NullPointerException("No Wst found for selected river."); } @@ -402,7 +403,7 @@ throw new NullPointerException("Cannot determine location."); } - WstValueTable wst = WstValueTable.getTable(r); + WstValueTable wst = WstValueTableFactory.getTable(r); if (wst == null) { throw new NullPointerException("No Wst found for selected river."); } @@ -462,7 +463,7 @@ logger.error("No river selected."); } - WstValueTable wst = WstValueTable.getTable(river); + WstValueTable wst = WstValueTableFactory.getTable(river); if (wst == null) { logger.error("No Wst found for selected river."); }