--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Wed Jul 25 12:39:13 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Thu Jul 26 10:05:50 2012 +0000
@@ -17,13 +17,13 @@
 import com.smartgwt.client.widgets.form.fields.FormItem;
 import com.smartgwt.client.widgets.form.fields.SelectItem;
 import com.smartgwt.client.widgets.form.fields.StaticTextItem;
-import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
 import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
 import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
+import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
 import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
+import com.smartgwt.client.widgets.form.validator.IsFloatValidator;
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
-import com.smartgwt.client.widgets.form.validator.IsFloatValidator;
 
 import de.intevation.flys.client.client.Config;
 import de.intevation.flys.client.client.FLYSConstants;
@@ -31,6 +31,7 @@
 import de.intevation.flys.client.client.services.CollectionItemAttributeServiceAsync;
 import de.intevation.flys.client.client.services.ThemeListingService;
 import de.intevation.flys.client.client.services.ThemeListingServiceAsync;
+import de.intevation.flys.client.client.utils.DoubleValidator;
 import de.intevation.flys.client.shared.model.Collection;
 import de.intevation.flys.client.shared.model.CollectionItemAttribute;
 import de.intevation.flys.client.shared.model.FacetRecord;
@@ -38,8 +39,6 @@
 import de.intevation.flys.client.shared.model.StyleSetting;
 import de.intevation.flys.client.shared.model.Theme;
 
-import de.intevation.flys.client.client.utils.DoubleValidator;
-
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -47,6 +46,7 @@
 import java.util.Set;
 
 /**
+ * Editor window for styles.
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
  */
 public class StyleEditorWindow
@@ -72,7 +72,7 @@
     protected VLayout layout;
 
     /** The form that contains all the input widgets. */
-    DynamicForm df;
+    protected DynamicForm df;
 
     protected VLayout properties;
 
@@ -299,12 +299,13 @@
                          "backgroundcolor",
                          "showbackground",
                          "showlinelabel",
-                         "linelabelfont",
-                         "linelabelcolor",
-                         "linelabelsize",
-                         "linelabelstyle",
-                         "linelabelshowbg",
-                         "linelabelbgcolor",
+                         "labelfontface",
+                         "labelfontcolor",
+                         "labelfontsize",
+                         "labelfontstyle",
+                         "labelshowbg",
+                         "labelbgcolor",
+                         "showpointlabel",
                          "bandwidthcolor",
                          "bandwidth"};
 
@@ -366,7 +367,7 @@
             if (name.equals("linesize")) {
                 f = createLineSizeUI(f);
             }
-            else if (name.equals("textsize") || name.equals("linelabelsize")) {
+            else if (name.equals("labelfontsize")) {
                 LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
                 valueMap.put("3", "3");
                 valueMap.put("5", "5");
@@ -441,9 +442,10 @@
             f.setValidateOnChange(true);
             f.setTitle(MSG.getString(name));
             f.addBlurHandler(new BlurHandler() {
+                @Override
                 public void onBlur(BlurEvent e) {
                      DoubleValidator validator = new DoubleValidator();
-                     Map errors = e.getForm().getErrors();
+                     Map<?, ?> errors = e.getForm().getErrors();
                      if(validator.validate(e.getItem(), errors)) {
                          e.getForm().setErrors(errors, true);
                      }