[PATCH] bed_height_single.old_elevation_model_id is not NOT NULL

[Wald Commits]

# HG changeset patch
# User "Tom Gottfried <tom at intevation.de>"
# Date 1411719422 -7200
# Node ID 3baa6290cebf341354474a97142f2ee26b0ffd82
# Parent  27d42c9ee367c1e59cee4f9cc28e791faff25abf
bed_height_single.old_elevation_model_id is not NOT NULL.

diff -r 27d42c9ee367 -r 3baa6290cebf artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java
--- 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"),
diff -r 27d42c9ee367 -r 3baa6290cebf artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java
--- 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"),
diff -r 27d42c9ee367 -r 3baa6290cebf artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java
--- 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"),
diff -r 27d42c9ee367 -r 3baa6290cebf artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java
--- 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"),