--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java	Fri Nov 18 12:06:16 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java	Fri Nov 18 12:12:07 2011 +0000
@@ -13,11 +13,11 @@
 import org.gwtopenmaps.openlayers.client.event.MapClickListener;
 
 import de.intevation.flys.client.shared.model.FeatureInfo;
-import de.intevation.flys.client.shared.model.Theme;
 
 import de.intevation.flys.client.client.FLYSConstants;
 import de.intevation.flys.client.client.services.GFIService;
 import de.intevation.flys.client.client.services.GFIServiceAsync;
+import de.intevation.flys.client.client.ui.ThemePanel;
 
 
 public class GetFeatureInfo implements MapClickListener {
@@ -26,9 +26,9 @@
 
     protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
 
-    protected Map         map;
-    protected List<Theme> themes;
-    protected String      infoFormat;
+    protected Map        map;
+    protected ThemePanel themePanel;
+    protected String     infoFormat;
 
 
     /**
@@ -37,9 +37,9 @@
      * @param url
      * @param infoFormat
      */
-    public GetFeatureInfo(Map map, List<Theme> themes, String infoFormat) {
+    public GetFeatureInfo(Map map, ThemePanel themePanel, String infoFormat) {
         this.map        = map;
-        this.themes     = themes;
+        this.themePanel = themePanel;
         this.infoFormat = infoFormat;
     }
 
@@ -60,7 +60,7 @@
         Pixel  pixel  = map.getPixelFromLonLat(lonlat);
 
         gfiService.query(
-            themes,
+            themePanel.getThemeList().getThemes(),
             infoFormat,
             map.getExtent().toString(),
             map.getProjection(),