# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1330683968 0
# Node ID 49ca36baf4abab627238bebd44c6b496bdb79bca
# Parent  f4001430754fc121dff4c87b4bfd1453ab4d9ebb
Fix issue621 (areas against removed themes).

flys-client/trunk@4110 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r f4001430754f -r 49ca36baf4ab flys-client/ChangeLog
--- a/flys-client/ChangeLog	Thu Mar 01 15:33:29 2012 +0000
+++ b/flys-client/ChangeLog	Fri Mar 02 10:26:08 2012 +0000
@@ -1,3 +1,10 @@
+2012-03-02	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Fix flys/issue621 (areas against deleted themes.)
+
+	* src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java:
+	  Do not include deleted themes in menu.
+
 2012-03-01  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue557 (ÜSK: Flächenmessung --> Tooltip falsch)
@@ -60,7 +67,7 @@
 	  Do not return 'null' if no settings are available. Returning 'null'
 	  discards theme attributes!
 
-2012-01-01	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+2012-03-01	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Fix flys/issue613 (points too big to play perfectly with other legend
 	items).
diff -r f4001430754f -r 49ca36baf4ab flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java	Thu Mar 01 15:33:29 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartThemePanel.java	Fri Mar 02 10:26:08 2012 +0000
@@ -348,9 +348,15 @@
         Menu underMenu = new Menu();
         for (int i = 0; i < nThemes; i++)  {
             final Theme theme = themes.getThemeAt(i+1);
+
+            if (theme.getVisible() == 0) {
+                continue;
+            }
+
             if (!areAreaCompatible(facetTheme, theme)) {
                 continue;
             }
+
             MenuItem againster = new MenuItem(theme.getDescription());
             underMenu.addItem(againster);
 
@@ -367,6 +373,9 @@
         Menu overMenu = new Menu();
         for (int i = 0; i < nThemes; i++)  {
             final Theme theme = themes.getThemeAt(i+1);
+            if (theme.getVisible() == 0) {
+                continue;
+            }
             if (!areAreaCompatible(facetTheme, theme)) {
                 continue;
             }
@@ -395,6 +404,9 @@
         Menu betweenMenu = new Menu();
         for (int i = 0; i < nThemes; i++)  {
             final Theme theme = themes.getThemeAt(i+1);
+            if (theme.getVisible() == 0) {
+                continue;
+            }
             if (!areAreaCompatible(facetTheme, theme)) {
                 continue;
             }