--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Wed Jul 11 11:24:27 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Wed Jul 11 12:04:25 2012 +0000
@@ -1,53 +1,45 @@
 package de.intevation.flys.client.client.ui;
 
-import java.util.Arrays;
-import java.util.Map;
-import java.util.LinkedHashMap;
-import java.util.Set;
-import java.util.Iterator;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-
+import com.smartgwt.client.types.Alignment;
 import com.smartgwt.client.util.SC;
-
-import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.Button;
 import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.layout.VLayout;
-import com.smartgwt.client.widgets.layout.HLayout;
-import com.smartgwt.client.widgets.Button;
-import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.FormItem;
-import com.smartgwt.client.widgets.form.fields.CheckboxItem;
-import com.smartgwt.client.widgets.form.fields.ColorPickerItem;
-import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
-
+import com.smartgwt.client.widgets.Window;
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.form.DynamicForm;
 import com.smartgwt.client.widgets.form.events.ItemChangedEvent;
 import com.smartgwt.client.widgets.form.events.ItemChangedHandler;
+import com.smartgwt.client.widgets.form.fields.CheckboxItem;
+import com.smartgwt.client.widgets.form.fields.ColorPickerItem;
+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.ChangedHandler;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.VLayout;
 
-import com.smartgwt.client.types.Alignment;
-
+import de.intevation.flys.client.client.Config;
+import de.intevation.flys.client.client.FLYSConstants;
+import de.intevation.flys.client.client.services.CollectionItemAttributeService;
+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.shared.model.Collection;
 import de.intevation.flys.client.shared.model.CollectionItemAttribute;
+import de.intevation.flys.client.shared.model.FacetRecord;
 import de.intevation.flys.client.shared.model.Style;
 import de.intevation.flys.client.shared.model.StyleSetting;
-import de.intevation.flys.client.shared.model.FacetRecord;
 import de.intevation.flys.client.shared.model.Theme;
 
-import de.intevation.flys.client.client.services.CollectionItemAttributeServiceAsync;
-import de.intevation.flys.client.client.services.CollectionItemAttributeService;
-import de.intevation.flys.client.client.services.ThemeListingServiceAsync;
-import de.intevation.flys.client.client.services.ThemeListingService;
-
-import de.intevation.flys.client.client.ui.ThemePanel;
-
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.Config;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
@@ -114,6 +106,7 @@
         styleChooser.setTitleAlign(Alignment.LEFT);
         styleChooser.setValue("aktuell");
         styleChooser.addChangedHandler(new ChangedHandler() {
+            @Override
             public void onChanged(ChangedEvent ce) {
                 String value = ce.getValue().toString();
                 Style s = null;
@@ -160,6 +153,10 @@
 
         Theme theme = facet.getTheme();
         Style style = attributes.getStyle(theme.getFacet(), theme.getIndex());
+        if(style == null) {
+            GWT.log("StyleEditorWindow.init(): style == null");
+            return;
+        }
         String name = style.getName();
         this.current = style;
 
@@ -167,20 +164,22 @@
             locale,
             name,
             new AsyncCallback<Map<String, Style> >() {
+                @Override
                 public void onFailure(Throwable caught) {
                     GWT.log("No listloaded.");
                 }
+                @Override
                 public void onSuccess(Map<String, Style> list) {
                     GWT.log("Successfully loaded list.");
 
                     styleGroups = list;
-                    Set keys = list.keySet();
+                    Set<String> keys = list.keySet();
                     LinkedHashMap<String, String> valueMap =
                         new LinkedHashMap<String, String>();
                     valueMap.put("aktuell", "Aktuell");
-                    Iterator i = keys.iterator();
-                    while (i.hasNext()) {
-                        String s = i.next().toString();
+                    Iterator<String> iter = keys.iterator();
+                    while (iter.hasNext()) {
+                        String s = iter.next().toString();
                         Style tmp = styleGroups.get(s);
                         tmp.setFacet(current.getFacet());
                         tmp.setIndex(current.getIndex());
@@ -201,6 +200,7 @@
         Button cancel = new Button(MSG.label_cancel());
         cancel.addClickHandler(this);
         accept.addClickHandler(new ClickHandler() {
+            @Override
             public void onClick(ClickEvent e) {
                 saveStyle();
             }
@@ -237,6 +237,7 @@
      * this method is called when the user aborts theming.
      * @param event The event.
      */
+    @Override
     public void onClick(ClickEvent event) {
         this.hide();
     }
@@ -453,6 +454,7 @@
         f.setTitleAlign(Alignment.LEFT);
         df.setFields(f);
         df.addItemChangedHandler(new ItemChangedHandler() {
+            @Override
             public void onItemChanged(ItemChangedEvent e) {
                 String name = e.getItem().getName();
                 String newValue = e.getNewValue().toString();
@@ -555,9 +557,11 @@
             locale,
             attributes,
             new AsyncCallback<Void>() {
+                @Override
                 public void onFailure (Throwable caught) {
                     GWT.log("Could not set Collection item attributes.");
                 }
+                @Override
                 public void onSuccess(Void v) {
                     GWT.log("Successfully saved collection item attributes.");
                     panel.requestRedraw();