Mercurial > dive4elements > river
changeset 7680:8fe646d9d4ee
issue1547: Add more facets to lists of facets with which areas can be created.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 10 Dec 2013 09:25:10 +0100 |
parents | 66c362b998c8 |
children | 4e76bfff5fa6 |
files | gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java |
diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"); }