# HG changeset patch # User Felix Wolfsteller # Date 1386663910 -3600 # Node ID 8fe646d9d4ee8e167c3ed626b03880a8d70984bb # Parent 66c362b998c820d69bc74b9527f4bce2937b2091 issue1547: Add more facets to lists of facets with which areas can be created. diff -r 66c362b998c8 -r 8fe646d9d4ee gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java Tue Dec 10 09:24:05 2013 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java Tue Dec 10 09:25:10 2013 +0100 @@ -288,12 +288,18 @@ return false; } if (a.getFacet().equals("longitudinal_section.w") || + a.getFacet().equals("other.wqkms.w") || + a.getFacet().equals("other.wqkms") || a.getFacet().equals("other.wkms")) { return b.getFacet().equals("longitudinal_section.w") + || b.getFacet().equals("other.wqkms") + || b.getFacet().equals("other.wqkms.w") || b.getFacet().equals("other.wkms"); } - else if (a.getFacet().equals("longitudinal_section.q")) { - return b.getFacet().equals("longitudinal_section.q"); + else if (a.getFacet().equals("longitudinal_section.q") || + a.getFacet().equals("other.wqkms.q")) { + return b.getFacet().equals("longitudinal_section.q") + || b.getFacet().equals("other.wqkms.q"); } return false; } @@ -306,6 +312,7 @@ protected boolean canArea(Theme a) { return a.getFacet().equals("longitudinal_section.q") || a.getFacet().equals("longitudinal_section.w") + || a.getFacet().startsWith("other.wqkms") || a.getFacet().equals("other.wkms"); }