Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java @ 8412:17db08570637
SCHEMA CHANGE: removed superfluous columns station and river_id from measurement_stations and adapted other components accordingly.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Wed, 15 Oct 2014 19:20:26 +0200 |
parents | 238fc722f87a |
children | 71144e25a6c9 |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java Wed Oct 15 14:58:46 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java Wed Oct 15 19:20:26 2014 +0200 @@ -129,7 +129,7 @@ DefaultRiverInfo riverinfo = getRiverInfo(result); List<MeasurementStation> mstations = createMeasurementStations( - result, riverinfo.getName(), riverinfo.isKmUp()); + result, riverinfo.getName()); riverinfo.setMeasurementStations(mstations); @@ -201,7 +201,7 @@ } private List<MeasurementStation> createMeasurementStations( - Document result, String rivername, boolean kmup) { + Document result, String rivername) { NodeList stationnodes = (NodeList) XMLUtils.xpath( result, @@ -228,8 +228,6 @@ ArtifactNamespaceContext.NAMESPACE_URI, "start"); String mend = stationele.getAttributeNS( ArtifactNamespaceContext.NAMESPACE_URI, "end"); - String mstation = stationele.getAttributeNS( - ArtifactNamespaceContext.NAMESPACE_URI, "station"); String mtype = stationele.getAttributeNS( ArtifactNamespaceContext.NAMESPACE_URI, "type"); String riverside = stationele.getAttributeNS( @@ -258,10 +256,8 @@ rivername, mname, parseInteger(mid), - parseDouble(mstation), parseDouble(mstart), parseDouble(mend), - kmup, riverside, mtype, moperator,