#8026 Removed deprecated FieldFactory

diff --git a/src/com/vaadin/ui/BaseFieldFactory.java b/src/com/vaadin/ui/BaseFieldFactory.java
deleted file mode 100644 (file)
index 5e92c0c..0000000
--- a/src/com/vaadin/ui/BaseFieldFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.ui;
-
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-
-/**
- * Default implementation of the the following Field types are used by default:
- * <p>
- * <b>Boolean</b>: Button(switchMode:true).<br/>
- * <b>Date</b>: DateField(resolution: day).<br/>
- * <b>Item</b>: Form. <br/>
- * <b>default field type</b>: TextField.
- * <p>
- * 
- * @author Vaadin Ltd.
- * @version
- * @VERSION@
- * @since 3.1
- * @deprecated use {@link DefaultFieldFactory} or own implementations on
- *             {@link FormFieldFactory} or {@link TableFieldFactory} instead.
- */
-
-@Deprecated
-@SuppressWarnings("serial")
-public class BaseFieldFactory implements FieldFactory {
-
-    /**
-     * Creates the field based on type of data.
-     * 
-     * 
-     * @param type
-     *            the type of data presented in field.
-     * @param uiContext
-     *            the context where the Field is presented.
-     * 
-     * @see com.vaadin.ui.FieldFactory#createField(Class, Component)
-     */
-    public Field<?> createField(Class<?> type, Component uiContext) {
-        return DefaultFieldFactory.createFieldByPropertyType(type);
-    }
-
-    /**
-     * Creates the field based on the datasource property.
-     * 
-     * @see com.vaadin.ui.FieldFactory#createField(Property, Component)
-     */
-    public Field<?> createField(Property property, Component uiContext) {
-        if (property != null) {
-            return createField(property.getType(), uiContext);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Creates the field based on the item and property id.
-     * 
-     * @see com.vaadin.ui.FieldFactory#createField(Item, Object, Component)
-     */
-    public Field<?> createField(Item item, Object propertyId,
-            Component uiContext) {
-        if (item != null && propertyId != null) {
-            final Field<?> f = createField(item.getItemProperty(propertyId),
-                    uiContext);
-            if (f instanceof AbstractComponent) {
-                String name = DefaultFieldFactory
-                        .createCaptionByPropertyId(propertyId);
-                f.setCaption(name);
-            }
-            return f;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @see com.vaadin.ui.FieldFactory#createField(com.vaadin.data.Container,
-     *      java.lang.Object, java.lang.Object, com.vaadin.ui.Component)
-     */
-    public Field<?> createField(Container container, Object itemId,
-            Object propertyId, Component uiContext) {
-        return createField(container.getContainerProperty(itemId, propertyId),
-                uiContext);
-    }
-
-}

diff --git a/src/com/vaadin/ui/FieldFactory.java b/src/com/vaadin/ui/FieldFactory.java
deleted file mode 100644 (file)
index a021870..0000000
--- a/src/com/vaadin/ui/FieldFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.ui;
-
-import com.vaadin.data.Property;
-
-/**
- * Factory for creating new Field-instances based on type, datasource and/or
- * context.
- * 
- * @author Vaadin Ltd.
- * @version
- * @VERSION@
- * @since 3.1
- * @deprecated FieldFactory was split into two lighter interfaces in 6.0 Use
- *             FormFieldFactory or TableFieldFactory or both instead.
- */
-@Deprecated
-public interface FieldFactory extends FormFieldFactory, TableFieldFactory {
-
-    /**
-     * Creates a field based on type of data.
-     * 
-     * @param type
-     *            the type of data presented in field.
-     * @param uiContext
-     *            the component where the field is presented.
-     * @return Field the field suitable for editing the specified data.
-     * 
-     */
-    Field<?> createField(Class<?> type, Component uiContext);
-
-    /**
-     * Creates a field based on the property datasource.
-     * 
-     * @param property
-     *            the property datasource.
-     * @param uiContext
-     *            the component where the field is presented.
-     * @return Field the field suitable for editing the specified data.
-     */
-    Field<?> createField(Property property, Component uiContext);
-
-}

diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index 8cc21d5a82445850938e527a295e92eff57a538a..2feddb647be2a315e5c5a43cbf87213b537fce19 100644 (file)
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -1040,23 +1040,6 @@ public class Form extends AbstractField<Object> implements Item.Editor,
         }
     }
 
-    /**
-     * Sets the field factory of Form.
-     * 
-     * <code>FieldFactory</code> is used to create fields for form properties.
-     * By default the form uses BaseFieldFactory to create Field instances.
-     * 
-     * @param fieldFactory
-     *            the New factory used to create the fields.
-     * @see Field
-     * @see FormFieldFactory
-     * @deprecated use {@link #setFormFieldFactory(FormFieldFactory)} instead
-     */
-    @Deprecated
-    public void setFieldFactory(FieldFactory fieldFactory) {
-        this.fieldFactory = fieldFactory;
-    }
-
     /**
      * Sets the field factory used by this Form to genarate Fields for
      * properties.
@@ -1082,23 +1065,6 @@ public class Form extends AbstractField<Object> implements Item.Editor,
         return fieldFactory;
     }
 
-    /**
-     * Get the field factory of the form.
-     * 
-     * @return the FieldFactory Factory used to create the fields.
-     * @deprecated Use {@link #getFormFieldFactory()} instead. Set the
-     *             FormFieldFactory using
-     *             {@link #setFormFieldFactory(FormFieldFactory)}.
-     */
-    @Deprecated
-    public FieldFactory getFieldFactory() {
-        if (fieldFactory instanceof FieldFactory) {
-            return (FieldFactory) fieldFactory;
-
-        }
-        return null;
-    }
-
     /**
      * Gets the field type.
      * 

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 8bd40f944d2504c60144c9ed299b6ffdeb50d391..fabb632494aebd113b63b40a04e6412050417d21 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -4050,44 +4050,6 @@ public class Table extends AbstractSelect implements Action.Container,
         return fieldFactory;
     }
 
-    /**
-     * Gets the FieldFactory that is used to create editor for table cells.
-     * 
-     * The FieldFactory is only used if the Table is editable.
-     * 
-     * @return FieldFactory used to create the Field instances.
-     * @see #isEditable
-     * @deprecated use {@link #getTableFieldFactory()} instead
-     */
-    @Deprecated
-    public FieldFactory getFieldFactory() {
-        if (fieldFactory instanceof FieldFactory) {
-            return (FieldFactory) fieldFactory;
-
-        }
-        return null;
-    }
-
-    /**
-     * Sets the FieldFactory that is used to create editor for table cells.
-     * 
-     * The FieldFactory is only used if the Table is editable. By default the
-     * BaseFieldFactory is used.
-     * 
-     * @param fieldFactory
-     *            the field factory to set.
-     * @see #isEditable
-     * @see BaseFieldFactory
-     * @deprecated use {@link #setTableFieldFactory(TableFieldFactory)} instead
-     */
-    @Deprecated
-    public void setFieldFactory(FieldFactory fieldFactory) {
-        this.fieldFactory = fieldFactory;
-
-        // Assure visual refresh
-        refreshRowCache();
-    }
-
     /**
      * Is table editable.
      *