2 files changed, 78 insertions, 5 deletions

diff --git a/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index 8e32585a47..b6bf97e68e 100644
--- a/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
@@ -129,10 +129,6 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
         return (T) field;
     }
 
-    private boolean anyField(Class<?> fieldType) {
-        return fieldType == Field.class || fieldType == AbstractField.class;
-    }
-
     protected AbstractSelect createCompatibleSelect(
             Class<? extends AbstractSelect> fieldType) {
         AbstractSelect select;
@@ -157,7 +153,23 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
         return select;
     }
 
-    private boolean anySelect(Class<? extends Field> fieldType) {
+    /**
+     * @since 7.4
+     * @param fieldType
+     *            the type of the field
+     * @return true if any AbstractField can be assigned to the field
+     */
+    protected boolean anyField(Class<?> fieldType) {
+        return fieldType == Field.class || fieldType == AbstractField.class;
+    }
+
+    /**
+     * @since 7.4
+     * @param fieldType
+     *            the type of the field
+     * @return true if any AbstractSelect can be assigned to the field
+     */
+    protected boolean anySelect(Class<? extends Field> fieldType) {
         return anyField(fieldType) || fieldType == AbstractSelect.class;
     }
 
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index adb08e0fcc..3c0afbc484 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -47,7 +48,9 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.RpcDataProviderExtension;
 import com.vaadin.data.RpcDataProviderExtension.DataProviderKeyMapper;
+import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
 import com.vaadin.data.fieldgroup.FieldGroup;
+import com.vaadin.data.fieldgroup.FieldGroup.BindException;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.fieldgroup.FieldGroupFieldFactory;
 import com.vaadin.data.sort.Sort;
@@ -166,6 +169,11 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
      * been bound.
      */
     private final class CustomFieldGroup extends FieldGroup {
+
+        public CustomFieldGroup() {
+            setFieldFactory(EditorFieldFactory.get());
+        }
+
         @Override
         protected Class<?> getPropertyType(Object propertyId)
                 throws BindException {
@@ -178,6 +186,59 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
     }
 
     /**
+     * Field factory used by default in the editor.
+     * 
+     * Aims to fields of suitable type and with suitable size for use in the
+     * editor row.
+     */
+    public static class EditorFieldFactory extends
+            DefaultFieldGroupFieldFactory {
+        private static final EditorFieldFactory INSTANCE = new EditorFieldFactory();
+
+        protected EditorFieldFactory() {
+        }
+
+        /**
+         * Returns the singleton instance
+         * 
+         * @return the singleton instance
+         */
+        public static EditorFieldFactory get() {
+            return INSTANCE;
+        }
+
+        @Override
+        public <T extends Field> T createField(Class<?> type, Class<T> fieldType) {
+            T f = super.createField(type, fieldType);
+            if (f != null) {
+                f.setWidth("100%");
+            }
+            return f;
+        }
+
+        @Override
+        protected AbstractSelect createCompatibleSelect(
+                Class<? extends AbstractSelect> fieldType) {
+            if (anySelect(fieldType)) {
+                return super.createCompatibleSelect(ComboBox.class);
+            }
+            return super.createCompatibleSelect(fieldType);
+        }
+
+        @Override
+        protected void populateWithEnumData(AbstractSelect select,
+                Class<? extends Enum> enumClass) {
+            // Use enums directly and the EnumToStringConverter to be consistent
+            // with what is shown in the Grid
+            @SuppressWarnings("unchecked")
+            EnumSet<?> enumSet = EnumSet.allOf(enumClass);
+            for (Object r : enumSet) {
+                select.addItem(r);
+            }
+        }
+    }
+
+    /**
      * Selection modes representing built-in {@link SelectionModel
      * SelectionModels} that come bundled with {@link Grid}.
      * <p>