diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2017-02-24 15:34:45 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-03-07 12:36:54 +0200 |
| commit | 47beb11cfd4f047d7c7b74f3da29de2395270735 (patch) | |
| tree | 2120bf8cdfd0aa60c409b0efedf52ba1a719a9cb | |
| parent | 6b4dffa44cc9b419391dc3b0dd836b8ac8f163ca (diff) | |
| download | vaadin-framework-47beb11cfd4f047d7c7b74f3da29de2395270735.tar.gz vaadin-framework-47beb11cfd4f047d7c7b74f3da29de2395270735.zip | |
Remove unnecessary full classname references
60 files changed, 308 insertions, 906 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ComponentConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ComponentConnector.java index 792c435503..cf966471ea 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ComponentConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ComponentConnector.java @@ -18,8 +18,8 @@ package com.vaadin.v7.client; /** * Legacy ComponentConnector with {@code isReadOnly}. * - * @author teemusa - * + * @since 8.0 + * @author Vaadin Ltd */ public interface ComponentConnector extends com.vaadin.client.ComponentConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java index cba6fc6565..f34bafe641 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java @@ -101,7 +101,7 @@ import elemental.json.JsonValue; /** * Connects the client side {@link Grid} widget with the server side - * {@link com.vaadin.ui.components.grid.Grid} component. + * <code>Grid</code> component. * <p> * The Grid is typed to JSONObject. The structure of the JSONObject is described * at {@link com.vaadin.shared.data.DataProviderRpc#setRowData(int, List) diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java index 42fc0514d4..832c03e99c 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPopupCalendar.java @@ -502,7 +502,7 @@ public class VPopupCalendar extends VTextualDate /** * For internal use only. May be removed or replaced in the future. * - * @see com.vaadin.v7.client.ui.VTextualDate#buildDate() + * @see VTextualDate#buildDate() */ @Override public void buildDate() { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerAreaConnector.java index 36518d0b65..1cc38447b1 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerAreaConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerAreaConnector.java @@ -24,16 +24,17 @@ import com.vaadin.client.ui.VColorPickerArea; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.v7.shared.ui.colorpicker.ColorPickerServerRpc; +import com.vaadin.v7.ui.ColorPickerArea; /** * A class that defines an implementation for a color picker connector. Connects - * the server side {@link com.vaadin.ui.ColorPickerArea} with the client side - * counterpart {@link VColorPickerArea} + * the server side {@link ColorPickerArea} with the client side counterpart + * {@link VColorPickerArea} * * @since 7.0.0 */ @Deprecated -@Connect(value = com.vaadin.v7.ui.ColorPickerArea.class, loadStyle = LoadStyle.LAZY) +@Connect(value = ColorPickerArea.class, loadStyle = LoadStyle.LAZY) public class ColorPickerAreaConnector extends AbstractColorPickerConnector { private ColorPickerServerRpc rpc = RpcProxy diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerConnector.java index 339c45139e..0a58e92e17 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerConnector.java @@ -23,16 +23,17 @@ import com.vaadin.client.ui.VColorPicker; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.v7.shared.ui.colorpicker.ColorPickerServerRpc; +import com.vaadin.v7.ui.ColorPicker; /** * A class that defines default implementation for a color picker connector. - * Connects the server side {@link com.vaadin.ui.ColorPicker} with the client - * side counterpart {@link VColorPicker} + * Connects the server side {@link ColorPicker} with the client side counterpart + * {@link VColorPicker} * * @since 7.0.0 */ @Deprecated -@Connect(value = com.vaadin.v7.ui.ColorPicker.class, loadStyle = LoadStyle.LAZY) +@Connect(value = ColorPicker.class, loadStyle = LoadStyle.LAZY) public class ColorPickerConnector extends AbstractColorPickerConnector { private ColorPickerServerRpc rpc = RpcProxy diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGradientConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGradientConnector.java index f71ac4d05e..34de9180d5 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGradientConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGradientConnector.java @@ -27,16 +27,16 @@ import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.v7.client.ui.AbstractLegacyComponentConnector; import com.vaadin.v7.shared.ui.colorpicker.ColorPickerGradientServerRpc; import com.vaadin.v7.shared.ui.colorpicker.ColorPickerGradientState; +import com.vaadin.v7.ui.components.colorpicker.ColorPickerGradient; /** * A class that defines the default implementation for a color picker gradient - * connector. Connects the server side - * {@link com.vaadin.ui.components.colorpicker.ColorPickerGradient} with the + * connector. Connects the server side {@link ColorPickerGradient} with the * client side counterpart {@link VColorPickerGradient} * * @since 7.0.0 */ -@Connect(value = com.vaadin.v7.ui.components.colorpicker.ColorPickerGradient.class, loadStyle = LoadStyle.LAZY) +@Connect(value = ColorPickerGradient.class, loadStyle = LoadStyle.LAZY) public class ColorPickerGradientConnector extends AbstractLegacyComponentConnector implements MouseUpHandler { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGridConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGridConnector.java index 8d7c94cb2f..e2be09d096 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGridConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/colorpicker/ColorPickerGridConnector.java @@ -27,16 +27,16 @@ import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.v7.client.ui.AbstractLegacyComponentConnector; import com.vaadin.v7.shared.ui.colorpicker.ColorPickerGridServerRpc; import com.vaadin.v7.shared.ui.colorpicker.ColorPickerGridState; +import com.vaadin.v7.ui.components.colorpicker.ColorPickerGrid; /** * A class that defines the default implementation for a color picker grid - * connector. Connects the server side - * {@link com.vaadin.ui.components.colorpicker.ColorPickerGrid} with the client + * connector. Connects the server side {@link ColorPickerGrid} with the client * side counterpart {@link VColorPickerGrid} * * @since 7.0.0 */ -@Connect(value = com.vaadin.v7.ui.components.colorpicker.ColorPickerGrid.class, loadStyle = LoadStyle.LAZY) +@Connect(value = ColorPickerGrid.class, loadStyle = LoadStyle.LAZY) public class ColorPickerGridConnector extends AbstractLegacyComponentConnector implements ClickHandler { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/form/FormConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/form/FormConnector.java index 595a8ac6e8..dcc83008b9 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/form/FormConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/form/FormConnector.java @@ -46,7 +46,7 @@ public class FormConnector extends AbstractComponentContainerConnector private final ElementResizeListener footerResizeListener = new ElementResizeListener() { @Override public void onElementResize(ElementResizeEvent e) { - com.vaadin.v7.client.ui.VForm form = getWidget(); + VForm form = getWidget(); LayoutManager lm = getLayoutManager(); int footerHeight = 0; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/RowContainer.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/RowContainer.java index b1ff0e7025..5eb1a8fa95 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/RowContainer.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/RowContainer.java @@ -23,26 +23,25 @@ import com.vaadin.v7.client.widgets.Escalator; /** * A representation of the rows in each of the sections (header, body and - * footer) in an {@link com.vaadin.v7.client.widgets.Escalator}. + * footer) in an {@link Escalator}. * * @since 7.4 * @author Vaadin Ltd - * @see com.vaadin.v7.client.widgets.Escalator#getHeader() - * @see com.vaadin.v7.client.widgets.Escalator#getBody() - * @see com.vaadin.v7.client.widgets.Escalator#getFooter() + * @see Escalator#getHeader() + * @see Escalator#getBody() + * @see Escalator#getFooter() * @see SpacerContainer */ public interface RowContainer { /** - * The row container for the body section in an - * {@link com.vaadin.v7.client.widgets.Escalator}. + * The row container for the body section in an {@link Escalator}. * <p> * The body section can contain both rows and spacers. * * @since 7.5.0 * @author Vaadin Ltd - * @see com.vaadin.v7.client.widgets.Escalator#getBody() + * @see Escalator#getBody() */ public interface BodyRowContainer extends RowContainer { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/Spacer.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/Spacer.java index 3942f2c6ed..8d9de68a51 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/Spacer.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widget/escalator/Spacer.java @@ -19,7 +19,7 @@ import com.google.gwt.dom.client.Element; /** * A representation of a spacer element in a - * {@link com.vaadin.v7.client.widget.escalator.RowContainer.BodyRowContainer}. + * {@link RowContainer.BodyRowContainer}. * * @since 7.5.0 * @author Vaadin Ltd diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java index 23b230f20d..918ab722b2 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Container.java @@ -744,7 +744,7 @@ public interface Container extends Serializable { * <p> * The children must be first explicitly removed with * {@link #setParent(Object itemId, Object newParentId)}or - * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}. + * {@link Container#removeItem(Object itemId)}. * </p> * * <p> @@ -768,8 +768,9 @@ public interface Container extends Serializable { /** * Tests if the Item specified with <code>itemId</code> is a root Item. * The hierarchical container can have more than one root and must have - * at least one unless it is empty. The {@link #getParent(Object itemId)} - * method always returns <code>null</code> for root Items. + * at least one unless it is empty. The + * {@link #getParent(Object itemId)} method always returns + * <code>null</code> for root Items. * * @param itemId * ID of the Item whose root status is to be tested @@ -846,8 +847,8 @@ public interface Container extends Serializable { * Adding items (if supported) to a filtered {@link Ordered} or * {@link Indexed} container should insert them immediately after the * indicated visible item. The unfiltered position of items added at index - * 0, at index {@link com.vaadin.v7.data.Container#size()} or at an - * undefined position is up to the implementation. + * 0, at index {@link Container#size()} or at an undefined position is up to + * the implementation. * </p> * <p> * The functionality of SimpleFilterable can be implemented using the @@ -983,8 +984,8 @@ public interface Container extends Serializable { * Adding items (if supported) to a filtered {@link Ordered} or * {@link Indexed} container should insert them immediately after the * indicated visible item. However, the unfiltered position of items added - * at index 0, at index {@link com.vaadin.v7.data.Container#size()} or at an - * undefined position is up to the implementation. + * at index 0, at index {@link Container#size()} or at an undefined position + * is up to the implementation. * </p> * * <p> @@ -1267,6 +1268,7 @@ public interface Container extends Serializable { * {@link #removePropertySetChangeListener(PropertySetChangeListener)} **/ @Deprecated - public void removeListener(Container.PropertySetChangeListener listener); + public void removeListener( + Container.PropertySetChangeListener listener); } } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java index 6da32d852a..d01b71bf79 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java @@ -28,7 +28,7 @@ import java.util.Collection; * * @author Vaadin Ltd. * @since 3.0 - * @see com.vaadin.v7.data.Validator + * @see Validator */ @Deprecated public interface Validatable extends Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java index 9d7e6032fc..200ed93779 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java @@ -30,9 +30,8 @@ import com.vaadin.server.VaadinServlet; * Interface that implements a method for validating if an {@link Object} is * valid or not. * <p> - * Implementors of this class can be added to any - * {@link com.vaadin.v7.data.Validatable Validatable} implementor to verify its - * value. + * Implementors of this class can be added to any {@link Validatable} + * implementor to verify its value. * </p> * <p> * {@link #validate(Object)} can be used to check if a value is valid. An diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java index 998c1efc73..5574379122 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java @@ -120,7 +120,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #addReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} + * {@link #addReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -144,7 +144,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #removeReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} + * {@link #removeReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -207,7 +207,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -225,7 +225,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java index 5b7bdc199a..434caebb9a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java @@ -17,6 +17,8 @@ package com.vaadin.v7.data.util; import java.util.Collection; +import com.vaadin.v7.data.Container; + /** * An in-memory container for JavaBeans. * @@ -40,8 +42,8 @@ import java.util.Collection; * * <p> * If a bean id resolver is set using - * {@link #setBeanIdResolver(com.vaadin.v7.data.util.AbstractBeanContainer.BeanIdResolver)} - * or {@link #setBeanIdProperty(Object)}, the methods {@link #addBean(Object)}, + * {@link #setBeanIdResolver(AbstractBeanContainer.BeanIdResolver)} or + * {@link #setBeanIdProperty(Object)}, the methods {@link #addBean(Object)}, * {@link #addBeanAfter(Object, Object)}, {@link #addBeanAt(int, Object)} and * {@link #addAll(java.util.Collection)} can be used to add items to the * container. If one of these methods is called, the resolver is used to @@ -79,7 +81,7 @@ public class BeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean to the Container. * - * @see com.com.vaadin.v7.data.Container#addItem(Object) + * @see Container#addItem(Object) */ @Override public BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) { @@ -93,8 +95,7 @@ public class BeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean after the given item id. * - * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, - * Object) + * @see Container.Ordered#addItemAfter(Object, Object) */ @Override public BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId, diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java index 8ea613b662..e5f1cba3ab 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java @@ -34,7 +34,7 @@ import com.vaadin.v7.data.Property; /** * <p> * A wrapper class for adding external hierarchy to containers not implementing - * the {@link com.vaadin.v7.data.Container.Hierarchical} interface. + * the {@link Container.Hierarchical} interface. * </p> * * <p> @@ -357,7 +357,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * this method fails and <code>false</code> is returned; the children must * be first explicitly removed with * {@link #setParent(Object itemId, Object newParentId)} or - * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}. + * {@link Container#removeItem(Object itemId)}. * </p> * * @param itemId @@ -737,7 +737,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -762,7 +762,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -787,7 +787,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -812,7 +812,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java index 00e580f9c5..71e230b455 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java @@ -30,7 +30,7 @@ import com.vaadin.v7.data.Property; /** * <p> * A wrapper class for adding external ordering to containers not implementing - * the {@link com.vaadin.v7.data.Container.Ordered} interface. + * the {@link Container.Ordered} interface. * </p> * * <p> @@ -548,7 +548,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -573,7 +573,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -598,7 +598,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -623,7 +623,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -631,12 +631,6 @@ public class ContainerOrderedWrapper implements Container.Ordered, removePropertySetChangeListener(listener); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object, - * java.lang.Object) - */ @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { @@ -657,11 +651,6 @@ public class ContainerOrderedWrapper implements Container.Ordered, return item; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) - */ @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java index f0a2fff8af..06fb33a973 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java @@ -741,7 +741,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * Filesystem container does not support adding new properties. * - * @see com.vaadin.v7.data.Item#addItemProperty(Object, Property) + * @see Item#addItemProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) @@ -753,7 +753,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * Filesystem container does not support removing properties. * - * @see com.vaadin.v7.data.Item#removeItemProperty(Object) + * @see Item#removeItemProperty(Object) */ @Override public boolean removeItemProperty(Object id) diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java index 694e256c4d..6bee45a616 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java @@ -195,7 +195,7 @@ public class HierarchicalContainer extends IndexedContainer * this method fails and <code>false</code> is returned; the children must * be first explicitly removed with * {@link #setParent(Object itemId, Object newParentId)} or - * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}. + * {@link Container#removeItem(Object itemId)}. * </p> * * @param itemId @@ -431,8 +431,7 @@ public class HierarchicalContainer extends IndexedContainer } @Override - protected void fireItemSetChange( - com.vaadin.v7.data.Container.ItemSetChangeEvent event) { + protected void fireItemSetChange(Container.ItemSetChangeEvent event) { if (contentsChangeEventsOn()) { super.fireItemSetChange(event); } else { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java index f9afce4714..8c959a6f6f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java @@ -17,12 +17,13 @@ package com.vaadin.v7.data.util; import java.util.Collection; +import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Container.Hierarchical; /** * A wrapper class for adding external ordering to containers not implementing - * the {@link com.vaadin.v7.data.Container.Ordered} interface while retaining - * {@link Hierarchical} features. + * the {@link Container.Ordered} interface while retaining {@link Hierarchical} + * features. * * @see ContainerOrderedWrapper */ diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java index 57004d0d91..7a540cb04c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java @@ -50,7 +50,7 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException; * <li>Sends all needed events on content changes. * </ul> * - * @see com.vaadin.v7.data.Container + * @see Container * * @author Vaadin Ltd. * @since 3.0 @@ -135,11 +135,6 @@ public class IndexedContainer return null; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getContainerPropertyIds() - */ @Override public Collection<?> getContainerPropertyIds() { return Collections.unmodifiableCollection(propertyIds); @@ -157,12 +152,6 @@ public class IndexedContainer return types.get(propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getContainerProperty(java.lang.Object, - * java.lang.Object) - */ @Override public Property getContainerProperty(Object itemId, Object propertyId) { // map lookup more efficient than propertyIds if there are many @@ -175,12 +164,6 @@ public class IndexedContainer return new IndexedContainerProperty(itemId, propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object, - * java.lang.Class, java.lang.Object) - */ @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) { @@ -220,11 +203,6 @@ public class IndexedContainer return true; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeAllItems() - */ @Override public boolean removeAllItems() { int origSize = size(); @@ -262,11 +240,6 @@ public class IndexedContainer return id; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#addItem(java.lang.Object) - */ @Override public Item addItem(Object itemId) { Item item = internalAddItemAtEnd(itemId, @@ -298,11 +271,6 @@ public class IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeItem(java.lang.Object) - */ @Override public boolean removeItem(Object itemId) { if (itemId == null || items.remove(itemId) == null) { @@ -323,11 +291,6 @@ public class IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object ) - */ @Override public boolean removeContainerProperty(Object propertyId) { @@ -357,12 +320,6 @@ public class IndexedContainer /* Container.Ordered methods */ - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object, - * java.lang.Object) - */ @Override public Item addItemAfter(Object previousItemId, Object newItemId) { return internalAddItemAfter(previousItemId, newItemId, @@ -388,11 +345,6 @@ public class IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Indexed#addItemAt(int, java.lang.Object) - */ @Override public Item addItemAt(int index, Object newItemId) { return internalAddItemAt(index, newItemId, @@ -485,11 +437,6 @@ public class IndexedContainer super(source); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property.ValueChangeEvent#getProperty() - */ @Override public Property getProperty() { return (Property) getSource(); @@ -505,7 +452,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated @Override @@ -521,7 +468,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated @Override @@ -529,12 +476,6 @@ public class IndexedContainer removePropertySetChangeListener(listener); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com. - * vaadin.data.Property.ValueChangeListener) - */ @Override public void addValueChangeListener(Property.ValueChangeListener listener) { if (propertyValueChangeListeners == null) { @@ -545,7 +486,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -553,12 +494,6 @@ public class IndexedContainer addValueChangeListener(listener); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com - * .vaadin.data.Property.ValueChangeListener) - */ @Override public void removeValueChangeListener( Property.ValueChangeListener listener) { @@ -569,7 +504,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -710,9 +645,9 @@ public class IndexedContainer /* Internal Item and Property implementations */ - /* - * A class implementing the com.vaadin.data.Item interface to be contained - * in the list. + /** + * A class implementing the {@link Item} interface to be contained in the + * list. * * @author Vaadin Ltd. * @@ -738,11 +673,6 @@ public class IndexedContainer this.itemId = itemId; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Item#getItemProperty(java.lang.Object) - */ @Override public Property getItemProperty(Object id) { if (!propertyIds.contains(id)) { @@ -821,7 +751,7 @@ public class IndexedContainer * properties at container level. See * {@link IndexedContainer#addContainerProperty(Object, Class, Object)} * - * @see com.vaadin.v7.data.Item#addProperty(Object, Property) + * @see Item#addProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) @@ -835,7 +765,7 @@ public class IndexedContainer * properties at container level. See * {@link IndexedContainer#removeContainerProperty(Object)} * - * @see com.vaadin.v7.data.Item#removeProperty(Object) + * @see Item#removeProperty(Object) */ @Override public boolean removeItemProperty(Object id) @@ -889,41 +819,21 @@ public class IndexedContainer this.itemId = itemId; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property#getType() - */ @Override public Class<T> getType() { return (Class<T>) types.get(propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property#getValue() - */ @Override public T getValue() { return (T) items.get(itemId).get(propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property#isReadOnly() - */ @Override public boolean isReadOnly() { return readOnlyProperties.contains(this); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property#setReadOnly(boolean) - */ @Override public void setReadOnly(boolean newStatus) { if (newStatus) { @@ -933,11 +843,6 @@ public class IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property#setValue(java.lang.Object) - */ @Override public void setValue(Object newValue) throws Property.ReadOnlyException { @@ -998,12 +903,6 @@ public class IndexedContainer && lp.itemId.equals(itemId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property.ValueChangeNotifier#addListener( - * com.vaadin.data.Property.ValueChangeListener) - */ @Override public void addValueChangeListener( Property.ValueChangeListener listener) { @@ -1012,7 +911,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1020,12 +919,6 @@ public class IndexedContainer addValueChangeListener(listener); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener - * (com.vaadin.data.Property.ValueChangeListener) - */ @Override public void removeValueChangeListener( Property.ValueChangeListener listener) { @@ -1034,7 +927,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1048,23 +941,11 @@ public class IndexedContainer } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], - * boolean[]) - */ @Override public void sort(Object[] propertyId, boolean[] ascending) { sortContainer(propertyId, ascending); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds - * () - */ @Override public Collection<?> getSortableContainerPropertyIds() { return getSortablePropertyIds(); @@ -1177,21 +1058,11 @@ public class IndexedContainer removeFilter(filter); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.AbstractInMemoryContainer#getContainerFilters() - */ @Override public boolean hasContainerFilters() { return super.hasContainerFilters(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.AbstractInMemoryContainer#getContainerFilters() - */ @Override public Collection<Filter> getContainerFilters() { return super.getContainerFilters(); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java index 3f3583ccdd..7d51cb9e4f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java @@ -20,8 +20,7 @@ import com.vaadin.v7.data.Property; /** * A simple data object containing one typed value. This class is a - * straightforward implementation of the the {@link com.vaadin.v7.data.Property} - * interface. + * straightforward implementation of the the {@link Property} interface. * * @author Vaadin Ltd. * @since 3.0 diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java index 108606665a..7b26eccfc6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java @@ -239,8 +239,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * This should not be called directly. */ @Override - public void valueChange( - com.vaadin.v7.data.Property.ValueChangeEvent event) { + public void valueChange(Property.ValueChangeEvent event) { fireValueChange(); } @@ -250,8 +249,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * This should not be called directly. */ @Override - public void readOnlyStatusChange( - com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent event) { + public void readOnlyStatusChange(Property.ReadOnlyStatusChangeEvent event) { fireReadOnlyStatusChange(); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java index 6663024dd0..1725be692a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java @@ -28,7 +28,7 @@ import com.vaadin.v7.data.Property; /** * Class for handling a set of identified Properties. The elements contained in - * a </code>MapItem</code> can be referenced using locally unique identifiers. + * a <code>MapItem</code> can be referenced using locally unique identifiers. * The class supports listeners who are interested in changes to the Property * set managed by the class. * @@ -212,7 +212,7 @@ public class PropertysetItem /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Item.PropertySetChangeListener)} **/ @Override @Deprecated @@ -236,7 +236,7 @@ public class PropertysetItem /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Item.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java index c73f47c1b8..482567b912 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java @@ -34,7 +34,7 @@ import com.vaadin.v7.data.Property.ValueChangeNotifier; * fired at the end of a successful transaction, whereas listeners attached to * the underlying property may receive multiple value change events. * - * @see com.vaadin.v7.data.Property.Transactional + * @see Property.Transactional * * @author Vaadin Ltd * @since 7.0 diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java index b0437e5706..007ae1c686 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java @@ -56,7 +56,7 @@ public class ReverseConverter<PRESENTATION, MODEL> @Override public MODEL convertToModel(PRESENTATION value, Class<? extends MODEL> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return realConverter.convertToPresentation(value, targetType, locale); } @@ -70,7 +70,7 @@ public class ReverseConverter<PRESENTATION, MODEL> @Override public PRESENTATION convertToPresentation(MODEL value, Class<? extends PRESENTATION> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return realConverter.convertToModel(value, targetType, locale); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigDecimalConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigDecimalConverter.java index ebd0622ef7..19a2d9caa5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigDecimalConverter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigDecimalConverter.java @@ -50,7 +50,7 @@ public class StringToBigDecimalConverter @Override public BigDecimal convertToModel(String value, Class<? extends BigDecimal> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return (BigDecimal) convertToNumber(value, BigDecimal.class, locale); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigIntegerConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigIntegerConverter.java index 16df9268ec..ed2430441d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigIntegerConverter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigIntegerConverter.java @@ -52,7 +52,7 @@ public class StringToBigIntegerConverter @Override public BigInteger convertToModel(String value, Class<? extends BigInteger> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { BigDecimal bigDecimalValue = (BigDecimal) convertToNumber(value, BigDecimal.class, locale); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToDateConverter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToDateConverter.java index 5ab926c54a..da81b5e0f2 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToDateConverter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToDateConverter.java @@ -57,17 +57,9 @@ public class StringToDateConverter implements Converter<String, Date> { return f; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object, - * java.lang.Class, java.util.Locale) - */ @Override public Date convertToModel(String value, Class<? extends Date> targetType, - Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + Locale locale) throws ConversionException { if (targetType != getModelType()) { throw new ConversionException( "Converter only supports " + getModelType().getName() @@ -91,17 +83,10 @@ public class StringToDateConverter implements Converter<String, Date> { return parsedValue; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang - * .Object, java.lang.Class, java.util.Locale) - */ @Override public String convertToPresentation(Date value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } @@ -109,21 +94,11 @@ public class StringToDateConverter implements Converter<String, Date> { return getFormat(locale).format(value); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.converter.Converter#getModelType() - */ @Override public Class<Date> getModelType() { return Date.class; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.converter.Converter#getPresentationType() - */ @Override public Class<String> getPresentationType() { return String.class; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java index 1bb0c1a96a..408321bfff 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java @@ -206,12 +206,6 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#containsId(java.lang.Object) - */ - @Override public boolean containsId(Object itemId) { if (itemId == null) { @@ -248,13 +242,6 @@ public class SQLContainer implements Container, Container.Filterable, return false; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getContainerProperty(java.lang.Object, - * java.lang.Object) - */ - @Override public Property getContainerProperty(Object itemId, Object propertyId) { Item item = getItem(itemId); @@ -264,23 +251,11 @@ public class SQLContainer implements Container, Container.Filterable, return item.getItemProperty(propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getContainerPropertyIds() - */ - @Override public Collection<?> getContainerPropertyIds() { return Collections.unmodifiableCollection(propertyIds); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getItem(java.lang.Object) - */ - @Override public Item getItem(Object itemId) { if (!cachedItems.containsKey(itemId)) { @@ -381,12 +356,6 @@ public class SQLContainer implements Container, Container.Filterable, return Collections.unmodifiableCollection(ids); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getType(java.lang.Object) - */ - @Override public Class<?> getType(Object propertyId) { if (!propertyIds.contains(propertyId)) { @@ -395,24 +364,12 @@ public class SQLContainer implements Container, Container.Filterable, return propertyTypes.get(propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#size() - */ - @Override public int size() { updateCount(); return size + sizeOfAddedItems() - removedItems.size(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeItem(java.lang.Object) - */ - @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { @@ -476,12 +433,6 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeAllItems() - */ - @Override public boolean removeAllItems() throws UnsupportedOperationException { if (autoCommit) { @@ -614,11 +565,6 @@ public class SQLContainer implements Container, Container.Filterable, return !getContainerFilters().isEmpty(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Filterable#getContainerFilters() - */ @Override public Collection<Filter> getContainerFilters() { return Collections.unmodifiableCollection(filters); @@ -628,12 +574,6 @@ public class SQLContainer implements Container, Container.Filterable, /** Methods from interface Container.Indexed **/ /**********************************************/ - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Indexed#indexOfId(java.lang.Object) - */ - @Override public int indexOfId(Object itemId) { // First check if the id is in the added items @@ -687,12 +627,6 @@ public class SQLContainer implements Container, Container.Filterable, return -1; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Indexed#getIdByIndex(int) - */ - @Override public Object getIdByIndex(int index) { if (index < 0) { @@ -727,12 +661,6 @@ public class SQLContainer implements Container, Container.Filterable, /** Methods from interface Container.Ordered **/ /**********************************************/ - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object) - */ - @Override public Object nextItemId(Object itemId) { int index = indexOfId(itemId) + 1; @@ -743,12 +671,6 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object) - */ - @Override public Object prevItemId(Object itemId) { int prevIndex = indexOfId(itemId) - 1; @@ -759,12 +681,6 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#firstItemId() - */ - @Override public Object firstItemId() { updateCount(); @@ -788,12 +704,6 @@ public class SQLContainer implements Container, Container.Filterable, return itemIndexes.get(0); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#lastItemId() - */ - @Override public Object lastItemId() { if (addedItems.isEmpty()) { @@ -815,23 +725,11 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object) - */ - @Override public boolean isFirstId(Object itemId) { return firstItemId().equals(itemId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object) - */ - @Override public boolean isLastId(Object itemId) { return lastItemId().equals(itemId); @@ -841,13 +739,6 @@ public class SQLContainer implements Container, Container.Filterable, /** Methods from interface Container.Sortable **/ /***********************************************/ - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], - * boolean[]) - */ - @Override public void sort(Object[] propertyId, boolean[] ascending) { sorters.clear(); @@ -872,12 +763,6 @@ public class SQLContainer implements Container, Container.Filterable, refresh(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() - */ - @Override public Collection<?> getSortableContainerPropertyIds() { return getContainerPropertyIds(); @@ -1327,8 +1212,7 @@ public class SQLContainer implements Container, Container.Filterable, } else { id = new RowId(itemId); } - List<String> propertiesToAdd = new ArrayList<>( - propertyIds); + List<String> propertiesToAdd = new ArrayList<>(propertyIds); if (!removedItems.containsKey(id)) { for (int i = 1; i <= rsmd.getColumnCount(); i++) { if (!isColumnIdentifierValid(rsmd.getColumnLabel(i))) { @@ -1486,84 +1370,40 @@ public class SQLContainer implements Container, Container.Filterable, /** UNSUPPORTED CONTAINER FEATURES **/ /************************************/ - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object, - * java.lang.Class, java.lang.Object) - */ - @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object) - */ - @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#addItem(java.lang.Object) - */ - @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object, - * java.lang.Object) - */ - @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Indexed#addItemAt(int, java.lang.Object) - */ - @Override public Item addItemAt(int index, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Indexed#addItemAt(int) - */ - @Override public Object addItemAt(int index) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) - */ - @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { @@ -1574,14 +1414,6 @@ public class SQLContainer implements Container, Container.Filterable, /** ITEMSETCHANGENOTIFIER IMPLEMENTATION **/ /******************************************/ - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin - * .data.Container.ItemSetChangeListener) - */ - @Override public void addItemSetChangeListener( Container.ItemSetChangeListener listener) { @@ -1593,7 +1425,7 @@ public class SQLContainer implements Container, Container.Filterable, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1601,14 +1433,6 @@ public class SQLContainer implements Container, Container.Filterable, addItemSetChangeListener(listener); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin - * .data.Container.ItemSetChangeListener) - */ - @Override public void removeItemSetChangeListener( Container.ItemSetChangeListener listener) { @@ -1619,7 +1443,7 @@ public class SQLContainer implements Container, Container.Filterable, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java index 4f65d09418..dcd0258f49 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java @@ -190,11 +190,6 @@ public class TableQuery extends AbstractTransactionalQuery fetchMetaData(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getCount() - */ @Override public int getCount() throws SQLException { getLogger().log(Level.FINE, "Fetching count..."); @@ -226,12 +221,6 @@ public class TableQuery extends AbstractTransactionalQuery return count; } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getResults(int, - * int) - */ @Override public ResultSet getResults(int offset, int pagelength) throws SQLException { @@ -254,24 +243,11 @@ public class TableQuery extends AbstractTransactionalQuery return executeQuery(sh); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate# - * implementationRespectsPagingLimits() - */ @Override public boolean implementationRespectsPagingLimits() { return true; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.sqlcontainer.query.QueryDelegate#storeRow(com.vaadin - * .addon.sqlcontainer.RowItem) - */ @Override public int storeRow(RowItem row) throws UnsupportedOperationException, SQLException { @@ -352,13 +328,6 @@ public class TableQuery extends AbstractTransactionalQuery } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.sqlcontainer.query.QueryDelegate#setFilters(java.util - * .List) - */ @Override public void setFilters(List<Filter> filters) throws UnsupportedOperationException { @@ -369,13 +338,6 @@ public class TableQuery extends AbstractTransactionalQuery this.filters = Collections.unmodifiableList(filters); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.sqlcontainer.query.QueryDelegate#setOrderBy(java.util - * .List) - */ @Override public void setOrderBy(List<OrderBy> orderBys) throws UnsupportedOperationException { @@ -386,11 +348,6 @@ public class TableQuery extends AbstractTransactionalQuery this.orderBys = Collections.unmodifiableList(orderBys); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#beginTransaction() - */ @Override public void beginTransaction() throws UnsupportedOperationException, SQLException { @@ -398,11 +355,6 @@ public class TableQuery extends AbstractTransactionalQuery super.beginTransaction(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#commit() - */ @Override public void commit() throws UnsupportedOperationException, SQLException { getLogger().log(Level.FINE, "DB -> commit"); @@ -421,23 +373,12 @@ public class TableQuery extends AbstractTransactionalQuery } } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#rollback() - */ @Override public void rollback() throws UnsupportedOperationException, SQLException { getLogger().log(Level.FINE, "DB -> rollback"); super.rollback(); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.sqlcontainer.query.QueryDelegate#getPrimaryKeyColumns() - */ @Override public List<String> getPrimaryKeyColumns() { return Collections.unmodifiableList(primaryKeyColumns); @@ -715,13 +656,6 @@ public class TableQuery extends AbstractTransactionalQuery } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.sqlcontainer.query.QueryDelegate#removeRow(com.vaadin - * .addon.sqlcontainer.RowItem) - */ @Override public boolean removeRow(RowItem row) throws UnsupportedOperationException, SQLException { @@ -741,13 +675,6 @@ public class TableQuery extends AbstractTransactionalQuery return false; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.sqlcontainer.query.QueryDelegate#containsRowWithKey( - * java.lang.Object[]) - */ @Override public boolean containsRowWithKey(Object... keys) throws SQLException { ArrayList<Filter> filtersAndKeys = new ArrayList<>(); @@ -837,7 +764,7 @@ public class TableQuery extends AbstractTransactionalQuery /** * @deprecated As of 7.0, replaced by - * {@link #addRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} + * {@link #addRowIdChangeListener(QueryDelegate.RowIdChangeListener)} **/ @Override @Deprecated @@ -857,7 +784,7 @@ public class TableQuery extends AbstractTransactionalQuery /** * @deprecated As of 7.0, replaced by - * {@link #removeRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} + * {@link #removeRowIdChangeListener(QueryDelegate.RowIdChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java index 1b71456452..62f75af888 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java @@ -18,9 +18,8 @@ package com.vaadin.v7.data.validator; import com.vaadin.v7.data.Validator; /** - * Abstract {@link com.vaadin.v7.data.Validator Validator} implementation that - * provides a basic Validator implementation except the - * {@link #isValidValue(Object)} method. + * Abstract {@link Validator} implementation that provides a basic Validator + * implementation except the {@link #isValidValue(Object)} method. * <p> * To include the value that failed validation in the exception message you can * use "{0}" in the error message. This will be replaced with the failed value diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java index 9c8e83749d..7354a9aa06 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java @@ -20,8 +20,7 @@ import com.vaadin.v7.data.util.converter.StringToDoubleConverter; /** * String validator for a double precision floating point number. See - * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for more - * information. + * {@link AbstractStringValidator} for more information. * * @author Vaadin Ltd. * @since 5.4 diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java index 9c7e855b92..b7333da9cb 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java @@ -20,8 +20,7 @@ package com.vaadin.v7.data.validator; * complete according to RFC 822 but handles the vast majority of valid e-mail * addresses correctly. * - * See {@link com.vaadin.v7.data.validator.AbstractStringValidator} for more - * information. + * See {@link AbstractStringValidator} for more information. * * <p> * An empty string or a null is always accepted - use the required flag on diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java index afa6e3ee59..a65c7884f2 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java @@ -19,8 +19,7 @@ import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.converter.StringToIntegerConverter; /** - * String validator for integers. See - * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for more + * String validator for integers. See {@link AbstractStringValidator} for more * information. * * @author Vaadin Ltd. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java index 4485076239..ccf19a7b39 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java @@ -27,8 +27,7 @@ import java.util.regex.Pattern; * {@link java.util.regex.Pattern#sum} * </p> * <p> - * See {@link com.vaadin.v7.data.validator.AbstractStringValidator} for more - * information. + * See {@link AbstractStringValidator} for more information. * </p> * <p> * An empty string or a null is always accepted - use the required flag on diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java index 4c4b8edd31..8d55c7f98f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java @@ -28,8 +28,7 @@ import com.vaadin.v7.data.Container; * (identified by its Id) and optionally also a property identifier (e.g. a * table column identifier when transferring a single table cell). * - * The component must implement the interface - * {@link com.vaadin.v7.data.Container.Viewer}. + * The component must implement the interface {@link Container.Viewer}. * * In most cases, receivers of data transfers should depend on this class * instead of its concrete subclasses. @@ -63,8 +62,8 @@ public abstract class DataBoundTransferable extends TransferableImpl { /** * Returns the container data source from which the transfer occurs. * - * {@link com.vaadin.v7.data.Container.Viewer#getContainerDataSource()} is - * used to obtain the underlying container of the source component. + * {@link Container.Viewer#getContainerDataSource()} is used to obtain the + * underlying container of the source component. * * @return Container */ diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java index 8d8c520208..2f694655b0 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java @@ -21,15 +21,16 @@ import java.lang.reflect.Method; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.ui.Component; +import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; /** * - * Click event fired by a {@link Component} implementing - * {@link com.vaadin.v7.data.Container} interface. ItemClickEvents happens on an - * {@link Item} rendered somehow on terminal. Event may also contain a specific - * {@link Property} on which the click event happened. + * Click event fired by a {@link Component} implementing {@link Container} + * interface. ItemClickEvents happens on an {@link Item} rendered somehow on + * terminal. Event may also contain a specific {@link Property} on which the + * click event happened. * * @since 5.3 * diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java index f8188faa4d..53591e1d97 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java @@ -41,6 +41,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.v7.data.Buffered; +import com.vaadin.v7.data.BufferedValidatable; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validatable; import com.vaadin.v7.data.Validator; @@ -54,21 +55,21 @@ import com.vaadin.v7.shared.AbstractFieldState; * <p> * Abstract field component for implementing buffered property editors. The * field may hold an internal value, or it may be connected to any data source - * that implements the {@link com.vaadin.v7.data.Property}interface. + * that implements the {@link Property}interface. * <code>LegacyAbstractField</code> implements that interface itself, too, so * accessing the Property value represented by it is straightforward. * </p> * * <p> - * LegacyAbstractField also provides the {@link com.vaadin.v7.data.Buffered} - * interface for buffering the data source value. By default the LegacyField is - * in write through-mode and {@link #setWriteThrough(boolean)}should be called - * to enable buffering. + * LegacyAbstractField also provides the {@link Buffered} interface for + * buffering the data source value. By default the LegacyField is in write + * through-mode and {@link #setWriteThrough(boolean)}should be called to enable + * buffering. * </p> * * <p> - * The class also supports {@link com.vaadin.v7.data.Validator validators} to - * make sure the value contained in the field is valid. + * The class also supports {@link Validator validators} to make sure the value + * contained in the field is valid. * </p> * * @author Vaadin Ltd. @@ -227,7 +228,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent /** * Tests if the invalid data is committed to datasource. * - * @see com.vaadin.v7.data.BufferedValidatable#isInvalidCommitted() + * @see BufferedValidatable#isInvalidCommitted() */ @Override public boolean isInvalidCommitted() { @@ -237,7 +238,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent /** * Sets if the invalid data should be committed to datasource. * - * @see com.vaadin.v7.data.BufferedValidatable#setInvalidCommitted(boolean) + * @see BufferedValidatable#setInvalidCommitted(boolean) */ @Override public void setInvalidCommitted(boolean isCommitted) { @@ -582,14 +583,12 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent * </p> * * <p> - * If the data source implements - * {@link com.vaadin.v7.data.Property.ValueChangeNotifier} and/or - * {@link com.vaadin.v7.data.Property.ReadOnlyStatusChangeNotifier}, the - * field registers itself as a listener and updates itself according to the - * events it receives. To avoid memory leaks caused by references to a field - * no longer in use, the listener registrations are removed on - * {@link AbstractField#detach() detach} and re-added on - * {@link AbstractField#attach() attach}. + * If the data source implements {@link Property.ValueChangeNotifier} and/or + * {@link Property.ReadOnlyStatusChangeNotifier}, the field registers itself + * as a listener and updates itself according to the events it receives. To + * avoid memory leaks caused by references to a field no longer in use, the + * listener registrations are removed on {@link AbstractField#detach() + * detach} and re-added on {@link AbstractField#attach() attach}. * </p> * * <p> @@ -925,7 +924,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent * is required and empty this method throws an EmptyValueException with the * error message set using {@link #setRequiredError(String)}. * - * @see com.vaadin.v7.data.Validatable#validate() + * @see Validatable#validate() */ @Override public void validate() throws Validator.InvalidValueException { @@ -997,7 +996,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent * because the field otherwise visually forget the user input immediately. * * @return true iff the invalid values are allowed. - * @see com.vaadin.v7.data.Validatable#isInvalidAllowed() + * @see Validatable#isInvalidAllowed() */ @Override public boolean isInvalidAllowed() { @@ -1015,7 +1014,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent * datasource is set. * </p> * - * @see com.vaadin.v7.data.Validatable#setInvalidAllowed(boolean) + * @see Validatable#setInvalidAllowed(boolean) */ @Override public void setInvalidAllowed(boolean invalidAllowed) @@ -1098,7 +1097,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1122,7 +1121,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1223,7 +1222,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent /** * @deprecated As of 7.0, replaced by - * {@link #addReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} + * {@link #addReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -1245,7 +1244,7 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent /** * @deprecated As of 7.0, replaced by - * {@link #removeReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} + * {@link #removeReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java index 127bdf6e7b..103eebb4e9 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java @@ -44,6 +44,7 @@ import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; import com.vaadin.server.VaadinSession; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; @@ -65,8 +66,7 @@ import com.vaadin.v7.shared.ui.select.AbstractSelectState; /** * <p> * A class representing a selection of items the user has selected in a UI. The - * set of choices is presented as a set of {@link com.com.vaadin.v7.data.Item}s - * in a {@link com.com.vaadin.v7.data.Container}. + * set of choices is presented as a set of {@link Item}s in a {@link Container}. * </p> * * <p> @@ -108,7 +108,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Item caption mode: Index of the item is used as caption. The index * mode can only be used with the containers implementing the - * {@link com.vaadin.data.Container.Indexed} interface. + * {@link Container.Indexed} interface. */ INDEX, /** @@ -447,8 +447,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Invoked when the value of a variable has changed. * - * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object, - * java.util.Map) + * @see AbstractComponent#changeVariables(java.lang.Object, java.util.Map) */ @Override public void changeVariables(Object source, Map<String, Object> variables) { @@ -648,7 +647,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Gets the selected item id or in multiselect mode a set of selected ids. * - * @see com.vaadin.v7.ui.AbstractField#getValue() + * @see AbstractField#getValue() */ @Override public Object getValue() { @@ -688,7 +687,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @param newValue * the New selected item or collection of selected items. - * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object) + * @see AbstractField#setValue(java.lang.Object) */ @Override public void setValue(Object newValue) throws Property.ReadOnlyException { @@ -715,13 +714,11 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * True if caller is sure that repaint is not needed. * @param ignoreReadOnly * True if read-only check should be omitted. - * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object, - * java.lang.Boolean) + * @see AbstractField#setValue(java.lang.Object, java.lang.Boolean) */ @Override protected void setValue(Object newFieldValue, boolean repaintIsNotNeeded, - boolean ignoreReadOnly) - throws com.vaadin.v7.data.Property.ReadOnlyException, + boolean ignoreReadOnly) throws Property.ReadOnlyException, ConversionException, InvalidValueException { if (isMultiSelect()) { if (newFieldValue == null) { @@ -779,19 +776,19 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @param propertyId * the Id identifying the property. - * @see com.com.vaadin.v7.data.Container#getType(java.lang.Object) + * @see Container#getType(java.lang.Object) */ @Override public Class<?> getType(Object propertyId) { return items.getType(propertyId); } - /* + /** * Gets the number of items in the container. * * @return the Number of items in the container. * - * @see com.vaadin.data.Container#size() + * @see Container#size() */ @Override public int size() { @@ -819,8 +816,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * Gets the Property identified by the given itemId and propertyId from the * Container * - * @see com.com.vaadin.v7.data.Container#getContainerProperty(Object, - * Object) + * @see Container#getContainerProperty(Object, Object) */ @Override public Property getContainerProperty(Object itemId, Object propertyId) { @@ -835,8 +831,8 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * returns false. * * @return True if the operation succeeded. - * @see com.com.vaadin.v7.data.Container#addContainerProperty(java.lang.Object, - * java.lang.Class, java.lang.Object) + * @see Container#addContainerProperty(java.lang.Object, java.lang.Class, + * java.lang.Object) */ @Override public boolean addContainerProperty(Object propertyId, Class<?> type, @@ -857,7 +853,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * returns false. * * @return True if the operation succeeded. - * @see com.com.vaadin.v7.data.Container#removeAllItems() + * @see Container#removeAllItems() */ @Override public boolean removeAllItems() throws UnsupportedOperationException { @@ -879,7 +875,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * method. if the creation fails, null is returned. * * @return the Id of the created item or null in case of failure. - * @see com.com.vaadin.v7.data.Container#addItem() + * @see Container#addItem() */ @Override public Object addItem() throws UnsupportedOperationException { @@ -904,7 +900,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @param itemId * the Identification of the item to be created. * @return the Created item with the given id, or null in case of failure. - * @see com.com.vaadin.v7.data.Container#addItem(java.lang.Object) + * @see Container#addItem(java.lang.Object) */ @Override public Item addItem(Object itemId) throws UnsupportedOperationException { @@ -949,11 +945,6 @@ public abstract class AbstractSelect extends AbstractField<Object> implements addItems(itemIds.toArray()); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeItem(java.lang.Object) - */ @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { @@ -1011,7 +1002,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * returns false. * * @return True if the operation succeeded. - * @see com.com.vaadin.v7.data.Container#removeContainerProperty(java.lang.Object) + * @see Container#removeContainerProperty(java.lang.Object) */ @Override public boolean removeContainerProperty(Object propertyId) @@ -1032,7 +1023,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * As a side-effect the fields value (selection) is set to null due old * selection not necessary exists in new Container. * - * @see com.com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container) + * @see Container.Viewer#setContainerDataSource(Container) * * @param newDataSource * the new data source. @@ -1091,7 +1082,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Gets the viewing data-source container. * - * @see com.com.vaadin.v7.data.Container.Viewer#getContainerDataSource() + * @see Container.Viewer#getContainerDataSource() */ @Override public Container getContainerDataSource() { @@ -1569,7 +1560,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Notifies this listener that the Containers contents has changed. * - * @see com.com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.com.vaadin.v7.data.Container.PropertySetChangeEvent) + * @see Container.PropertySetChangeListener#containerPropertySetChange(Container.PropertySetChangeEvent) */ @Override public void containerPropertySetChange( @@ -1580,7 +1571,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Adds a new Property set change listener for this Container. * - * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener) + * @see Container.PropertySetChangeNotifier#addListener(Container.PropertySetChangeListener) */ @Override public void addPropertySetChangeListener( @@ -1593,7 +1584,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -1604,7 +1595,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Removes a previously registered Property set change listener. * - * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener) + * @see Container.PropertySetChangeNotifier#removeListener(Container.PropertySetChangeListener) */ @Override public void removePropertySetChangeListener( @@ -1619,7 +1610,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -1630,7 +1621,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Adds an Item set change listener for the object. * - * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener) + * @see Container.ItemSetChangeNotifier#addListener(Container.ItemSetChangeListener) */ @Override public void addItemSetChangeListener( @@ -1643,7 +1634,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1654,7 +1645,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Removes the Item set change listener from the object. * - * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener) + * @see Container.ItemSetChangeNotifier#removeListener(Container.ItemSetChangeListener) */ @Override public void removeItemSetChangeListener( @@ -1669,7 +1660,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1702,7 +1693,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Lets the listener know a Containers Item set has changed. * - * @see com.com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.com.vaadin.v7.data.Container.ItemSetChangeEvent) + * @see Container.ItemSetChangeListener#containerItemSetChange(Container.ItemSetChangeEvent) */ @Override public void containerItemSetChange(Container.ItemSetChangeEvent event) { @@ -1759,7 +1750,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Gets the Property where the event occurred. * - * @see com.com.vaadin.v7.data.Container.ItemSetChangeEvent#getContainer() + * @see Container.ItemSetChangeEvent#getContainer() */ @Override public Container getContainer() { @@ -1781,7 +1772,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Retrieves the Container whose contents have been modified. * - * @see com.com.vaadin.v7.data.Container.PropertySetChangeEvent#getContainer() + * @see Container.PropertySetChangeEvent#getContainer() */ @Override public Container getContainer() { @@ -1880,7 +1871,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Notifies the component that it is connected to an application. * - * @see com.vaadin.v7.ui.AbstractField#attach() + * @see AbstractField#attach() */ @Override public void attach() { @@ -1890,7 +1881,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Detaches the component from application. * - * @see com.vaadin.ui.AbstractComponent#detach() + * @see vaadin.ui.AbstractComponent#detach() */ @Override public void detach() { @@ -1993,14 +1984,12 @@ public abstract class AbstractSelect extends AbstractField<Object> implements } @Override - public void valueChange( - com.vaadin.v7.data.Property.ValueChangeEvent event) { + public void valueChange(Property.ValueChangeEvent event) { markAsDirty(); } @Override - public void itemPropertySetChange( - com.vaadin.v7.data.Item.PropertySetChangeEvent event) { + public void itemPropertySetChange(Item.PropertySetChangeEvent event) { markAsDirty(); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java index bf3089e531..73b147533c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java @@ -49,6 +49,7 @@ import com.vaadin.event.dd.TargetDetails; import com.vaadin.server.KeyMapper; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; +import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; @@ -108,11 +109,8 @@ import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler; * * <li>If date range is seven days or shorter, the weekly view is used.</li> * - * <li>Calendar queries its events by using a - * {@link com.vaadin.addon.calendar.event.CalendarEventProvider - * CalendarEventProvider}. By default, a - * {@link com.vaadin.addon.calendar.event.BasicEventProvider BasicEventProvider} - * is used.</li> + * <li>Calendar queries its events by using a {@link CalendarEventProvider}. By + * default, a {@link BasicEventProvider} is used.</li> * * @since 7.1 * @author Vaadin Ltd. @@ -427,7 +425,7 @@ public class Calendar extends AbstractLegacyComponent /** * Sets the locale to be used in the Calendar component. * - * @see com.vaadin.ui.AbstractComponent#setLocale(java.util.Locale) + * @see AbstractComponent#setLocale(java.util.Locale) */ @Override public void setLocale(Locale newLocale) { @@ -1373,11 +1371,9 @@ public class Calendar extends AbstractLegacyComponent } /** - * Set the {@link com.vaadin.addon.calendar.event.CalendarEventProvider - * CalendarEventProvider} to be used with this calendar. The EventProvider - * is used to query for events to show, and must be non-null. By default a - * {@link com.vaadin.addon.calendar.event.BasicEventProvider - * BasicEventProvider} is used. + * Set the {@link CalendarEventProvider} to be used with this calendar. The + * EventProvider is used to query for events to show, and must be non-null. + * By default a {@link BasicEventProvider} is used. * * @param calendarEventProvider * the calendarEventProvider to set. Cannot be null. @@ -1404,19 +1400,12 @@ public class Calendar extends AbstractLegacyComponent } /** - * @return the {@link com.vaadin.addon.calendar.event.CalendarEventProvider - * CalendarEventProvider} currently used + * @return the {@link CalendarEventProvider} currently used */ public CalendarEventProvider getEventProvider() { return calendarEventProvider; } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.calendar.ui.CalendarEvents.EventChangeListener# - * eventChange (com.vaadin.addon.calendar.ui.CalendarEvents.EventChange) - */ @Override public void eventSetChange(EventSetChangeEvent changeEvent) { // sanity check @@ -1454,100 +1443,42 @@ public class Calendar extends AbstractLegacyComponent } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler) - */ @Override public void setHandler(ForwardHandler listener) { setHandler(ForwardEvent.EVENT_ID, ForwardEvent.class, listener, ForwardHandler.forwardMethod); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardHandler) - */ @Override public void setHandler(BackwardHandler listener) { setHandler(BackwardEvent.EVENT_ID, BackwardEvent.class, listener, BackwardHandler.backwardMethod); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickHandler) - */ @Override public void setHandler(DateClickHandler listener) { setHandler(DateClickEvent.EVENT_ID, DateClickEvent.class, listener, DateClickHandler.dateClickMethod); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventClickHandler) - */ @Override public void setHandler(EventClickHandler listener) { setHandler(EventClick.EVENT_ID, EventClick.class, listener, EventClickHandler.eventClickMethod); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.WeekClickHandler) - */ @Override public void setHandler(WeekClickHandler listener) { setHandler(WeekClick.EVENT_ID, WeekClick.class, listener, WeekClickHandler.weekClickMethod); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeHandler - * ) - */ @Override public void setHandler(EventResizeHandler listener) { setHandler(EventResize.EVENT_ID, EventResize.class, listener, EventResizeHandler.eventResizeMethod); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.RangeSelectNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.RangeSelectHandler - * ) - */ @Override public void setHandler(RangeSelectHandler listener) { setHandler(RangeSelectEvent.EVENT_ID, RangeSelectEvent.class, listener, @@ -1555,26 +1486,12 @@ public class Calendar extends AbstractLegacyComponent } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveNotifier - * #addListener - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveHandler) - */ @Override public void setHandler(EventMoveHandler listener) { setHandler(MoveEvent.EVENT_ID, MoveEvent.class, listener, EventMoveHandler.eventMoveMethod); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents. - * CalendarEventNotifier #getHandler(java.lang.String) - */ @Override public EventListener getHandler(String eventId) { return handlers.get(eventId); @@ -1599,12 +1516,6 @@ public class Calendar extends AbstractLegacyComponent this.dropHandler = dropHandler; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.event.dd.DropTarget#translateDropTargetDetails(java.util.Map) - */ @Override public TargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { @@ -1645,7 +1556,7 @@ public class Calendar extends AbstractLegacyComponent * Use this method if you are adding a container which uses the default * property ids like {@link BeanItemContainer} for instance. If you are * using custom properties instead use - * {@link Calendar#setContainerDataSource(com.vaadin.v7.data.Container.Indexed, Object, Object, Object, Object, Object)} + * {@link Calendar#setContainerDataSource(Container.Indexed, Object, Object, Object, Object, Object)} * * Please note that the container must be sorted by date! * @@ -1725,13 +1636,6 @@ public class Calendar extends AbstractLegacyComponent setEventProvider(provider); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java. - * util.Date, java.util.Date) - */ @Override public List<CalendarEvent> getEvents(Date startDate, Date endDate) { List<CalendarEvent> events = getEventProvider().getEvents(startDate, @@ -1740,13 +1644,6 @@ public class Calendar extends AbstractLegacyComponent return events; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent - * (com.vaadin.addon.calendar.event.CalendarEvent) - */ @Override public void addEvent(CalendarEvent event) { if (getEventProvider() instanceof CalendarEditableEventProvider) { @@ -1759,13 +1656,6 @@ public class Calendar extends AbstractLegacyComponent } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent - * (com.vaadin.addon.calendar.event.CalendarEvent) - */ @Override public void removeEvent(CalendarEvent event) { if (getEventProvider() instanceof CalendarEditableEventProvider) { @@ -1840,13 +1730,6 @@ public class Calendar extends AbstractLegacyComponent } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.event.Action.Container#removeActionHandler(com.vaadin.event - * .Action.Handler) - */ @Override public void removeActionHandler(Handler actionHandler) { if (actionHandlers != null && actionHandlers.contains(actionHandler)) { @@ -2027,12 +1910,6 @@ public class Calendar extends AbstractLegacyComponent } } - /* - * (non-Javadoc) - * - * @see com.vaadin.server.VariableOwner#changeVariables(java.lang.Object, - * java.util.Map) - */ @Override public void changeVariables(Object source, Map<String, Object> variables) { /* @@ -2041,12 +1918,6 @@ public class Calendar extends AbstractLegacyComponent */ } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.ui.LegacyComponent#paintContent(com.vaadin.server.PaintTarget) - */ @Override public void paintContent(PaintTarget target) throws PaintException { if (dropHandler != null) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java index 61f670da6d..16b0268354 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java @@ -39,6 +39,7 @@ import com.vaadin.ui.DateTimeField; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Buffered; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; @@ -56,12 +57,12 @@ import com.vaadin.v7.shared.ui.datefield.TextualDateFieldState; * </p> * <p> * Since <code>DateField</code> extends <code>LegacyAbstractField</code> it - * implements the {@link com.vaadin.v7.data.Buffered}interface. + * implements the {@link Buffered}interface. * </p> * <p> * A <code>DateField</code> is in write-through mode by default, so - * {@link com.vaadin.v7.ui.AbstractField#setWriteThrough(boolean)}must be called - * to enable buffering. + * {@link AbstractField#setWriteThrough(boolean)}must be called to enable + * buffering. * </p> * * @author Vaadin Ltd. @@ -234,8 +235,8 @@ public class DateField extends AbstractField<Date> implements * Constructs a new <code>DateField</code> with the given caption and * initial text contents. The editor constructed this way will not be bound * to a Property unless - * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)} - * is called to bind it. + * {@link Property.Viewer#setPropertyDataSource(Property)} is called to bind + * it. * * @param caption * the caption <code>String</code> for the editor. @@ -700,11 +701,6 @@ public class DateField extends AbstractField<Date> implements return Date.class; } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractField#setValue(java.lang.Object, boolean) - */ @Override protected void setValue(Date newValue, boolean repaintIsNotNeeded) throws Property.ReadOnlyException { @@ -857,7 +853,7 @@ public class DateField extends AbstractField<Date> implements * @param dateFormat * the dateFormat to set * - * @see com.vaadin.ui.AbstractComponent#setLocale(Locale)) + * @see AbstractComponent#setLocale(Locale)) */ public void setDateFormat(String dateFormat) { this.dateFormat = dateFormat; @@ -952,7 +948,7 @@ public class DateField extends AbstractField<Date> implements * invalid if it contains text typed in by the user that couldn't be parsed * into a Date value. * - * @see com.vaadin.v7.ui.AbstractField#validate() + * @see AbstractField#validate() */ @Override public void validate() throws InvalidValueException { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java index 4b60679c41..b8756c3d7f 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java @@ -31,7 +31,7 @@ import com.vaadin.v7.data.Property; * <p> * There are also some static helper methods available for custom built field * factories. - * + * * @deprecated Removed feature in 8.0 */ @Deprecated @@ -106,7 +106,7 @@ public class DefaultFieldFactory } // Item field - if (com.vaadin.v7.data.Item.class.isAssignableFrom(type)) { + if (Item.class.isAssignableFrom(type)) { return new Form(); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Field.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Field.java index 1594bc28b5..1e3a4fa7a3 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Field.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Field.java @@ -26,11 +26,10 @@ import com.vaadin.v7.data.Property; * a value that the user can change through the user interface. * * LegacyField components are built upon the framework defined in the - * LegacyField interface and the {@link com.vaadin.AbstractField} base class. + * LegacyField interface and the {@link AbstractField} base class. * - * The LegacyField interface inherits the {@link com.vaadin.ui.Component} - * superinterface and also the {@link com.vaadin.ui.Property} interface to have - * a value for the field. + * The LegacyField interface inherits the {@link Component} superinterface and + * also the {@link Property} interface to have a value for the field. * * @author Vaadin Ltd. * @@ -41,7 +40,7 @@ import com.vaadin.v7.data.Property; * @deprecated This interface is, apart from the rename, identical to the Vaadin * 7 {@code com.vaadin.ui.Field}. It is provided for compatibility * and migration purposes. As of 8.0, new field components should - * extend {@link com.vaadin.ui.AbstractField} instead. + * extend {@link AbstractField} instead. */ @Deprecated public interface Field<T> extends Component, BufferedValidatable, Property<T>, diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java index 579bc063b8..e0953a1eb4 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java @@ -67,16 +67,15 @@ import com.vaadin.v7.shared.form.FormState; * * <p> * <code>Form</code> provides customizable editor for classes implementing - * {@link com.vaadin.data.Item} interface. Also the form itself implements this - * interface for easier connectivity to other items. To use the form as editor - * for an item, just connect the item to form with - * {@link Form#setItemDataSource(Item)}. If only a part of the item needs to be - * edited, {@link Form#setItemDataSource(Item,Collection)} can be used instead. - * After the item has been connected to the form, the automatically created - * fields can be customized and new fields can be added. If you need to connect - * a class that does not implement {@link com.vaadin.data.Item} interface, most - * properties of any class following bean pattern, can be accessed trough - * {@link com.vaadin.data.util.BeanItem}. + * {@link Item} interface. Also the form itself implements this interface for + * easier connectivity to other items. To use the form as editor for an item, + * just connect the item to form with {@link Form#setItemDataSource(Item)}. If + * only a part of the item needs to be edited, + * {@link Form#setItemDataSource(Item,Collection)} can be used instead. After + * the item has been connected to the form, the automatically created fields can + * be customized and new fields can be added. If you need to connect a class + * that does not implement {@link Item} interface, most properties of any class + * following bean pattern, can be accessed trough {@link BeanItem}. * </p> * * @author Vaadin Ltd. @@ -86,8 +85,8 @@ import com.vaadin.v7.shared.form.FormState; */ @Deprecated public class Form extends AbstractField<Object> - implements Item.Editor, com.vaadin.v7.data.Buffered, Item, Validatable, - Action.Notifier, HasComponents, LegacyComponent { + implements Item.Editor, Buffered, Item, Validatable, Action.Notifier, + HasComponents, LegacyComponent { private Object propertyValue; @@ -453,7 +452,7 @@ public class Form extends AbstractField<Object> /** * Adds a new property to form and create corresponding field. * - * @see com.vaadin.data.Item#addItemProperty(Object, Property) + * @see Item#addItemProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) { @@ -584,7 +583,7 @@ public class Form extends AbstractField<Object> * source, the field is returned instead of the data source. * </p> * - * @see com.vaadin.data.Item#getItemProperty(Object) + * @see Item#getItemProperty(Object) */ @Override public Property getItemProperty(Object id) { @@ -621,7 +620,7 @@ public class Form extends AbstractField<Object> /** * Removes the property and corresponding field from the form. * - * @see com.vaadin.data.Item#removeItemProperty(Object) + * @see Item#removeItemProperty(Object) */ @Override public boolean removeItemProperty(Object id) { @@ -691,7 +690,7 @@ public class Form extends AbstractField<Object> * adds all the properties as fields to the form. * </p> * - * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item) + * @see Item.Viewer#setItemDataSource(Item) */ @Override public void setItemDataSource(Item newDataSource) { @@ -709,7 +708,7 @@ public class Form extends AbstractField<Object> * order. * </p> * - * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item) + * @see Item.Viewer#setItemDataSource(Item) */ public void setItemDataSource(Item newDataSource, Collection<?> propertyIds) { @@ -959,7 +958,7 @@ public class Form extends AbstractField<Object> /** * Checks the validity of the Form and all of its fields. * - * @see com.vaadin.legacy.data.Validatable#validate() + * @see Validatable#validate() */ @Override public void validate() throws Validator.InvalidValueException { @@ -972,7 +971,7 @@ public class Form extends AbstractField<Object> /** * Checks the validabtable object accept invalid values. * - * @see com.vaadin.legacy.data.Validatable#isInvalidAllowed() + * @see Validatable#isInvalidAllowed() */ @Override public boolean isInvalidAllowed() { @@ -982,7 +981,7 @@ public class Form extends AbstractField<Object> /** * Should the validabtable object accept invalid values. * - * @see com.vaadin.legacy.data.Validatable#setInvalidAllowed(boolean) + * @see Validatable#setInvalidAllowed(boolean) */ @Override public void setInvalidAllowed(boolean invalidValueAllowed) @@ -993,7 +992,7 @@ public class Form extends AbstractField<Object> /** * Sets the component's to read-only mode to the specified state. * - * @see com.vaadin.ui.Component#setReadOnly(boolean) + * @see Component#setReadOnly(boolean) */ @Override public void setReadOnly(boolean readOnly) { @@ -1031,7 +1030,7 @@ public class Form extends AbstractField<Object> /** * Gets the field type. * - * @see com.vaadin.legacy.ui.AbstractField#getType() + * @see AbstractField#getType() */ @Override public Class<?> getType() { @@ -1046,7 +1045,7 @@ public class Form extends AbstractField<Object> * * This is relevant when the Form is used as Field. * - * @see com.vaadin.legacy.ui.AbstractField#setInternalValue(java.lang.Object) + * @see AbstractField#setInternalValue(java.lang.Object) */ @Override protected void setInternalValue(Object newValue) { @@ -1160,7 +1159,7 @@ public class Form extends AbstractField<Object> /** * Focuses the first field in the form. * - * @see com.vaadin.ui.Component.Focusable#focus() + * @see Component.Focusable#focus() */ @Override public void focus() { @@ -1173,7 +1172,7 @@ public class Form extends AbstractField<Object> /** * Sets the Tabulator index of this Focusable component. * - * @see com.vaadin.ui.Component.Focusable#setTabIndex(int) + * @see Component.Focusable#setTabIndex(int) */ @Override public void setTabIndex(int tabIndex) { @@ -1220,11 +1219,6 @@ public class Form extends AbstractField<Object> return true; } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractField#clear() - */ @Override public void clear() { for (Iterator<Field<?>> i = fields.values().iterator(); i.hasNext();) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java index ee9b968c00..4b661d577c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java @@ -146,10 +146,9 @@ import elemental.json.JsonValue; * <p> * Each column has its own {@link Renderer} that displays data into something * that can be displayed in the browser. That data is first converted with a - * {@link com.vaadin.v7.data.util.converter.Converter Converter} into something - * that the Renderer can process. This can also be an implicit step - if a - * column has a simple data type, like a String, no explicit assignment is - * needed. + * {@link Converter} into something that the Renderer can process. This can also + * be an implicit step - if a column has a simple data type, like a String, no + * explicit assignment is needed. * <p> * Usually a renderer takes some kind of object, and converts it into a * HTML-formatted string. @@ -3992,8 +3991,7 @@ public class Grid extends AbstractComponent * Getting a field before the editor has been opened depends on special * support from the {@link FieldGroup} in use. Using this method with a * user-provided <code>FieldGroup</code> might cause - * {@link com.vaadin.v7.data.fieldgroup.FieldGroup.BindException - * BindException} to be thrown. + * {@link FieldGroup.BindException BindException} to be thrown. * * @return the bound field; or <code>null</code> if the respective * column is not editable @@ -4214,11 +4212,10 @@ public class Grid extends AbstractComponent } /** - * An abstract base class for server-side - * {@link com.vaadin.v7.ui.renderers.Renderer Grid renderers}. This class - * currently extends the AbstractExtension superclass, but this fact should - * be regarded as an implementation detail and subject to change in a future - * major or minor Vaadin revision. + * An abstract base class for server-side {@link Renderer Grid renderers}. + * This class currently extends the AbstractExtension superclass, but this + * fact should be regarded as an implementation detail and subject to change + * in a future major or minor Vaadin revision. * * @param <T> * the type this renderer knows how to present diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java index 6b7f86be20..bb273dab46 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java @@ -225,7 +225,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, /** * Gets the type of the Property. * - * @see com.vaadin.v7.data.Property#getType() + * @see Property#getType() */ @Override public Class<String> getType() { @@ -236,7 +236,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, * Gets the viewing data-source property. * * @return the data source property. - * @see com.vaadin.v7.data.Property.Viewer#getPropertyDataSource() + * @see Property.Viewer#getPropertyDataSource() */ @Override public Property getPropertyDataSource() { @@ -249,7 +249,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, * * @param newDataSource * the new data source Property - * @see com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(com.vaadin.v7.data.Property) + * @see Property.Viewer#setPropertyDataSource(Property) */ @Override public void setPropertyDataSource(Property newDataSource) { @@ -351,7 +351,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, /** * Gets the Property that has been modified. * - * @see com.vaadin.v7.data.Property.ValueChangeEvent#getProperty() + * @see Property.ValueChangeEvent#getProperty() */ @Override public Property getProperty() { @@ -364,7 +364,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, * * @param listener * the Listener to be added. - * @see com.vaadin.v7.data.Property.ValueChangeNotifier#addListener(com.vaadin.v7.data.Property.ValueChangeListener) + * @see Property.ValueChangeNotifier#addListener(Property.ValueChangeListener) */ @Override public void addValueChangeListener(Property.ValueChangeListener listener) { @@ -374,7 +374,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -387,7 +387,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, * * @param listener * the Listener to be removed. - * @see com.vaadin.v7.data.Property.ValueChangeNotifier#removeListener(com.vaadin.v7.data.Property.ValueChangeListener) + * @see Property.ValueChangeNotifier#removeListener(Property.ValueChangeListener) */ @Override public void removeValueChangeListener( @@ -398,7 +398,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -417,7 +417,7 @@ public class Label extends AbstractLegacyComponent implements Property<String>, /** * Listens the value change events from data source. * - * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @see Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ @Override public void valueChange(Property.ValueChangeEvent event) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java index 2710287445..c5bcc0b511 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java @@ -23,8 +23,7 @@ import com.vaadin.v7.data.Container; /** * <p> * A class representing a selection of items the user has selected in a UI. The - * set of choices is presented as a set of {@link com.vaadin.v7.data.Item}s in a - * {@link com.vaadin.v7.data.Container}. + * set of choices is presented as a set of {@link Item}s in a {@link Container}. * </p> * * <p> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java index 0636768e2d..b8c649eba5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java @@ -277,7 +277,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Row caption mode: Index of the item is used as item caption. The * index mode can only be used with the containers implementing the - * {@link com.vaadin.data.Container.Indexed} interface. + * {@link Container.Indexed} interface. */ INDEX(ItemCaptionMode.INDEX), /** @@ -2952,8 +2952,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Invoked when the value of a variable has changed. * - * @see com.vaadin.v7.ui.Select#changeVariables(java.lang.Object, - * java.util.Map) + * @see Select#changeVariables(java.lang.Object, java.util.Map) */ @Override @@ -3302,13 +3301,6 @@ public class Table extends AbstractSelect implements Action.Container, getVisibleCells(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractSelect#paintContent(com.vaadin. - * terminal.PaintTarget) - */ - @Override public void paintContent(PaintTarget target) throws PaintException { isBeingPainted = true; @@ -4265,7 +4257,7 @@ public class Table extends AbstractSelect implements Action.Container, * * Also listens changes in rendered items to refresh content area. * - * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @see Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ @Override @@ -4296,7 +4288,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Notifies the component that it is connected to an application. * - * @see com.vaadin.ui.Component#attach() + * @see Component#attach() */ @Override @@ -4309,7 +4301,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Notifies the component that it is detached from the application * - * @see com.vaadin.ui.Component#detach() + * @see Component#detach() */ @Override @@ -4320,7 +4312,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes all Items from the Container. * - * @see com.vaadin.v7.data.Container#removeAllItems() + * @see Container#removeAllItems() */ @Override @@ -4333,7 +4325,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes the Item identified by <code>ItemId</code> from the Container. * - * @see com.vaadin.v7.data.Container#removeItem(Object) + * @see Container#removeItem(Object) */ @Override @@ -4353,7 +4345,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes a Property specified by the given Property ID from the Container. * - * @see com.vaadin.v7.data.Container#removeContainerProperty(Object) + * @see Container#removeContainerProperty(Object) */ @Override @@ -4381,8 +4373,7 @@ public class Table extends AbstractSelect implements Action.Container, * the class of the property. * @param defaultValue * the default value given for all existing items. - * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class, - * Object) + * @see Container#addContainerProperty(Object, Class, Object) */ @Override @@ -4426,8 +4417,7 @@ public class Table extends AbstractSelect implements Action.Container, * the Alignment of the column. Null implies align left. * @throws UnsupportedOperationException * if the operation is not supported. - * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class, - * Object) + * @see Container#addContainerProperty(Object, Class, Object) */ public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue, String columnHeader, Resource columnIcon, @@ -4538,7 +4528,7 @@ public class Table extends AbstractSelect implements Action.Container, * {@link #getPageLength()} may produce good enough estimates in some * situations. * - * @see com.vaadin.v7.ui.Select#getVisibleItemIds() + * @see Select#getVisibleItemIds() */ @Override @@ -4562,7 +4552,7 @@ public class Table extends AbstractSelect implements Action.Container, * Container datasource item set change. Table must flush its buffers on * change. * - * @see com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.v7.data.Container.ItemSetChangeEvent) + * @see Container.ItemSetChangeListener#containerItemSetChange(Container.ItemSetChangeEvent) */ @Override @@ -4608,7 +4598,7 @@ public class Table extends AbstractSelect implements Action.Container, * Container datasource property set change. Table must flush its buffers on * change. * - * @see com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.v7.data.Container.PropertySetChangeEvent) + * @see Container.PropertySetChangeListener#containerPropertySetChange(Container.PropertySetChangeEvent) */ @Override @@ -4655,7 +4645,7 @@ public class Table extends AbstractSelect implements Action.Container, * * @throws UnsupportedOperationException * if set to true. - * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean) + * @see Select#setNewItemsAllowed(boolean) */ @Override @@ -4669,7 +4659,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the Item following the Item that corresponds to itemId. * - * @see com.vaadin.v7.data.Container.Ordered#nextItemId(java.lang.Object) + * @see Container.Ordered#nextItemId(java.lang.Object) */ @Override @@ -4681,7 +4671,7 @@ public class Table extends AbstractSelect implements Action.Container, * Gets the ID of the Item preceding the Item that corresponds to the * itemId. * - * @see com.vaadin.v7.data.Container.Ordered#prevItemId(java.lang.Object) + * @see Container.Ordered#prevItemId(java.lang.Object) */ @Override @@ -4692,7 +4682,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the first Item in the Container. * - * @see com.vaadin.v7.data.Container.Ordered#firstItemId() + * @see Container.Ordered#firstItemId() */ @Override @@ -4703,7 +4693,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the last Item in the Container. * - * @see com.vaadin.v7.data.Container.Ordered#lastItemId() + * @see Container.Ordered#lastItemId() */ @Override @@ -4715,7 +4705,7 @@ public class Table extends AbstractSelect implements Action.Container, * Tests if the Item corresponding to the given Item ID is the first Item in * the Container. * - * @see com.vaadin.v7.data.Container.Ordered#isFirstId(java.lang.Object) + * @see Container.Ordered#isFirstId(java.lang.Object) */ @Override @@ -4727,7 +4717,7 @@ public class Table extends AbstractSelect implements Action.Container, * Tests if the Item corresponding to the given Item ID is the last Item in * the Container. * - * @see com.vaadin.v7.data.Container.Ordered#isLastId(java.lang.Object) + * @see Container.Ordered#isLastId(java.lang.Object) */ @Override @@ -4738,7 +4728,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Adds new item after the given item. * - * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object) + * @see Container.Ordered#addItemAfter(java.lang.Object) */ @Override @@ -4755,8 +4745,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Adds new item after the given item. * - * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object, - * java.lang.Object) + * @see Container.Ordered#addItemAfter(java.lang.Object, java.lang.Object) */ @Override @@ -4848,8 +4837,7 @@ public class Table extends AbstractSelect implements Action.Container, * @throws UnsupportedOperationException * if the container data source does not implement * Container.Sortable - * @see com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[], - * boolean[]) + * @see Container.Sortable#sort(java.lang.Object[], boolean[]) * */ @@ -4903,7 +4891,7 @@ public class Table extends AbstractSelect implements Action.Container, * collection. * </p> * - * @see com.vaadin.v7.data.Container.Sortable#getSortableContainerPropertyIds() + * @see Container.Sortable#getSortableContainerPropertyIds() */ @Override diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextField.java index 48bd2b77a5..a78cb3b0d6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TextField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextField.java @@ -21,6 +21,7 @@ import org.jsoup.nodes.Element; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Buffered; import com.vaadin.v7.data.Property; /** @@ -32,10 +33,10 @@ import com.vaadin.v7.data.Property; * * <p> * Since <code>TextField</code> extends <code>LegacyAbstractField</code> it - * implements the {@link com.vaadin.v7.data.Buffered} interface. A - * <code>TextField</code> is in write-through mode by default, so - * {@link com.vaadin.v7.ui.AbstractField#setWriteThrough(boolean)} must be - * called to enable buffering. + * implements the {@link Buffered} interface. A <code>TextField</code> is in + * write-through mode by default, so + * {@link AbstractField#setWriteThrough(boolean)} must be called to enable + * buffering. * </p> * * @author Vaadin Ltd. @@ -95,8 +96,8 @@ public class TextField extends AbstractTextField { * Constructs a new <code>TextField</code> with the given caption and * initial text contents. The editor constructed this way will not be bound * to a Property unless - * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)} - * is called to bind it. + * {@link Property.Viewer#setPropertyDataSource(Property)} is called to bind + * it. * * @param caption * the caption <code>String</code> for the editor. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java index bb019e1b03..094dd1d5e4 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java @@ -51,6 +51,7 @@ import com.vaadin.server.Resource; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.MultiSelectMode; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; @@ -503,12 +504,6 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /* Component API */ - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractSelect#changeVariables(java.lang.Object, - * java.util.Map) - */ @Override public void changeVariables(Object source, Map<String, Object> variables) { @@ -624,7 +619,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Paints any needed component-specific things to the given UIDL stream. * - * @see com.vaadin.ui.AbstractComponent#paintContent(PaintTarget) + * @see AbstractComponent#paintContent(PaintTarget) */ @Override public void paintContent(PaintTarget target) throws PaintException { @@ -863,7 +858,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item with given ID can have any children. * - * @see com.vaadin.v7.data.Container.Hierarchical#areChildrenAllowed(Object) + * @see Container.Hierarchical#areChildrenAllowed(Object) */ @Override public boolean areChildrenAllowed(Object itemId) { @@ -873,7 +868,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the IDs of all Items that are children of the specified Item. * - * @see com.vaadin.v7.data.Container.Hierarchical#getChildren(Object) + * @see Container.Hierarchical#getChildren(Object) */ @Override public Collection<?> getChildren(Object itemId) { @@ -883,7 +878,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the ID of the parent Item of the specified Item. * - * @see com.vaadin.v7.data.Container.Hierarchical#getParent(Object) + * @see Container.Hierarchical#getParent(Object) */ @Override public Object getParent(Object itemId) { @@ -893,7 +888,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item specified with <code>itemId</code> has child Items. * - * @see com.vaadin.v7.data.Container.Hierarchical#hasChildren(Object) + * @see Container.Hierarchical#hasChildren(Object) */ @Override public boolean hasChildren(Object itemId) { @@ -903,7 +898,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item specified with <code>itemId</code> is a root Item. * - * @see com.vaadin.v7.data.Container.Hierarchical#isRoot(Object) + * @see Container.Hierarchical#isRoot(Object) */ @Override public boolean isRoot(Object itemId) { @@ -913,7 +908,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the IDs of all Items in the container that don't have a parent. * - * @see com.vaadin.v7.data.Container.Hierarchical#rootItemIds() + * @see Container.Hierarchical#rootItemIds() */ @Override public Collection<?> rootItemIds() { @@ -923,8 +918,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Sets the given Item's capability to have children. * - * @see com.vaadin.v7.data.Container.Hierarchical#setChildrenAllowed(Object, - * boolean) + * @see Container.Hierarchical#setChildrenAllowed(Object, boolean) */ @Override public boolean setChildrenAllowed(Object itemId, @@ -958,7 +952,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Sets the Container that serves as the data source of the viewer. * - * @see com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container) + * @see Container.Viewer#setContainerDataSource(Container) */ @Override public void setContainerDataSource(Container newDataSource) { @@ -993,8 +987,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } @Override - public void containerItemSetChange( - com.vaadin.v7.data.Container.ItemSetChangeEvent event) { + public void containerItemSetChange(Container.ItemSetChangeEvent event) { super.containerItemSetChange(event); if (getContainerDataSource() instanceof Filterable) { boolean hasFilters = !((Filterable) getContainerDataSource()) @@ -1293,7 +1286,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the visible item ids. * - * @see com.vaadin.v7.ui.Select#getVisibleItemIds() + * @see Select#getVisibleItemIds() */ @Override public Collection<?> getVisibleItemIds() { @@ -1337,7 +1330,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tree does not support <code>setNullSelectionItemId</code>. * - * @see com.vaadin.v7.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object) + * @see AbstractSelect#setNullSelectionItemId(java.lang.Object) */ @Override public void setNullSelectionItemId(Object nullSelectionItemId) @@ -1353,7 +1346,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @throws UnsupportedOperationException * if set to true. - * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean) + * @see Select#setNewItemsAllowed(boolean) */ @Override public void setNewItemsAllowed(boolean allowNewOptions) diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java index df471d5973..e2fc9c28bf 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java @@ -626,8 +626,7 @@ public class TreeTable extends Table implements Hierarchical { } @Override - public void containerItemSetChange( - com.vaadin.v7.data.Container.ItemSetChangeEvent event) { + public void containerItemSetChange(Container.ItemSetChangeEvent event) { // Can't do partial repaints if items are added or removed during the // expand/collapse request toggledItemId = null; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java index 6be54f1811..f054b8c0ab 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java @@ -23,11 +23,10 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.v7.ui.Calendar; /** - * Drop details for {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar - * Calendar}. When something is dropped on the Calendar, this class contains the - * specific details of the drop point. Specifically, this class gives access to - * the date where the drop happened. If the Calendar was in weekly mode, the - * date also includes the start time of the slot. + * Drop details for {@link Calendar}. When something is dropped on the Calendar, + * this class contains the specific details of the drop point. Specifically, + * this class gives access to the date where the drop happened. If the Calendar + * was in weekly mode, the date also includes the start time of the slot. * * @since 7.1 * @author Vaadin Ltd. @@ -72,8 +71,7 @@ public class CalendarTargetDetails extends TargetDetailsImpl { } /** - * @return the {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar} - * instance which was the target of the drop + * @return the {@link Calendar} instance which was the target of the drop */ public Calendar getTargetCalendar() { return (Calendar) getTarget(); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java index 7c19c9c968..9dd0d9e271 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java @@ -31,8 +31,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { ValueChangeListener mockListener = createStrictMock( ValueChangeListener.class); // record - mockListener.valueChange( - anyObject(com.vaadin.v7.data.Property.ValueChangeEvent.class)); + mockListener.valueChange(anyObject(ValueChangeEvent.class)); // test underTest.addValueChangeListener(mockListener); @@ -54,8 +53,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { ValueChangeListener mockListener = createStrictMock( ValueChangeListener.class); // record - mockListener.valueChange( - anyObject(com.vaadin.v7.data.Property.ValueChangeEvent.class)); + mockListener.valueChange(anyObject(ValueChangeEvent.class)); expect(mockProperty.getType()).andReturn(String.class).atLeastOnce(); expect(mockProperty.getValue()).andReturn("Any").atLeastOnce(); diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java index 403f35ecc9..167b7c1fe4 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java @@ -63,7 +63,7 @@ public class J2EEConnectionPoolTest { EasyMock.expectLastCall().andReturn(connection); System.setProperty("java.naming.factory.initial", - "com.vaadin.v7.data.util.sqlcontainer.connection.MockInitialContextFactory"); + MockInitialContextFactory.class.getCanonicalName()); Context context = EasyMock.createMock(Context.class); context.lookup("testDataSource"); EasyMock.expectLastCall().andReturn(ds); diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java index eea5a22ea9..db4cf97a1e 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java @@ -39,7 +39,7 @@ public class AnyEnumToStringConverterTest { @Override public String convertToModel(Enum value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } @@ -50,7 +50,7 @@ public class AnyEnumToStringConverterTest { @Override public Enum convertToPresentation(String value, Class<? extends Enum> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java index 582807fc29..2727b610bc 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java @@ -33,14 +33,14 @@ public class ConverterFactoryTest { @Override public Integer convertToModel(String value, Class<? extends Integer> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return 42; } @Override public String convertToPresentation(Integer value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "42"; } diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java index 10b4a0065e..5ec0caa5ee 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java @@ -43,7 +43,7 @@ public class SpecificEnumToStringConverterTest { @Override public String convertToModel(Enum value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } @@ -54,7 +54,7 @@ public class SpecificEnumToStringConverterTest { @Override public Enum convertToPresentation(String value, Class<? extends Enum> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java index e8ed7a979c..29eaf13e70 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java @@ -131,7 +131,7 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class); bfg.setItemDataSource(bean); - com.vaadin.v7.ui.Field<?> helloField = bfg.buildAndBind("Hello string", + Field<?> helloField = bfg.buildAndBind("Hello string", "nestedBean.hello"); assertEquals(bean.nestedBean.hello, helloField.getValue().toString()); } diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java index cf82c01ebb..4e59d432a0 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java @@ -90,14 +90,14 @@ public class TablePropertyValueConverterTest { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "model"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "presentation"; } @@ -118,7 +118,7 @@ public class TablePropertyValueConverterTest { @Override public BaseClass convertToModel(String value, Class<? extends BaseClass> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return new BaseClass("model"); } @@ -135,7 +135,7 @@ public class TablePropertyValueConverterTest { @Override public String convertToPresentation(BaseClass value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return null; } }); @@ -145,7 +145,7 @@ public class TablePropertyValueConverterTest { @Override public DerivedClass convertToModel(String value, Class<? extends DerivedClass> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return new DerivedClass("derived" + 1001); } @@ -162,7 +162,7 @@ public class TablePropertyValueConverterTest { @Override public String convertToPresentation(DerivedClass value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return null; } }); @@ -193,14 +193,14 @@ public class TablePropertyValueConverterTest { @Override public Integer convertToModel(String value, Class<? extends Integer> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return 11; } @Override public String convertToPresentation(Integer value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "presentation"; } @@ -236,14 +236,14 @@ public class TablePropertyValueConverterTest { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "model"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "presentation"; } @@ -265,14 +265,14 @@ public class TablePropertyValueConverterTest { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "model2"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.Converter.ConversionException { + throws ConversionException { return "presentation2"; } |