[Dive4elements-commits] [PATCH 1 of 5] Fix differences/Waterlevelartifact

Wald Commits scm-commit at wald.intevation.org
Mon Dec 3 10:49:08 CET 2012


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1354528261 -3600
# Node ID d440057b36f7a1c0bfef9df6b46906b7b64333ce
# Parent  410a9292b71caf8636cb3b7d997b47aae2023aeb
Fix differences/Waterlevelartifact.

diff -r 410a9292b71c -r d440057b36f7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java	Sat Dec 01 23:24:36 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java	Mon Dec 03 10:51:01 2012 +0100
@@ -63,17 +63,22 @@
         if(filterFacets != null) {
             List<Facet> list = new ArrayList<Facet>();
             List<Facet> wlist = filterFacets.get(ChartType.LS);
-            for (Facet f: wlist) {
-                if (!f.getName().equals(LONGITUDINAL_Q)) {
-                    DefaultFacet df = new DefaultFacet(f.getIndex(),
-                        "longitudinal_section.q", "");
-                    list.add(df);
+            if (wlist == null) {
+                logger.warn("No matching filterfacets found");
+                dumpFilterFacets();
+            } else {
+                for (Facet f: wlist) {
+                    if (!f.getName().equals(LONGITUDINAL_Q)) {
+                        DefaultFacet df = new DefaultFacet(f.getIndex(),
+                            "longitudinal_section.q", "");
+                        list.add(df);
+                    }
                 }
+
+                list.addAll(wlist);
+
+                filterFacets.put("w_differences", list);
             }
-
-            list.addAll(wlist);
-
-            filterFacets.put("w_differences", list);
         }
     }
 


More information about the Dive4elements-commits mailing list