--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Thu Oct 13 09:46:03 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java	Thu Oct 13 10:22:39 2011 +0000
@@ -311,15 +311,13 @@
         // still has no selected features.
         opts.onSelect(new SelectFeature.SelectFeatureListener() {
             public void onFeatureSelected(VectorFeature feature) {
-                Attributes attr = feature.getAttributes();
-                attr.setAttribute(FloodMap.MARK_SELECTED, 1);
+                floodMap.selectFeature(feature);
             }
         });
 
         opts.onUnSelect(new SelectFeature.UnselectFeatureListener() {
             public void onFeatureUnselected(VectorFeature feature) {
-                Attributes attr = feature.getAttributes();
-                attr.setAttribute(FloodMap.MARK_SELECTED, 0);
+                floodMap.disableFeature(feature);
             }
         });
 
@@ -337,6 +335,7 @@
 
             public void disable() {
                 activateSelectFeature(false);
+                floodMap.disableFeatures();
             }
         };
 
@@ -386,10 +385,12 @@
                 VectorFeature feature = null;
 
                 if (features == null || features.length == 0) {
-                    SC.warn("No Feature selected!");
+                    SC.warn(MSG.error_no_feature_selected());
                     return;
                 }
 
+                boolean multipleFeatures = false;
+
                 for (VectorFeature f: features) {
                     Attributes attr = f.getAttributes();
                     if (attr.getAttributeAsInt(FloodMap.MARK_SELECTED) == 1) {
@@ -397,12 +398,21 @@
                             feature = f;
                         }
                         else {
-                            SC.warn("More than 1 Feature selected!");
+                            multipleFeatures = true;
                         }
                     }
                 }
 
+                if (feature == null) {
+                    SC.warn(MSG.error_no_feature_selected());
+                    return;
+                }
+
                 new ElevationWindow(floodMap, feature).show();
+
+                if (multipleFeatures) {
+                    SC.warn(MSG.warning_use_first_feature());
+                }
             }
         });