diff options
Diffstat (limited to 'src/com/vaadin/ui')
| -rw-r--r-- | src/com/vaadin/ui/AbstractSelect.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/ui/DateField.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/ui/FieldFactory.java | 4 | ||||
| -rw-r--r-- | src/com/vaadin/ui/Form.java | 4 | ||||
| -rw-r--r-- | src/com/vaadin/ui/RichTextArea.java | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 0343419cf1..4361e1e9dd 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -730,7 +730,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container#getContainerProperty(Object, Object) */ - public Property getContainerProperty(Object itemId, Object propertyId) { + public Property<?> getContainerProperty(Object itemId, Object propertyId) { return items.getContainerProperty(itemId, propertyId); } diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java index 040a2a4dd4..17ef83d839 100644 --- a/src/com/vaadin/ui/DateField.java +++ b/src/com/vaadin/ui/DateField.java @@ -544,7 +544,7 @@ public class DateField extends AbstractField<Date> implements Form f = (Form) parenOfDateField; Collection<?> visibleItemProperties = f.getItemPropertyIds(); for (Object fieldId : visibleItemProperties) { - Field field = f.getField(fieldId); + Field<?> field = f.getField(fieldId); if (field == this) { /* * this datefield is logically in a form. Do the same diff --git a/src/com/vaadin/ui/FieldFactory.java b/src/com/vaadin/ui/FieldFactory.java index e8351e52dd..4c32b827b6 100644 --- a/src/com/vaadin/ui/FieldFactory.java +++ b/src/com/vaadin/ui/FieldFactory.java @@ -30,7 +30,7 @@ public interface FieldFactory extends FormFieldFactory, TableFieldFactory { * @return Field the field suitable for editing the specified data. * */ - Field createField(Class<?> type, Component uiContext); + Field<?> createField(Class<?> type, Component uiContext); /** * Creates a field based on the property datasource. @@ -41,6 +41,6 @@ public interface FieldFactory extends FormFieldFactory, TableFieldFactory { * the component where the field is presented. * @return Field the field suitable for editing the specified data. */ - Field createField(Property property, Component uiContext); + Field<?> createField(Property property, Component uiContext); }
\ No newline at end of file diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java index ed83649453..b7ba23aee3 100644 --- a/src/com/vaadin/ui/Form.java +++ b/src/com/vaadin/ui/Form.java @@ -599,7 +599,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * * @see com.vaadin.data.Item#getItemProperty(Object) */ - public Property getItemProperty(Object id) { + public Property<?> getItemProperty(Object id) { final Field<?> field = fields.get(id); if (field == null) { // field does not exist or it is not (yet) created for this property @@ -1129,7 +1129,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * * @return the Field. */ - private Field getFirstFocusableField() { + private Field<?> getFirstFocusableField() { if (getItemPropertyIds() != null) { for (Object id : getItemPropertyIds()) { if (id != null) { diff --git a/src/com/vaadin/ui/RichTextArea.java b/src/com/vaadin/ui/RichTextArea.java index dc0055c7db..545a0e0a21 100644 --- a/src/com/vaadin/ui/RichTextArea.java +++ b/src/com/vaadin/ui/RichTextArea.java @@ -222,7 +222,7 @@ public class RichTextArea extends AbstractField<String> { } @Override - public Class getType() { + public Class<String> getType() { return String.class; } |