Mercurial > dive4elements > river
changeset 1460:dfe884cc24a4
Allow other.wkms facets to be created areas with.
flys-client/trunk@3495 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 20 Dec 2011 12:09:16 +0000 |
| parents | 149f70bcbb96 |
| children | 83ed39d1083d |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue Dec 20 11:50:20 2011 +0000 +++ b/flys-client/ChangeLog Tue Dec 20 12:09:16 2011 +0000 @@ -1,3 +1,8 @@ +2011-12-20 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java: + Add other.wkms to list of area-compatible facets. + 2011-12-20 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java Tue Dec 20 11:50:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java Tue Dec 20 12:09:16 2011 +0000 @@ -124,6 +124,7 @@ } + /** Set theme active/inactive. */ @Override public void activateTheme(Theme theme, boolean active) { theme.setActive(active ? 1 : 0); @@ -259,8 +260,10 @@ if (a.equals(b)) { return false; } - if (a.getFacet().equals("longitudinal_section.w")) { - return b.getFacet().equals("longitudinal_section.w"); + if (a.getFacet().equals("longitudinal_section.w") || + a.getFacet().equals("other.wkms")) { + return b.getFacet().equals("longitudinal_section.w") + || b.getFacet().equals("other.wkms"); } else if (a.getFacet().equals("longitudinal_section.q")) { return b.getFacet().equals("longitudinal_section.q"); @@ -275,7 +278,8 @@ */ protected boolean canArea(Theme a) { return a.getFacet().equals("longitudinal_section.q") - || a.getFacet().equals("longitudinal_section.w"); + || a.getFacet().equals("longitudinal_section.w") + || a.getFacet().equals("other.wkms"); }