Mercurial > dive4elements > river
changeset 8332:3baa6290cebf
bed_height_single.old_elevation_model_id is not NOT NULL.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 26 Sep 2014 10:17:02 +0200 |
| parents | 27d42c9ee367 |
| children | be7864b4fabb |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java |
| diffstat | 4 files changed, 24 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java Fri Sep 26 09:44:48 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java Fri Sep 26 10:17:02 2014 +0200 @@ -52,10 +52,12 @@ context.getMeta(), "meta.bedheight.cur.elevation"), first.getCurElevationModel().getName()); - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.old.elevation"), - first.getOldElevationModel().getName()); + if (first.getOldElevationModel() != null) { + this.addMetaData(Resources.getMsg( + context.getMeta(), + "meta.bedheight.old.elevation"), + first.getOldElevationModel().getName()); + } this.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.river.elevation"),
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java Fri Sep 26 09:44:48 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java Fri Sep 26 10:17:02 2014 +0200 @@ -74,10 +74,12 @@ context.getMeta(), "meta.bedheight.cur.elevation"), first.getCurElevationModel().getName()); - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.old.elevation"), - first.getOldElevationModel().getName()); + if (first.getOldElevationModel() != null) { + this.addMetaData(Resources.getMsg( + context.getMeta(), + "meta.bedheight.old.elevation"), + first.getOldElevationModel().getName()); + } this.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.river.elevation"),
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java Fri Sep 26 09:44:48 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java Fri Sep 26 10:17:02 2014 +0200 @@ -52,10 +52,12 @@ context.getMeta(), "meta.bedheight.cur.elevation"), second.getCurElevationModel().getName()); - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.old.elevation"), - second.getOldElevationModel().getName()); + if (second.getOldElevationModel() != null) { + this.addMetaData(Resources.getMsg( + context.getMeta(), + "meta.bedheight.old.elevation"), + second.getOldElevationModel().getName()); + } this.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.river.elevation"),
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java Fri Sep 26 09:44:48 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java Fri Sep 26 10:17:02 2014 +0200 @@ -74,10 +74,12 @@ context.getMeta(), "meta.bedheight.cur.elevation"), second.getCurElevationModel().getName()); - this.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.old.elevation"), - second.getOldElevationModel().getName()); + if (second.getOldElevationModel() != null) { + this.addMetaData(Resources.getMsg( + context.getMeta(), + "meta.bedheight.old.elevation"), + second.getOldElevationModel().getName()); + } this.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.river.elevation"),