diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-03-02 15:55:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 15:55:34 +0200 |
| commit | 3a39feca6664f463ca6c862ac73cdcebd5cdd797 (patch) | |
| tree | 1cdbe3cd155ba043dfd9f6712c3e5d5d0bbff127 | |
| parent | 4095541ec922b4916d08bdcd3f2ef4a1a539e9c8 (diff) | |
| download | vaadin-framework-3a39feca6664f463ca6c862ac73cdcebd5cdd797.tar.gz vaadin-framework-3a39feca6664f463ca6c862ac73cdcebd5cdd797.zip | |
Remove unnecessary full classnames and parenthesis from code (#8681)
This change aims to reduce the number of false positives when comparing Vaadin 7 compatibility package in Vaadin 8 and actual Vaadin 7.7 branch. Conflicting parts are moved to imports as much as possible. Files have been formatted with same Eclipse version.
91 files changed, 459 insertions, 1354 deletions
diff --git a/client/src/main/java/com/vaadin/client/ComponentConnector.java b/client/src/main/java/com/vaadin/client/ComponentConnector.java index f70f3cfc62..2f63eebc62 100644 --- a/client/src/main/java/com/vaadin/client/ComponentConnector.java +++ b/client/src/main/java/com/vaadin/client/ComponentConnector.java @@ -30,11 +30,6 @@ import com.vaadin.shared.AbstractComponentState; */ public interface ComponentConnector extends ServerConnector { - /* - * (non-Javadoc) - * - * @see com.vaadin.client.VPaintable#getState() - */ @Override public AbstractComponentState getState(); diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java index 6d522ace5b..be768369ed 100644 --- a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java @@ -24,18 +24,18 @@ import com.vaadin.client.metadata.TypeData; import com.vaadin.client.metadata.TypeDataStore; import com.vaadin.client.renderers.Renderer; import com.vaadin.client.widgets.Grid.Column; +import com.vaadin.shared.communication.SharedState; import elemental.json.JsonObject; import elemental.json.JsonValue; /** * An abstract base class for renderer connectors. A renderer connector is used - * to link a client-side {@link Renderer} to a server-side - * {@link com.vaadin.ui.components.grid.Renderer Renderer}. As a connector, it - * can use the regular Vaadin RPC and shared state mechanism to pass additional - * state and information between the client and the server. This base class - * itself only uses the basic {@link com.vaadin.shared.communication.SharedState - * SharedState} and no RPC interfaces. + * to link a client-side {@link Renderer} to a server-side <code>Renderer</code> + * . As a connector, it can use the regular Vaadin RPC and shared state + * mechanism to pass additional state and information between the client and the + * server. This base class itself only uses the basic {@link SharedState} and no + * RPC interfaces. * * @param <T> * the presentation type of the renderer diff --git a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java index c1af71580e..05f488a027 100644 --- a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java +++ b/client/src/main/java/com/vaadin/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) @@ -389,7 +389,7 @@ public class GridConnector extends AbstractHasComponentsConnector } else { Collection<Column<?, JsonObject>> errorColumns; if (errorColumnsIds != null) { - errorColumns = new ArrayList<Grid.Column<?, JsonObject>>(); + errorColumns = new ArrayList<Column<?, JsonObject>>(); for (String colId : errorColumnsIds) { errorColumns.add(columnIdToColumn.get(colId)); } diff --git a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java index 5c0a84bd5f..fcc264a264 100644 --- a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java @@ -418,7 +418,7 @@ public class MultiSelectionModelConnector extends @Override public void setUserSelectionAllowed(boolean userSelectionAllowed) { this.userSelectionAllowed = userSelectionAllowed; - for (Column<?, ?> c : getGrid().getColumns()) { + for (Column<?, JsonObject> c : getGrid().getColumns()) { if (c instanceof SelectionColumn) { ((SelectionColumn) c) .setUserSelectionAllowed(userSelectionAllowed); diff --git a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java index 7cd30e40ef..f8421f7dfb 100644 --- a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java @@ -215,6 +215,5 @@ public class SingleSelectionModelConnector extends public void setUserSelectionAllowed(boolean userSelectionAllowed) { this.userSelectionAllowed = userSelectionAllowed; } - } -}
\ No newline at end of file +} diff --git a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java index 59caf4f150..a79e541a93 100644 --- a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java @@ -58,7 +58,7 @@ public abstract class ClickableRenderer<T, W extends Widget> * @param <R> * the row type of the containing Grid * - * @see {@link ButtonRenderer#addClickHandler(RendererClickHandler)} + * @see ButtonRenderer#addClickHandler(RendererClickHandler) */ public interface RendererClickHandler<R> extends EventHandler { diff --git a/client/src/main/java/com/vaadin/client/ui/VCheckBox.java b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java index 34f1b4f38f..a1cc5c7f2b 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCheckBox.java +++ b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java @@ -54,8 +54,7 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox Element el = DOM.getFirstChild(getElement()); while (el != null) { - DOM.sinkEvents(el, - (DOM.getEventsSunk(el) | VTooltip.TOOLTIP_EVENTS)); + DOM.sinkEvents(el, DOM.getEventsSunk(el) | VTooltip.TOOLTIP_EVENTS); el = DOM.getNextSibling(el); } @@ -73,8 +72,8 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox @Override public void onBrowserEvent(Event event) { - if (icon != null && (event.getTypeInt() == Event.ONCLICK) - && (DOM.eventGetTarget(event) == icon.getElement())) { + if (icon != null && event.getTypeInt() == Event.ONCLICK + && DOM.eventGetTarget(event) == icon.getElement()) { // Click on icon should do nothing if widget is disabled if (isEnabled()) { setValue(!getValue()); diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java index c3e369f39c..74f0fabaf5 100644 --- a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java +++ b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java @@ -59,9 +59,8 @@ import com.vaadin.shared.ui.datefield.Resolution; * selector. * * <b>Note:</b> To change the keyboard assignments used in the popup dialog you - * should extend <code>com.vaadin.client.ui.VCalendarPanel</code> and then pass - * set it by calling the <code>setCalendarPanel(VCalendarPanel panel)</code> - * method. + * should extend <code>VCalendarPanel</code> and then pass set it by calling the + * <code>setCalendarPanel(VCalendarPanel panel)</code> method. * */ public class VPopupCalendar extends VTextualDate @@ -363,12 +362,6 @@ public class VPopupCalendar extends VTextualDate } } - /* - * (non-Javadoc) - * - * @see - * com.google.gwt.user.client.ui.UIObject#setStyleName(java.lang.String) - */ @Override public void setStyleName(String style) { super.setStyleName(style); @@ -416,13 +409,6 @@ public class VPopupCalendar extends VTextualDate } } - /* - * (non-Javadoc) - * - * @see - * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event - * .dom.client.ClickEvent) - */ @Override public void onClick(ClickEvent event) { if (event.getSource() == calendarToggle && isEnabled()) { @@ -435,13 +421,6 @@ public class VPopupCalendar extends VTextualDate } } - /* - * (non-Javadoc) - * - * @see - * com.google.gwt.event.logical.shared.CloseHandler#onClose(com.google.gwt - * .event.logical.shared.CloseEvent) - */ @Override public void onClose(CloseEvent<PopupPanel> event) { if (event.getSource() == popup) { @@ -499,7 +478,7 @@ public class VPopupCalendar extends VTextualDate /** * For internal use only. May be removed or replaced in the future. * - * @see com.vaadin.client.ui.VTextualDate#buildDate() + * @see VTextualDate#buildDate() */ @Override public void buildDate() { @@ -528,12 +507,6 @@ public class VPopupCalendar extends VTextualDate buildDate(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.client.ui.VDateField#onBrowserEvent(com.google - * .gwt.user.client.Event) - */ @Override public void onBrowserEvent(com.google.gwt.user.client.Event event) { super.onBrowserEvent(event); diff --git a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java index b4eb18a01d..cd84e83ebe 100644 --- a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java @@ -5373,7 +5373,7 @@ public class VScrollTable extends FlowPanel * </br> * Returns the maximum indent of the hierarcyColumn, if applicable. * - * @see {@link VScrollTable#getHierarchyColumnIndex()} + * @see VScrollTable#getHierarchyColumnIndex() * * @return maximum indent in pixels */ diff --git a/client/src/main/java/com/vaadin/client/ui/VSlider.java b/client/src/main/java/com/vaadin/client/ui/VSlider.java index cc36d8b8d9..b2653fcf42 100644 --- a/client/src/main/java/com/vaadin/client/ui/VSlider.java +++ b/client/src/main/java/com/vaadin/client/ui/VSlider.java @@ -214,7 +214,7 @@ public class VSlider extends SimpleFocusablePanel @Override public void execute() { final Element p = getElement(); - if (p.getPropertyInt(domProperty) > (MIN_SIZE + 5) + if (p.getPropertyInt(domProperty) > MIN_SIZE + 5 || propertyNotNullOrEmpty(styleAttribute, p)) { if (isVertical()) { setHeight(); @@ -283,10 +283,10 @@ public class VSlider extends SimpleFocusablePanel increaseValue(true); } else if (DOM.eventGetType(event) == Event.MOUSEEVENTS) { processBaseEvent(event); - } else if ((BrowserInfo.get().isGecko() - && DOM.eventGetType(event) == Event.ONKEYPRESS) - || (!BrowserInfo.get().isGecko() - && DOM.eventGetType(event) == Event.ONKEYDOWN)) { + } else if (BrowserInfo.get().isGecko() + && DOM.eventGetType(event) == Event.ONKEYPRESS + || !BrowserInfo.get().isGecko() + && DOM.eventGetType(event) == Event.ONKEYDOWN) { if (handleNavigation(event.getKeyCode(), event.getCtrlKey(), event.getShiftKey())) { @@ -406,10 +406,10 @@ public class VSlider extends SimpleFocusablePanel } if (isVertical()) { - v = ((baseSize - (coord - baseOffset)) - / (double) (baseSize - handleSize)) * (max - min) + min; + v = (baseSize - (coord - baseOffset)) + / (double) (baseSize - handleSize) * (max - min) + min; } else { - v = ((coord - baseOffset) / (double) (baseSize - handleSize)) + v = (coord - baseOffset) / (double) (baseSize - handleSize) * (max - min) + min; } @@ -475,8 +475,8 @@ public class VSlider extends SimpleFocusablePanel return false; } - if ((keycode == getNavigationUpKey() && isVertical()) - || (keycode == getNavigationRightKey() && !isVertical())) { + if (keycode == getNavigationUpKey() && isVertical() + || keycode == getNavigationRightKey() && !isVertical()) { if (shift) { for (int a = 0; a < acceleration; a++) { increaseValue(false); @@ -487,7 +487,7 @@ public class VSlider extends SimpleFocusablePanel } return true; } else if (keycode == getNavigationDownKey() && isVertical() - || (keycode == getNavigationLeftKey() && !isVertical())) { + || keycode == getNavigationLeftKey() && !isVertical()) { if (shift) { for (int a = 0; a < acceleration; a++) { decreaseValue(false); @@ -614,7 +614,7 @@ public class VSlider extends SimpleFocusablePanel : "offsetWidth"; final int handleSize = handle.getPropertyInt(domProperty); final int baseSize = base.getPropertyInt(domProperty) - - (2 * BASE_BORDER_WIDTH); + - 2 * BASE_BORDER_WIDTH; final int range = baseSize - handleSize; double v = value.doubleValue(); diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java index 83017713d9..d064aed056 100644 --- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java +++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java @@ -56,7 +56,7 @@ public class DateCell extends FocusableComplexPanel implements MouseDownHandler, private boolean disabled = false; private int height; private final Element[] slotElements; - private final List<DateCellSlot> slots = new ArrayList<DateCell.DateCellSlot>(); + private final List<DateCellSlot> slots = new ArrayList<DateCellSlot>(); private int[] slotElementHeights; private int startingSlotHeight; private Date today; diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java index 98b6c666ad..10fe400611 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java @@ -28,8 +28,8 @@ import com.vaadin.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 */ diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java index 9fc25a9e19..476c20dcff 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java @@ -27,8 +27,8 @@ import com.vaadin.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 */ diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java index 3cff8a4d0d..5d2ac508cb 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java @@ -30,8 +30,7 @@ import com.vaadin.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 diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java index b13fe8fa0e..1635edcafd 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java @@ -30,8 +30,7 @@ import com.vaadin.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 diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java index 04868c04b9..83bffd773b 100644 --- a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java @@ -36,11 +36,6 @@ import com.vaadin.ui.DateField; @Connect(DateField.class) public class DateFieldConnector extends TextualDateConnector { - /* - * (non-Javadoc) - * - * @see com.vaadin.client.ui.AbstractConnector#init() - */ @Override protected void init() { getWidget().popup.addCloseHandler(new CloseHandler<PopupPanel>() { diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java index 89da37897c..3e8c822b18 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java @@ -19,29 +19,29 @@ package com.vaadin.client.widget.escalator; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.TableRowElement; import com.google.gwt.dom.client.TableSectionElement; +import com.vaadin.client.widgets.Escalator; /** * A representation of the rows in each of the sections (header, body and - * footer) in an {@link com.vaadin.client.widgets.Escalator}. + * footer) in an {@link Escalator}. * * @since 7.4 * @author Vaadin Ltd - * @see com.vaadin.client.widgets.Escalator#getHeader() - * @see com.vaadin.client.widgets.Escalator#getBody() - * @see com.vaadin.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.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.client.widgets.Escalator#getBody() + * @see Escalator#getBody() */ public interface BodyRowContainer extends RowContainer { diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java b/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java index 000cd14f6c..abf9451aac 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java +++ b/client/src/main/java/com/vaadin/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.client.widget.escalator.RowContainer.BodyRowContainer}. + * {@link RowContainer.BodyRowContainer}. * * @since 7.5.0 * @author Vaadin Ltd diff --git a/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java index 181c8e78da..00ab6e8253 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java @@ -31,4 +31,4 @@ public interface GridEventHandler<T> { * the event that occurred */ public void onEvent(GridEvent<T> event); -}
\ No newline at end of file +} diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index 44c627776d..f9cf19e48e 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -81,11 +81,14 @@ import com.vaadin.client.BrowserInfo; import com.vaadin.client.DeferredWorker; import com.vaadin.client.Focusable; import com.vaadin.client.WidgetUtil; +import com.vaadin.client.data.AbstractRemoteDataSource; import com.vaadin.client.data.DataChangeHandler; import com.vaadin.client.data.DataSource; import com.vaadin.client.data.DataSource.RowHandle; import com.vaadin.client.renderers.ComplexRenderer; +import com.vaadin.client.renderers.ProgressBarRenderer; import com.vaadin.client.renderers.Renderer; +import com.vaadin.client.renderers.TextRenderer; import com.vaadin.client.renderers.WidgetRenderer; import com.vaadin.client.ui.FocusUtil; import com.vaadin.client.ui.SubPartAware; @@ -123,6 +126,7 @@ import com.vaadin.client.widget.grid.HeightAwareDetailsGenerator; import com.vaadin.client.widget.grid.RendererCellReference; import com.vaadin.client.widget.grid.RowReference; import com.vaadin.client.widget.grid.RowStyleGenerator; +import com.vaadin.client.widget.grid.datasources.ListDataSource; import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler; import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler; import com.vaadin.client.widget.grid.events.BodyClickHandler; @@ -200,12 +204,10 @@ import com.vaadin.shared.util.SharedUtil; * <p> * Each column also has a Renderer. Its function is to take the value that is * given by the {@code GridColumn} and display it to the user. A simple column - * might have a {@link com.vaadin.client.renderers.TextRenderer TextRenderer} - * that simply takes in a {@code String} and displays it as the cell's content. - * A more complex renderer might be - * {@link com.vaadin.client.renderers.ProgressBarRenderer ProgressBarRenderer} - * that takes in a floating point number, and displays a progress bar instead, - * based on the given number. + * might have a {@link TextRenderer} that simply takes in a {@code String} and + * displays it as the cell's content. A more complex renderer might be + * {@link ProgressBarRenderer} that takes in a floating point number, and + * displays a progress bar instead, based on the given number. * <p> * <em>See:</em> {@link #addColumn(Column)}, {@link #addColumn(Column, int)} and * {@link #addColumns(Column...)}. <em>Also</em> @@ -215,10 +217,8 @@ import com.vaadin.shared.util.SharedUtil; * <p> * Grid gets its data from a {@link DataSource}, providing row objects to Grid * from a user-defined endpoint. It can be either a local in-memory data source - * (e.g. {@link com.vaadin.client.widget.grid.datasources.ListDataSource - * ListDataSource}) or even a remote one, retrieving data from e.g. a REST API - * (see {@link com.vaadin.client.data.AbstractRemoteDataSource - * AbstractRemoteDataSource}). + * (e.g. {@link ListDataSource}) or even a remote one, retrieving data from e.g. + * a REST API (see {@link AbstractRemoteDataSource}). * * * @param <T> @@ -2883,6 +2883,15 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, } } + private final List<GridEventHandler<T>> browserEventHandlers = new ArrayList<GridEventHandler<T>>(); + + private CellStyleGenerator<T> cellStyleGenerator; + private RowStyleGenerator<T> rowStyleGenerator; + private RowReference<T> rowReference = new RowReference<T>(this); + private CellReference<T> cellReference = new CellReference<T>(rowReference); + private RendererCellReference rendererCellReference = new RendererCellReference( + (RowReference<Object>) rowReference); + public final class SelectionColumn extends Column<Boolean, T> implements GridEnabledHandler { @@ -4189,6 +4198,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, private AutoScroller autoScroller = new AutoScroller(this); + private ColumnResizeMode columnResizeMode = ColumnResizeMode.ANIMATED; + private DragAndDropHandler.DragAndDropCallback headerCellDndCallback = new DragAndDropCallback() { private final AutoScrollerCallback autoScrollerCallback = new AutoScrollerCallback() { @@ -4643,15 +4654,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, }; - private final List<GridEventHandler<T>> browserEventHandlers = new ArrayList<GridEventHandler<T>>(); - - private CellStyleGenerator<T> cellStyleGenerator; - private RowStyleGenerator<T> rowStyleGenerator; - private RowReference<T> rowReference = new RowReference<T>(this); - private CellReference<T> cellReference = new CellReference<T>(rowReference); - private RendererCellReference rendererCellReference = new RendererCellReference( - (RowReference<Object>) rowReference); - /** * Enumeration for easy setting of selection mode. */ @@ -6209,8 +6211,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, fireEvent(new GridEnabledEvent(enabled)); } - private ColumnResizeMode columnResizeMode = ColumnResizeMode.ANIMATED; - /** * Sets the column resize mode to use. The default mode is * {@link ColumnResizeMode.ANIMATED}. @@ -7910,7 +7910,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, * * @param mode * a selection mode value - * @see {@link SelectionMode}. + * @see SelectionMode */ public void setSelectionMode(SelectionMode mode) { SelectionModel<T> model = mode.createModel(); @@ -7982,8 +7982,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, /** * Deselect all rows using the current selection model. * - * @param row - * a row object * @return <code>true</code> iff the current selection changed * @throws IllegalStateException * if the current selection model is not an instance of diff --git a/server/src/main/java/com/vaadin/data/Container.java b/server/src/main/java/com/vaadin/data/Container.java index 42c51ab41e..ca8caca6eb 100644 --- a/server/src/main/java/com/vaadin/data/Container.java +++ b/server/src/main/java/com/vaadin/data/Container.java @@ -737,7 +737,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.data.Container#removeItem(Object itemId)}. + * {@link Container#removeItem(Object itemId)}. * </p> * * <p> @@ -761,8 +761,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 @@ -839,8 +840,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.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 @@ -974,8 +975,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.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> @@ -1249,6 +1250,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/server/src/main/java/com/vaadin/data/Validatable.java b/server/src/main/java/com/vaadin/data/Validatable.java index 365f855299..371003a5d7 100644 --- a/server/src/main/java/com/vaadin/data/Validatable.java +++ b/server/src/main/java/com/vaadin/data/Validatable.java @@ -28,7 +28,7 @@ import java.util.Collection; * * @author Vaadin Ltd. * @since 3.0 - * @see com.vaadin.data.Validator + * @see Validator */ public interface Validatable extends Serializable { diff --git a/server/src/main/java/com/vaadin/data/Validator.java b/server/src/main/java/com/vaadin/data/Validator.java index 8929843874..854c4c1f91 100644 --- a/server/src/main/java/com/vaadin/data/Validator.java +++ b/server/src/main/java/com/vaadin/data/Validator.java @@ -24,9 +24,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.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/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java index 4bd9ee9beb..dd50603f8f 100644 --- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java +++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java @@ -78,7 +78,6 @@ public class FieldGroup implements Serializable { * */ public FieldGroup() { - } /** @@ -106,7 +105,7 @@ public class FieldGroup implements Serializable { /** * Binds all fields to the properties in the item in use. - * + * * @since 7.7.5 */ protected void bindFields() { @@ -280,8 +279,8 @@ public class FieldGroup implements Serializable { * Clears field and any possible existing binding. * * @param field - * The field to be cleared - * + * The field to be cleared + * * @since 7.7.5 */ protected void clearField(Field<?> field) { @@ -837,11 +836,11 @@ public class FieldGroup implements Serializable { * public class MyForm extends VerticalLayout { * private TextField firstName = new TextField("First name"); * @PropertyId("last") - * private TextField lastName = new TextField("Last name"); + * private TextField lastName = new TextField("Last name"); * private TextField age = new TextField("Age"); ... } * - * MyForm myForm = new MyForm(); - * ... + * MyForm myForm = new MyForm(); + * ... * fieldGroup.bindMemberFields(myForm); * </pre> * @@ -879,11 +878,11 @@ public class FieldGroup implements Serializable { * public class MyForm extends VerticalLayout { * private TextField firstName = new TextField("First name"); * @PropertyId("last") - * private TextField lastName = new TextField("Last name"); + * private TextField lastName = new TextField("Last name"); * private TextField age; * - * MyForm myForm = new MyForm(); - * ... + * MyForm myForm = new MyForm(); + * ... * fieldGroup.buildAndBindMemberFields(myForm); * </pre> * diff --git a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java index 8599e7c900..387076ce8c 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java @@ -171,11 +171,6 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> model = BeanItem.getPropertyDescriptors((Class<BEANTYPE>) type); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getType(java.lang.Object) - */ @Override public Class<?> getType(Object propertyId) { VaadinPropertyDescriptor<BEANTYPE> descriptor = model.get(propertyId); @@ -208,21 +203,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> return type; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getContainerPropertyIds() - */ @Override public Collection<String> getContainerPropertyIds() { return model.keySet(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeAllItems() - */ @Override public boolean removeAllItems() { int origSize = size(); @@ -245,11 +230,6 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> return true; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getItem(java.lang.Object) - */ @Override public BeanItem<BEANTYPE> getItem(Object itemId) { // TODO return only if visible? @@ -261,23 +241,12 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> return itemIdToItem.get(itemId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#getItemIds() - */ @Override @SuppressWarnings("unchecked") public List<IDTYPE> getItemIds() { return (List<IDTYPE>) super.getItemIds(); } - /* - * (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); @@ -287,11 +256,6 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> return item.getItemProperty(propertyId); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeItem(java.lang.Object) - */ @Override public boolean removeItem(Object itemId) { // TODO should also remove items that are filtered out @@ -327,13 +291,6 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> filterAll(); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.Container.Filterable#addContainerFilter(java.lang.Object, - * java.lang.String, boolean, boolean) - */ @Override public void addContainerFilter(Object propertyId, String filterString, boolean ignoreCase, boolean onlyMatchPrefix) { @@ -346,11 +303,6 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Filterable#removeAllContainerFilters() - */ @Override public void removeAllContainerFilters() { if (!getFilters().isEmpty()) { @@ -361,13 +313,6 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.Container.Filterable#removeContainerFilters(java.lang - * .Object) - */ @Override public void removeContainerFilters(Object propertyId) { Collection<Filter> removedFilters = super.removeFilters(propertyId); @@ -390,21 +335,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> removeFilter(filter); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.AbstractInMemoryContainer#hasContainerFilters() - */ @Override public boolean hasContainerFilters() { return super.hasContainerFilters(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.AbstractInMemoryContainer#getContainerFilters() - */ @Override public Collection<Filter> getContainerFilters() { return super.getContainerFilters(); @@ -458,22 +393,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() - */ @Override public Collection<?> getSortableContainerPropertyIds() { return getSortablePropertyIds(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], - * boolean[]) - */ @Override public void sort(Object[] propertyId, boolean[] ascending) { sortContainer(propertyId, ascending); @@ -524,7 +448,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> * added at the very end of the unfiltered container and not after the last * visible item if filtering is used. * - * @see com.vaadin.data.Container#addItem(Object) + * @see Container#addItem(Object) */ protected BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) { if (!validateBean(bean)) { @@ -536,7 +460,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean after the given bean. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object) + * @see Container.Ordered#addItemAfter(Object, Object) */ protected BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId, IDTYPE newItemId, BEANTYPE bean) { @@ -795,7 +719,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated @Override diff --git a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java index c95ddf0061..c9c360efe9 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java @@ -98,7 +98,7 @@ public abstract class AbstractContainer implements Container { * {@link PropertySetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener) + * @see PropertySetChangeNotifier#addListener(Container.PropertySetChangeListener) */ protected void addPropertySetChangeListener( Container.PropertySetChangeListener listener) { @@ -111,7 +111,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated protected void addListener(Container.PropertySetChangeListener listener) { @@ -123,7 +123,7 @@ public abstract class AbstractContainer implements Container { * {@link PropertySetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container. + * @see PropertySetChangeNotifier#removeListener(Container. * PropertySetChangeListener) */ protected void removePropertySetChangeListener( @@ -135,7 +135,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated protected void removeListener( @@ -150,7 +150,7 @@ public abstract class AbstractContainer implements Container { * {@link ItemSetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener) + * @see ItemSetChangeNotifier#addListener(Container.ItemSetChangeListener) */ protected void addItemSetChangeListener( Container.ItemSetChangeListener listener) { @@ -163,7 +163,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Deprecated protected void addListener(Container.ItemSetChangeListener listener) { @@ -175,7 +175,7 @@ public abstract class AbstractContainer implements Container { * {@link ItemSetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener) + * @see ItemSetChangeNotifier#removeListener(Container.ItemSetChangeListener) */ protected void removeItemSetChangeListener( Container.ItemSetChangeListener listener) { @@ -186,7 +186,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Deprecated protected void removeListener(Container.ItemSetChangeListener listener) { diff --git a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java index 44803613d6..bc5d350897 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -67,19 +67,18 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * <code>sort(Object[], boolean[])</code>. * * To implement {@link Filterable}, subclasses need to implement the methods - * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)} - * (calling {@link #addFilter(Filter)}), - * {@link Filterable#removeAllContainerFilters()} (calling - * {@link #removeAllFilters()}) and - * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)} - * (calling {@link #removeFilter(com.vaadin.data.Container.Filter)}). + * {@link Filterable#addContainerFilter(Container.Filter)} (calling + * {@link #addFilter(Filter)}), {@link Filterable#removeAllContainerFilters()} + * (calling {@link #removeAllFilters()}) and + * {@link Filterable#removeContainerFilter(Container.Filter)} (calling + * {@link #removeFilter(Container.Filter)}). * * To implement {@link SimpleFilterable}, subclasses also need to implement the * methods * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)} * and {@link SimpleFilterable#removeContainerFilters(Object)} calling - * {@link #addFilter(com.vaadin.data.Container.Filter)} and - * {@link #removeFilters(Object)} respectively. + * {@link #addFilter(Container.Filter)} and {@link #removeFilters(Object)} + * respectively. * * @param <ITEMIDTYPE> * the class of item identifiers in the container, use Object if can @@ -444,7 +443,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE // ItemSetChangeNotifier /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Deprecated @Override @@ -466,7 +465,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Deprecated @Override @@ -566,8 +565,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * be in-memory filterable. * * This can be used to implement - * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)} - * and optionally also + * {@link Filterable#addContainerFilter(Container.Filter)} and optionally + * also * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)} * (with {@link SimpleStringFilter}). * @@ -593,11 +592,6 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE return !getContainerFilters().isEmpty(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Filterable#getContainerFilters() - */ protected Collection<Filter> getContainerFilters() { return Collections.unmodifiableCollection(filters); } @@ -606,8 +600,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * Remove a specific container filter and re-filter the view (if necessary). * * This can be used to implement - * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)} - * . + * {@link Filterable#removeContainerFilter(Container.Filter)} . */ protected void removeFilter(Filter filter) { for (Iterator<Filter> iterator = getFilters().iterator(); iterator @@ -718,8 +711,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * Subclasses should call this from a public * {@link #sort(Object[], boolean[])} method when implementing Sortable. * - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], - * boolean[]) + * @see Container.Sortable#sort(java.lang.Object[], boolean[]) */ protected void sortContainer(Object[] propertyId, boolean[] ascending) { if (!(this instanceof Sortable)) { @@ -1142,9 +1134,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * Set the internal collection of filters without performing filtering. * * This method is mostly for internal use, use - * {@link #addFilter(com.vaadin.data.Container.Filter)} and - * <code>remove*Filter*</code> (which also re-filter the container) instead - * when possible. + * {@link #addFilter(Container.Filter)} and <code>remove*Filter*</code> + * (which also re-filter the container) instead when possible. * * @param filters */ diff --git a/server/src/main/java/com/vaadin/data/util/AbstractProperty.java b/server/src/main/java/com/vaadin/data/util/AbstractProperty.java index bd1fcbf3fb..6445cb3683 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractProperty.java +++ b/server/src/main/java/com/vaadin/data/util/AbstractProperty.java @@ -148,7 +148,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #addReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -172,7 +172,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #removeReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -235,7 +235,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -253,7 +253,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/BeanContainer.java b/server/src/main/java/com/vaadin/data/util/BeanContainer.java index a2a07c977c..2329c90e00 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanContainer.java +++ b/server/src/main/java/com/vaadin/data/util/BeanContainer.java @@ -17,6 +17,8 @@ package com.vaadin.data.util; import java.util.Collection; +import com.vaadin.data.Container; + /** * An in-memory container for JavaBeans. * @@ -40,7 +42,7 @@ import java.util.Collection; * * <p> * If a bean id resolver is set using - * {@link #setBeanIdResolver(com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver)} + * {@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 @@ -78,7 +80,7 @@ public class BeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean to the Container. * - * @see com.vaadin.data.Container#addItem(Object) + * @see Container#addItem(Object) */ @Override public BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) { @@ -92,7 +94,7 @@ public class BeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean after the given item id. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object) + * @see Container.Ordered#addItemAfter(Object, Object) */ @Override public BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId, diff --git a/server/src/main/java/com/vaadin/data/util/BeanItem.java b/server/src/main/java/com/vaadin/data/util/BeanItem.java index 0d3fbdcd71..85171fec33 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanItem.java +++ b/server/src/main/java/com/vaadin/data/util/BeanItem.java @@ -273,7 +273,7 @@ public class BeanItem<BT> extends PropertysetItem { * <p> * Changing the bean will fire value change events for all properties of * type {@link MethodProperty} or {@link NestedMethodProperty}. - * + * * @param bean * The new bean to use for this item, not <code>null</code> * @since 7.7.7 diff --git a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java index 62cb71885c..2f02ce7d3e 100644 --- a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java +++ b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java @@ -17,6 +17,8 @@ package com.vaadin.data.util; import java.util.Collection; +import com.vaadin.data.Container; + /** * An in-memory container for JavaBeans. * @@ -186,7 +188,7 @@ public class BeanItemContainer<BEANTYPE> * @param newItemId * the bean (of type BT) to add (not null) * - * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object) + * @see Container.Ordered#addItemAfter(Object, Object) */ @Override @SuppressWarnings("unchecked") @@ -219,7 +221,7 @@ public class BeanItemContainer<BEANTYPE> * * The bean is used both as the item contents and as the item identifier. * - * @see com.vaadin.data.Container#addItem(Object) + * @see Container#addItem(Object) */ @Override @SuppressWarnings("unchecked") @@ -232,7 +234,7 @@ public class BeanItemContainer<BEANTYPE> * * The bean is used both as the item contents and as the item identifier. * - * @see com.vaadin.data.Container#addItem(Object) + * @see Container#addItem(Object) */ @Override public BeanItem<BEANTYPE> addBean(BEANTYPE bean) { diff --git a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java index fe768e677b..0895132499 100644 --- a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -34,7 +34,7 @@ import com.vaadin.data.Property; /** * <p> * A wrapper class for adding external hierarchy to containers not implementing - * the {@link com.vaadin.data.Container.Hierarchical} interface. + * the {@link Container.Hierarchical} interface. * </p> * * <p> @@ -356,7 +356,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.data.Container#removeItem(Object itemId)}. + * {@link Container#removeItem(Object itemId)}. * </p> * * @param itemId @@ -736,7 +736,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -761,7 +761,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -786,7 +786,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -811,7 +811,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java index fef43caf17..1e7872cee7 100644 --- a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java @@ -30,7 +30,7 @@ import com.vaadin.data.Property; /** * <p> * A wrapper class for adding external ordering to containers not implementing - * the {@link com.vaadin.data.Container.Ordered} interface. + * the {@link Container.Ordered} interface. * </p> * * <p> @@ -547,7 +547,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -572,7 +572,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -597,7 +597,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -622,7 +622,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -630,12 +630,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 { @@ -656,11 +650,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/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java index d6e24fd02e..0f00867885 100644 --- a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java +++ b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java @@ -739,7 +739,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * Filesystem container does not support adding new properties. * - * @see com.vaadin.data.Item#addItemProperty(Object, Property) + * @see Item#addItemProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) @@ -751,7 +751,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * Filesystem container does not support removing properties. * - * @see com.vaadin.data.Item#removeItemProperty(Object) + * @see Item#removeItemProperty(Object) */ @Override public boolean removeItemProperty(Object id) @@ -852,12 +852,6 @@ public class FilesystemContainer implements Container.Hierarchical { this.recursive = recursive; } - /* - * (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 { @@ -865,44 +859,24 @@ public class FilesystemContainer implements Container.Hierarchical { "File system container does not support this operation"); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#addItem() - */ @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException( "File system container does not support this operation"); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#addItem(java.lang.Object) - */ @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "File system container does not support this operation"); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeAllItems() - */ @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException( "File system container does not support this operation"); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeItem(java.lang.Object) - */ @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { @@ -910,11 +884,6 @@ public class FilesystemContainer implements Container.Hierarchical { "File system container does not support this operation"); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object ) - */ @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java index 0615f41b2b..618c92d613 100644 --- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java +++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java @@ -194,7 +194,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.data.Container#removeItem(Object itemId)}. + * {@link Container#removeItem(Object itemId)}. * </p> * * @param itemId @@ -401,11 +401,6 @@ public class HierarchicalContainer extends IndexedContainer } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.IndexedContainer#addItem() - */ @Override public Object addItem() { disableContentsChangeEvents(); @@ -430,8 +425,7 @@ public class HierarchicalContainer extends IndexedContainer } @Override - protected void fireItemSetChange( - com.vaadin.data.Container.ItemSetChangeEvent event) { + protected void fireItemSetChange(Container.ItemSetChangeEvent event) { if (contentsChangeEventsOn()) { super.fireItemSetChange(event); } else { @@ -463,11 +457,6 @@ public class HierarchicalContainer extends IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.IndexedContainer#addItem(java.lang.Object) - */ @Override public Item addItem(Object itemId) { disableContentsChangeEvents(); @@ -490,11 +479,6 @@ public class HierarchicalContainer extends IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.IndexedContainer#removeAllItems() - */ @Override public boolean removeAllItems() { disableContentsChangeEvents(); @@ -522,11 +506,6 @@ public class HierarchicalContainer extends IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.IndexedContainer#removeItem(java.lang.Object ) - */ @Override public boolean removeItem(Object itemId) { disableContentsChangeEvents(); @@ -647,11 +626,6 @@ public class HierarchicalContainer extends IndexedContainer } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.util.IndexedContainer#doSort() - */ @Override protected void doSort() { super.doSort(); @@ -693,13 +667,6 @@ public class HierarchicalContainer extends IndexedContainer } } - /* - * Overridden to provide filtering for root & children items. - * - * (non-Javadoc) - * - * @see com.vaadin.data.util.IndexedContainer#updateContainerFiltering() - */ @Override protected boolean doFilterContainer(boolean hasFilters) { if (!hasFilters) { @@ -839,12 +806,6 @@ public class HierarchicalContainer extends IndexedContainer private Set<Object> filterOverride = null; - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.util.IndexedContainer#passesFilters(java.lang.Object) - */ @Override protected boolean passesFilters(Object itemId) { if (filterOverride != null) { diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java index d02c7e49c4..706a435c00 100644 --- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java @@ -17,12 +17,13 @@ package com.vaadin.data.util; import java.util.Collection; +import com.vaadin.data.Container; import com.vaadin.data.Container.Hierarchical; /** * A wrapper class for adding external ordering to containers not implementing - * the {@link com.vaadin.data.Container.Ordered} interface while retaining - * {@link Hierarchical} features. + * the {@link Container.Ordered} interface while retaining {@link Hierarchical} + * features. * * @see ContainerOrderedWrapper */ diff --git a/server/src/main/java/com/vaadin/data/util/IndexedContainer.java b/server/src/main/java/com/vaadin/data/util/IndexedContainer.java index c41319a79d..26c05601af 100644 --- a/server/src/main/java/com/vaadin/data/util/IndexedContainer.java +++ b/server/src/main/java/com/vaadin/data/util/IndexedContainer.java @@ -51,7 +51,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * <li>Sends all needed events on content changes. * </ul> * - * @see com.vaadin.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, @@ -484,11 +436,6 @@ public class IndexedContainer super(source); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property.ValueChangeEvent#getProperty() - */ @Override public Property getProperty() { return (Property) getSource(); @@ -504,7 +451,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated @Override @@ -520,7 +467,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)} **/ @Deprecated @Override @@ -528,12 +475,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) { @@ -544,7 +485,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -552,12 +493,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) { @@ -568,7 +503,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -709,9 +644,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. * @@ -736,11 +671,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)) { @@ -819,7 +749,7 @@ public class IndexedContainer * properties at container level. See * {@link IndexedContainer#addContainerProperty(Object, Class, Object)} * - * @see com.vaadin.data.Item#addProperty(Object, Property) + * @see Item#addProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) @@ -833,7 +763,7 @@ public class IndexedContainer * properties at container level. See * {@link IndexedContainer#removeContainerProperty(Object)} * - * @see com.vaadin.data.Item#removeProperty(Object) + * @see Item#removeProperty(Object) */ @Override public boolean removeItemProperty(Object id) @@ -887,41 +817,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) { @@ -931,11 +841,6 @@ public class IndexedContainer } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Property#setValue(java.lang.Object) - */ @Override public void setValue(Object newValue) throws Property.ReadOnlyException { @@ -1029,12 +934,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) { @@ -1043,7 +942,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1051,12 +950,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) { @@ -1065,7 +958,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1079,23 +972,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(); @@ -1212,21 +1093,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/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java index 5300b635f3..014304ce7a 100644 --- a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java +++ b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java @@ -269,7 +269,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { /** * The instance used by this property - * + * * @return the instance used for fetching the property value * @since 7.7.7 */ @@ -284,7 +284,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { * <p> * To be consistent with {@link #setValue(Object)}, this method will fire a * value change event even if the value stays the same - * + * * @param instance * the instance to use * @since 7.7.7 diff --git a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java index 2a87956a97..8ef04e52ee 100644 --- a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java +++ b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java @@ -20,8 +20,7 @@ import com.vaadin.data.Property; /** * A simple data object containing one typed value. This class is a - * straightforward implementation of the the {@link com.vaadin.data.Property} - * interface. + * straightforward implementation of the the {@link Property} interface. * * @author Vaadin Ltd. * @since 3.0 diff --git a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java index 6fa502300b..77db2ff378 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java +++ b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java @@ -239,7 +239,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * This should not be called directly. */ @Override - public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { + public void valueChange(Property.ValueChangeEvent event) { fireValueChange(); } @@ -249,8 +249,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * This should not be called directly. */ @Override - public void readOnlyStatusChange( - com.vaadin.data.Property.ReadOnlyStatusChangeEvent event) { + public void readOnlyStatusChange(Property.ReadOnlyStatusChangeEvent event) { fireReadOnlyStatusChange(); } diff --git a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java index 92b6f5eccd..e2a93dcd3f 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java +++ b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java @@ -28,7 +28,7 @@ import com.vaadin.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. * @@ -211,7 +211,7 @@ public class PropertysetItem /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(Item.PropertySetChangeListener)} **/ @Override @Deprecated @@ -235,7 +235,7 @@ public class PropertysetItem /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(Item.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java b/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java index dbfbee5e12..d578094749 100644 --- a/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java +++ b/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java @@ -34,7 +34,7 @@ import com.vaadin.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.data.Property.Transactional + * @see Property.Transactional * * @author Vaadin Ltd * @since 7.0 diff --git a/server/src/main/java/com/vaadin/data/util/converter/ReverseConverter.java b/server/src/main/java/com/vaadin/data/util/converter/ReverseConverter.java index 0e8741e242..66504bb7ee 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/ReverseConverter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/ReverseConverter.java @@ -55,7 +55,7 @@ public class ReverseConverter<PRESENTATION, MODEL> @Override public MODEL convertToModel(PRESENTATION value, Class<? extends MODEL> targetType, Locale locale) - throws com.vaadin.data.util.converter.Converter.ConversionException { + throws ConversionException { return realConverter.convertToPresentation(value, targetType, locale); } @@ -69,7 +69,7 @@ public class ReverseConverter<PRESENTATION, MODEL> @Override public PRESENTATION convertToPresentation(MODEL value, Class<? extends PRESENTATION> targetType, Locale locale) - throws com.vaadin.data.util.converter.Converter.ConversionException { + throws ConversionException { return realConverter.convertToModel(value, targetType, locale); } diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java index a5dd5c9ae0..a49e260fd4 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java @@ -49,7 +49,7 @@ public class StringToBigDecimalConverter @Override public BigDecimal convertToModel(String value, Class<? extends BigDecimal> targetType, Locale locale) - throws com.vaadin.data.util.converter.Converter.ConversionException { + throws ConversionException { return (BigDecimal) convertToNumber(value, BigDecimal.class, locale); } diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java index 1b5f88a4d6..45f830b767 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java @@ -51,7 +51,7 @@ public class StringToBigIntegerConverter @Override public BigInteger convertToModel(String value, Class<? extends BigInteger> targetType, Locale locale) - throws com.vaadin.data.util.converter.Converter.ConversionException { + throws ConversionException { BigDecimal bigDecimalValue = (BigDecimal) convertToNumber(value, BigDecimal.class, locale); diff --git a/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java index 6060a17a16..8a76a30037 100644 --- a/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java +++ b/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java @@ -56,17 +56,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.data.util.converter.Converter.ConversionException { + Locale locale) throws ConversionException { if (targetType != getModelType()) { throw new ConversionException( "Converter only supports " + getModelType().getName() @@ -90,17 +82,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.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } @@ -108,21 +93,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/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java index 189e77abb5..25be42621b 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -205,12 +205,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) { @@ -247,13 +241,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); @@ -263,23 +250,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)) { @@ -380,12 +355,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)) { @@ -394,24 +363,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 { @@ -475,12 +432,6 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container#removeAllItems() - */ - @Override public boolean removeAllItems() throws UnsupportedOperationException { if (autoCommit) { @@ -613,11 +564,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); @@ -627,12 +573,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 @@ -686,12 +626,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) { @@ -726,12 +660,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; @@ -742,12 +670,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; @@ -758,12 +680,6 @@ public class SQLContainer implements Container, Container.Filterable, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Ordered#firstItemId() - */ - @Override public Object firstItemId() { updateCount(); @@ -787,12 +703,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()) { @@ -814,23 +724,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); @@ -840,13 +738,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(); @@ -871,12 +762,6 @@ public class SQLContainer implements Container, Container.Filterable, refresh(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() - */ - @Override public Collection<?> getSortableContainerPropertyIds() { return getContainerPropertyIds(); @@ -1485,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 { @@ -1573,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) { @@ -1592,7 +1425,7 @@ public class SQLContainer implements Container, Container.Filterable, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1600,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) { @@ -1618,7 +1443,7 @@ public class SQLContainer implements Container, Container.Filterable, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java index 4e28b5d4e4..66420e9740 100644 --- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java @@ -189,11 +189,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..."); @@ -225,12 +220,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 { @@ -253,24 +242,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 { @@ -351,13 +327,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 { @@ -368,13 +337,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 { @@ -385,11 +347,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 { @@ -397,11 +354,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"); @@ -420,23 +372,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); @@ -714,13 +655,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 { @@ -740,13 +674,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<Filter>(); @@ -828,14 +755,14 @@ public class TableQuery extends AbstractTransactionalQuery @Override public void addRowIdChangeListener(RowIdChangeListener listener) { if (rowIdChangeListeners == null) { - rowIdChangeListeners = new LinkedList<QueryDelegate.RowIdChangeListener>(); + rowIdChangeListeners = new LinkedList<RowIdChangeListener>(); } rowIdChangeListeners.add(listener); } /** * @deprecated As of 7.0, replaced by - * {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} + * {@link #addRowIdChangeListener(QueryDelegate.RowIdChangeListener)} **/ @Override @Deprecated @@ -855,7 +782,7 @@ public class TableQuery extends AbstractTransactionalQuery /** * @deprecated As of 7.0, replaced by - * {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} + * {@link #removeRowIdChangeListener(QueryDelegate.RowIdChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java index 10e122bff5..ceaa552642 100644 --- a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java @@ -18,9 +18,8 @@ package com.vaadin.data.validator; import com.vaadin.data.Validator; /** - * Abstract {@link com.vaadin.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/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java b/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java index 2f5a3e8127..80e5937f19 100644 --- a/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java @@ -20,8 +20,7 @@ import com.vaadin.data.util.converter.StringToDoubleConverter; /** * String validator for a double precision floating point number. See - * {@link com.vaadin.data.validator.AbstractStringValidator} for more - * information. + * {@link AbstractStringValidator} for more information. * * @author Vaadin Ltd. * @since 5.4 diff --git a/server/src/main/java/com/vaadin/data/validator/EmailValidator.java b/server/src/main/java/com/vaadin/data/validator/EmailValidator.java index 54ff2984b7..02f8fe83bf 100644 --- a/server/src/main/java/com/vaadin/data/validator/EmailValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/EmailValidator.java @@ -20,8 +20,7 @@ package com.vaadin.data.validator; * complete according to RFC 822 but handles the vast majority of valid e-mail * addresses correctly. * - * See {@link com.vaadin.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/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java b/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java index fddeef6dec..48d0e15cc2 100644 --- a/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java +++ b/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java @@ -19,8 +19,7 @@ import com.vaadin.data.Property; import com.vaadin.data.util.converter.StringToIntegerConverter; /** - * String validator for integers. See - * {@link com.vaadin.data.validator.AbstractStringValidator} for more + * String validator for integers. See {@link AbstractStringValidator} for more * information. * * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java index 43c8ad49b1..c803513011 100644 --- a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java +++ b/server/src/main/java/com/vaadin/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.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/server/src/main/java/com/vaadin/event/DataBoundTransferable.java b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java index c11c38a381..dae1e7b4d3 100644 --- a/server/src/main/java/com/vaadin/event/DataBoundTransferable.java +++ b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java @@ -26,8 +26,7 @@ import com.vaadin.ui.Component; * (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.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. @@ -60,8 +59,8 @@ public abstract class DataBoundTransferable extends TransferableImpl { /** * Returns the container data source from which the transfer occurs. * - * {@link com.vaadin.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/server/src/main/java/com/vaadin/event/ItemClickEvent.java b/server/src/main/java/com/vaadin/event/ItemClickEvent.java index ebcae610f3..ed926c3a73 100644 --- a/server/src/main/java/com/vaadin/event/ItemClickEvent.java +++ b/server/src/main/java/com/vaadin/event/ItemClickEvent.java @@ -18,6 +18,7 @@ package com.vaadin.event; import java.io.Serializable; import java.lang.reflect.Method; +import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.event.MouseEvents.ClickEvent; @@ -26,10 +27,10 @@ import com.vaadin.ui.Component; /** * - * Click event fired by a {@link Component} implementing - * {@link com.vaadin.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/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java index 2164517b78..fe0362786e 100644 --- a/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java +++ b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java @@ -257,7 +257,7 @@ public class GAEVaadinServlet extends VaadinServlet { String id = AC_BASE + session.getId(); Date expire = new Date( - started + (getMaxInactiveIntervalSeconds(session) * 1000)); + started + getMaxInactiveIntervalSeconds(session) * 1000); Expiration expires = Expiration.onDate(expire); memcache.put(id, bytes, expires); diff --git a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java index ca5631c3b0..99468409f8 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java +++ b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java @@ -571,7 +571,7 @@ public abstract class AbstractColorPicker extends AbstractComponent DesignAttributeHandler.writeAttribute("color", attribute, color.getCSS(), Color.WHITE.getCSS(), String.class); DesignAttributeHandler.writeAttribute("popup-style", attribute, - (popupStyle == PopupStyle.POPUP_NORMAL ? "normal" : "simple"), + popupStyle == PopupStyle.POPUP_NORMAL ? "normal" : "simple", "normal", String.class); DesignAttributeHandler.writeAttribute("position", attribute, positionX + "," + positionY, "0,0", String.class); diff --git a/server/src/main/java/com/vaadin/ui/AbstractField.java b/server/src/main/java/com/vaadin/ui/AbstractField.java index e0f5e971ac..a4c0c5dd1c 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractField.java @@ -54,21 +54,20 @@ import com.vaadin.ui.declarative.DesignContext; * <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.data.Property}interface. - * <code>AbstractField</code> implements that interface itself, too, so - * accessing the Property value represented by it is straightforward. + * that implements the {@link Property}interface. <code>AbstractField</code> + * implements that interface itself, too, so accessing the Property value + * represented by it is straightforward. * </p> * * <p> - * AbstractField also provides the {@link com.vaadin.data.Buffered} interface - * for buffering the data source value. By default the Field is in write - * through-mode and {@link #setWriteThrough(boolean)}should be called to enable - * buffering. + * AbstractField also provides the {@link Buffered} interface for buffering the + * data source value. By default the Field is in write through-mode and + * {@link #setWriteThrough(boolean)}should be called to enable buffering. * </p> * * <p> - * The class also supports {@link com.vaadin.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. @@ -203,7 +202,7 @@ public abstract class AbstractField<T> extends AbstractComponent @Override public boolean isReadOnly() { return super.isReadOnly() - || (dataSource != null && dataSource.isReadOnly()); + || dataSource != null && dataSource.isReadOnly(); } /** @@ -220,7 +219,7 @@ public abstract class AbstractField<T> extends AbstractComponent /** * Tests if the invalid data is committed to datasource. * - * @see com.vaadin.data.BufferedValidatable#isInvalidCommitted() + * @see BufferedValidatable#isInvalidCommitted() */ @Override public boolean isInvalidCommitted() { @@ -230,7 +229,7 @@ public abstract class AbstractField<T> extends AbstractComponent /** * Sets if the invalid data should be committed to datasource. * - * @see com.vaadin.data.BufferedValidatable#setInvalidCommitted(boolean) + * @see BufferedValidatable#setInvalidCommitted(boolean) */ @Override public void setInvalidCommitted(boolean isCommitted) { @@ -245,7 +244,7 @@ public abstract class AbstractField<T> extends AbstractComponent public void commit() throws Buffered.SourceException, InvalidValueException { if (dataSource != null && !dataSource.isReadOnly()) { - if ((isInvalidCommitted() || isValid())) { + if (isInvalidCommitted() || isValid()) { try { // Commits the value to datasource. @@ -608,14 +607,12 @@ public abstract class AbstractField<T> extends AbstractComponent * </p> * * <p> - * If the data source implements - * {@link com.vaadin.data.Property.ValueChangeNotifier} and/or - * {@link com.vaadin.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> @@ -687,7 +684,7 @@ public abstract class AbstractField<T> extends AbstractComponent // Fires value change if the value has changed T value = getInternalValue(); - if ((value != oldValue) && ((value != null && !value.equals(oldValue)) + if (value != oldValue && (value != null && !value.equals(oldValue) || value == null)) { fireValueChange(false); } @@ -951,7 +948,7 @@ public abstract class AbstractField<T> extends AbstractComponent * is required and empty this method throws an EmptyValueException with the * error message set using {@link #setRequiredError(String)}. * - * @see com.vaadin.data.Validatable#validate() + * @see Validatable#validate() */ @Override public void validate() throws Validator.InvalidValueException { @@ -1023,7 +1020,7 @@ public abstract class AbstractField<T> extends AbstractComponent * because the field otherwise visually forget the user input immediately. * * @return true iff the invalid values are allowed. - * @see com.vaadin.data.Validatable#isInvalidAllowed() + * @see Validatable#isInvalidAllowed() */ @Override public boolean isInvalidAllowed() { @@ -1041,7 +1038,7 @@ public abstract class AbstractField<T> extends AbstractComponent * datasource is set. * </p> * - * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean) + * @see Validatable#setInvalidAllowed(boolean) */ @Override public void setInvalidAllowed(boolean invalidAllowed) @@ -1124,7 +1121,7 @@ public abstract class AbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1148,7 +1145,7 @@ public abstract class AbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1248,7 +1245,7 @@ public abstract class AbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #addReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -1270,7 +1267,7 @@ public abstract class AbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #removeReadOnlyStatusChangeListener(Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -1545,7 +1542,7 @@ public abstract class AbstractField<T> extends AbstractComponent @Override public boolean isEmpty() { - return (getFieldValue() == null); + return getFieldValue() == null; } @Override diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java index 80fd442724..01b5ee3c99 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSelect.java @@ -63,8 +63,7 @@ import com.vaadin.ui.declarative.DesignFormatter; /** * <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.data.Item}s in a - * {@link com.vaadin.data.Container}. + * set of choices is presented as a set of {@link Item}s in a {@link Container}. * </p> * * <p> @@ -104,7 +103,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, /** @@ -450,8 +449,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) { @@ -649,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.ui.AbstractField#getValue() + * @see AbstractField#getValue() */ @Override public Object getValue() { @@ -689,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.ui.AbstractField#setValue(java.lang.Object) + * @see AbstractField#setValue(java.lang.Object) */ @Override public void setValue(Object newValue) throws Property.ReadOnlyException { @@ -716,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.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.data.Property.ReadOnlyException, + boolean ignoreReadOnly) throws Property.ReadOnlyException, ConversionException, InvalidValueException { if (isMultiSelect()) { if (newFieldValue == null) { @@ -780,19 +776,19 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @param propertyId * the Id identifying the property. - * @see com.vaadin.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() { @@ -820,7 +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.vaadin.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.vaadin.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.vaadin.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.vaadin.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.vaadin.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.vaadin.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.vaadin.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.vaadin.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.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent) + * @see Container.PropertySetChangeListener#containerPropertySetChange(Container.PropertySetChangeEvent) */ @Override public void containerPropertySetChange( @@ -1580,20 +1571,20 @@ public abstract class AbstractSelect extends AbstractField<Object> implements /** * Adds a new Property set change listener for this Container. * - * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener) + * @see Container.PropertySetChangeNotifier#addListener(Container.PropertySetChangeListener) */ @Override public void addPropertySetChangeListener( Container.PropertySetChangeListener listener) { if (propertySetEventListeners == null) { - propertySetEventListeners = new LinkedHashSet<Container.PropertySetChangeListener>(); + propertySetEventListeners = new LinkedHashSet<PropertySetChangeListener>(); } propertySetEventListeners.add(listener); } /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.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.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.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.vaadin.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.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.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.vaadin.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.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.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.vaadin.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.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.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.vaadin.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.vaadin.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.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 AbstractComponent#detach() */ @Override public void detach() { @@ -1992,14 +1983,12 @@ public abstract class AbstractSelect extends AbstractField<Object> implements } @Override - public void valueChange( - com.vaadin.data.Property.ValueChangeEvent event) { + public void valueChange(Property.ValueChangeEvent event) { markAsDirty(); } @Override - public void itemPropertySetChange( - com.vaadin.data.Item.PropertySetChangeEvent event) { + public void itemPropertySetChange(Item.PropertySetChangeEvent event) { markAsDirty(); } diff --git a/server/src/main/java/com/vaadin/ui/Calendar.java b/server/src/main/java/com/vaadin/ui/Calendar.java index 4870cc73f2..6c3ce38b37 100644 --- a/server/src/main/java/com/vaadin/ui/Calendar.java +++ b/server/src/main/java/com/vaadin/ui/Calendar.java @@ -106,11 +106,8 @@ import com.vaadin.ui.declarative.DesignContext; * * <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. @@ -421,7 +418,7 @@ public class Calendar extends AbstractComponent /** * 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) { @@ -715,7 +712,8 @@ public class Calendar extends AbstractComponent getTimeZone()); Action[] actions = actionHandler.getActions(range, this); if (actions != null) { - Set<Action> actionSet = new LinkedHashSet<Action>(Arrays.asList(actions)); + Set<Action> actionSet = new LinkedHashSet<Action>( + Arrays.asList(actions)); actionMap.put(range, actionSet); } } @@ -1331,11 +1329,9 @@ public class Calendar extends AbstractComponent } /** - * 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. @@ -1362,19 +1358,12 @@ public class Calendar extends AbstractComponent } /** - * @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 @@ -1412,100 +1401,42 @@ public class Calendar extends AbstractComponent } } - /* - * (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, @@ -1513,26 +1444,12 @@ public class Calendar extends AbstractComponent } - /* - * (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); @@ -1557,12 +1474,6 @@ public class Calendar extends AbstractComponent this.dropHandler = dropHandler; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.event.dd.DropTarget#translateDropTargetDetails(java.util.Map) - */ @Override public TargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { @@ -1603,7 +1514,7 @@ public class Calendar extends AbstractComponent * 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.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! * @@ -1683,13 +1594,6 @@ public class Calendar extends AbstractComponent 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, @@ -1698,13 +1602,6 @@ public class Calendar extends AbstractComponent 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) { @@ -1717,13 +1614,6 @@ public class Calendar extends AbstractComponent } } - /* - * (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) { @@ -1798,13 +1688,6 @@ public class Calendar extends AbstractComponent } } - /* - * (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)) { @@ -1985,12 +1868,6 @@ public class Calendar extends AbstractComponent } } - /* - * (non-Javadoc) - * - * @see com.vaadin.server.VariableOwner#changeVariables(java.lang.Object, - * java.util.Map) - */ @Override public void changeVariables(Object source, Map<String, Object> variables) { /* @@ -1999,12 +1876,6 @@ public class Calendar extends AbstractComponent */ } - /* - * (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/server/src/main/java/com/vaadin/ui/DateField.java b/server/src/main/java/com/vaadin/ui/DateField.java index 4e005a5c3f..4b6154d9a8 100644 --- a/server/src/main/java/com/vaadin/ui/DateField.java +++ b/server/src/main/java/com/vaadin/ui/DateField.java @@ -53,12 +53,12 @@ import com.vaadin.ui.declarative.DesignContext; * </p> * <p> * Since <code>DateField</code> extends <code>AbstractField</code> it implements - * the {@link com.vaadin.data.Buffered}interface. + * the {@link Buffered} interface. * </p> * <p> * A <code>DateField</code> is in write-through mode by default, so - * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)}must be called to - * enable buffering. + * {@link AbstractField#setWriteThrough(boolean)}must be called to enable + * buffering. * </p> * * @author Vaadin Ltd. @@ -227,8 +227,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.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. @@ -693,11 +693,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 { @@ -865,7 +860,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; @@ -999,7 +994,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.ui.AbstractField#validate() + * @see AbstractField#validate() */ @Override public void validate() throws InvalidValueException { diff --git a/server/src/main/java/com/vaadin/ui/Field.java b/server/src/main/java/com/vaadin/ui/Field.java index dbcfe69c7f..25089f5fa3 100644 --- a/server/src/main/java/com/vaadin/ui/Field.java +++ b/server/src/main/java/com/vaadin/ui/Field.java @@ -25,20 +25,16 @@ import com.vaadin.ui.Component.Focusable; * value that the user can change through the user interface. * * Field components are built upon the framework defined in the Field interface - * and the {@link com.vaadin.AbstractField} base class. - * - * The Field 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. + * and the {@link AbstractField} base class. * + * The Field interface inherits the {@link Component} superinterface and also + * the {@link Property} interface to have a value for the field. * * @author Vaadin Ltd. * - * @param T + * @param <T> * the type of values in the field, which might not be the same type * as that of the data source if converters are used - * - * @author IT Mill Ltd. */ public interface Field<T> extends Component, BufferedValidatable, Property<T>, Property.ValueChangeNotifier, Property.ValueChangeListener, diff --git a/server/src/main/java/com/vaadin/ui/Form.java b/server/src/main/java/com/vaadin/ui/Form.java index 4926a7a429..19f95b6bdd 100644 --- a/server/src/main/java/com/vaadin/ui/Form.java +++ b/server/src/main/java/com/vaadin/ui/Form.java @@ -58,16 +58,15 @@ import com.vaadin.shared.ui.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. @@ -131,8 +130,7 @@ public class Form extends AbstractField<Object> */ private final ValueChangeListener fieldValueChangeListener = new ValueChangeListener() { @Override - public void valueChange( - com.vaadin.data.Property.ValueChangeEvent event) { + public void valueChange(Property.ValueChangeEvent event) { markAsDirty(); } }; @@ -331,7 +329,7 @@ public class Form extends AbstractField<Object> // Try to commit all for (final Iterator<Object> i = propertyIds.iterator(); i.hasNext();) { try { - final Field<?> f = (fields.get(i.next())); + final Field<?> f = fields.get(i.next()); // Commit only non-readonly fields. if (!f.isReadOnly()) { f.commit(); @@ -379,7 +377,7 @@ public class Form extends AbstractField<Object> // Try to discard all changes for (final Iterator<Object> i = propertyIds.iterator(); i.hasNext();) { try { - (fields.get(i.next())).discard(); + fields.get(i.next()).discard(); } catch (final Buffered.SourceException e) { if (problems == null) { problems = new LinkedList<SourceException>(); @@ -437,7 +435,7 @@ public class Form extends AbstractField<Object> this.buffered = buffered; for (final Iterator<Object> i = propertyIds.iterator(); i .hasNext();) { - (fields.get(i.next())).setBuffered(buffered); + fields.get(i.next()).setBuffered(buffered); } } } @@ -445,7 +443,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) { @@ -576,7 +574,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) { @@ -613,7 +611,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) { @@ -683,7 +681,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) { @@ -701,7 +699,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) { @@ -763,7 +761,7 @@ public class Form extends AbstractField<Object> // expect developer has e.g. PropertyFormatter that he wishes to use and // assign the property to the Viewer instead. boolean hasFilterProperty = field.getPropertyDataSource() != null - && (field.getPropertyDataSource() instanceof Property.Viewer); + && field.getPropertyDataSource() instanceof Property.Viewer; if (hasFilterProperty) { ((Property.Viewer) field.getPropertyDataSource()) .setPropertyDataSource(property); @@ -875,7 +873,7 @@ public class Form extends AbstractField<Object> boolean isMultiselect = false; for (int i = 0; i < values.length && !found; i++) { if (values[i] == value - || (value != null && value.equals(values[i]))) { + || value != null && value.equals(values[i])) { found = true; } } @@ -887,7 +885,7 @@ public class Form extends AbstractField<Object> found = false; for (int i = 0; i < values.length && !found; i++) { if (values[i] == val - || (val != null && val.equals(values[i]))) { + || val != null && val.equals(values[i])) { found = true; } } @@ -951,20 +949,20 @@ public class Form extends AbstractField<Object> /** * Checks the validity of the Form and all of its fields. * - * @see com.vaadin.data.Validatable#validate() + * @see Validatable#validate() */ @Override public void validate() throws InvalidValueException { super.validate(); for (final Iterator<Object> i = propertyIds.iterator(); i.hasNext();) { - (fields.get(i.next())).validate(); + fields.get(i.next()).validate(); } } /** * Checks the validabtable object accept invalid values. * - * @see com.vaadin.data.Validatable#isInvalidAllowed() + * @see Validatable#isInvalidAllowed() */ @Override public boolean isInvalidAllowed() { @@ -974,7 +972,7 @@ public class Form extends AbstractField<Object> /** * Should the validabtable object accept invalid values. * - * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean) + * @see Validatable#setInvalidAllowed(boolean) */ @Override public void setInvalidAllowed(boolean invalidValueAllowed) @@ -985,13 +983,13 @@ 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) { super.setReadOnly(readOnly); for (final Iterator<?> i = propertyIds.iterator(); i.hasNext();) { - (fields.get(i.next())).setReadOnly(readOnly); + fields.get(i.next()).setReadOnly(readOnly); } } @@ -1023,7 +1021,7 @@ public class Form extends AbstractField<Object> /** * Gets the field type. * - * @see com.vaadin.ui.AbstractField#getType() + * @see AbstractField#getType() */ @Override public Class<?> getType() { @@ -1038,7 +1036,7 @@ public class Form extends AbstractField<Object> * * This is relevant when the Form is used as Field. * - * @see com.vaadin.ui.AbstractField#setInternalValue(java.lang.Object) + * @see AbstractField#setInternalValue(java.lang.Object) */ @Override protected void setInternalValue(Object newValue) { @@ -1152,7 +1150,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() { @@ -1165,14 +1163,14 @@ 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) { super.setTabIndex(tabIndex); for (final Iterator<?> i = getItemPropertyIds().iterator(); i .hasNext();) { - (getField(i.next())).setTabIndex(tabIndex); + getField(i.next()).setTabIndex(tabIndex); } } @@ -1212,11 +1210,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/server/src/main/java/com/vaadin/ui/FormFieldFactory.java b/server/src/main/java/com/vaadin/ui/FormFieldFactory.java index ef0894de7b..b130bb228b 100644 --- a/server/src/main/java/com/vaadin/ui/FormFieldFactory.java +++ b/server/src/main/java/com/vaadin/ui/FormFieldFactory.java @@ -49,7 +49,7 @@ public interface FormFieldFactory extends Serializable { * is {@link Form}. uiContext will not necessary be the parent * component of the field, but the one that is responsible for * creating it. - * @return Field the field suitable for editing the specified data. + * @return the field suitable for editing the specified data. */ Field<?> createField(Item item, Object propertyId, Component uiContext); } diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index 5c27773ad7..17ffab017f 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -134,10 +134,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.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. @@ -4027,8 +4026,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * 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.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 @@ -4245,11 +4243,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } /** - * An abstract base class for server-side - * {@link com.vaadin.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 @@ -4811,8 +4808,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, Type type = null; try { type = (getState(false).getClass() - .getField(diffStateKey) - .getGenericType()); + .getField(diffStateKey).getGenericType()); } catch (NoSuchFieldException e) { e.printStackTrace(); } catch (SecurityException e) { @@ -4852,8 +4848,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, Type type = null; try { type = (getState(false).getClass() - .getField(diffStateKey) - .getGenericType()); + .getField(diffStateKey).getGenericType()); } catch (NoSuchFieldException e) { e.printStackTrace(); } catch (SecurityException e) { diff --git a/server/src/main/java/com/vaadin/ui/Label.java b/server/src/main/java/com/vaadin/ui/Label.java index 35ce130790..d9221a1bd7 100644 --- a/server/src/main/java/com/vaadin/ui/Label.java +++ b/server/src/main/java/com/vaadin/ui/Label.java @@ -222,7 +222,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * Gets the type of the Property. * - * @see com.vaadin.data.Property#getType() + * @see Property#getType() */ @Override public Class<String> getType() { @@ -233,7 +233,7 @@ public class Label extends AbstractComponent implements Property<String>, * Gets the viewing data-source property. * * @return the data source property. - * @see com.vaadin.data.Property.Viewer#getPropertyDataSource() + * @see Property.Viewer#getPropertyDataSource() */ @Override public Property getPropertyDataSource() { @@ -246,7 +246,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @param newDataSource * the new data source Property - * @see com.vaadin.data.Property.Viewer#setPropertyDataSource(com.vaadin.data.Property) + * @see Property.Viewer#setPropertyDataSource(Property) */ @Override public void setPropertyDataSource(Property newDataSource) { @@ -347,7 +347,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * Gets the Property that has been modified. * - * @see com.vaadin.data.Property.ValueChangeEvent#getProperty() + * @see Property.ValueChangeEvent#getProperty() */ @Override public Property getProperty() { @@ -360,7 +360,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @param listener * the Listener to be added. - * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com.vaadin.data.Property.ValueChangeListener) + * @see Property.ValueChangeNotifier#addListener(Property.ValueChangeListener) */ @Override public void addValueChangeListener(Property.ValueChangeListener listener) { @@ -370,7 +370,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -383,7 +383,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @param listener * the Listener to be removed. - * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com.vaadin.data.Property.ValueChangeListener) + * @see Property.ValueChangeNotifier#removeListener(Property.ValueChangeListener) */ @Override public void removeValueChangeListener( @@ -394,7 +394,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(Property.ValueChangeListener)} **/ @Override @Deprecated @@ -413,7 +413,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * Listens the value change events from data source. * - * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @see Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ @Override public void valueChange(Property.ValueChangeEvent event) { diff --git a/server/src/main/java/com/vaadin/ui/Select.java b/server/src/main/java/com/vaadin/ui/Select.java index 21313e6e55..0b058007ca 100644 --- a/server/src/main/java/com/vaadin/ui/Select.java +++ b/server/src/main/java/com/vaadin/ui/Select.java @@ -19,12 +19,12 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; +import com.vaadin.data.Item; /** * <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.data.Item}s in a - * {@link com.vaadin.data.Container}. + * set of choices is presented as a set of {@link Item}s in a {@link Container}. * </p> * * <p> diff --git a/server/src/main/java/com/vaadin/ui/Table.java b/server/src/main/java/com/vaadin/ui/Table.java index efc138de08..15f0672fb9 100644 --- a/server/src/main/java/com/vaadin/ui/Table.java +++ b/server/src/main/java/com/vaadin/ui/Table.java @@ -266,7 +266,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), /** @@ -2940,8 +2940,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Invoked when the value of a variable has changed. * - * @see com.vaadin.ui.Select#changeVariables(java.lang.Object, - * java.util.Map) + * @see Select#changeVariables(java.lang.Object, java.util.Map) */ @Override @@ -3290,13 +3289,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; @@ -4253,7 +4245,7 @@ public class Table extends AbstractSelect implements Action.Container, * * Also listens changes in rendered items to refresh content area. * - * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @see Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ @Override @@ -4284,7 +4276,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 @@ -4297,7 +4289,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 @@ -4308,7 +4300,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes all Items from the Container. * - * @see com.vaadin.data.Container#removeAllItems() + * @see Container#removeAllItems() */ @Override @@ -4321,7 +4313,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes the Item identified by <code>ItemId</code> from the Container. * - * @see com.vaadin.data.Container#removeItem(Object) + * @see Container#removeItem(Object) */ @Override @@ -4341,7 +4333,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes a Property specified by the given Property ID from the Container. * - * @see com.vaadin.data.Container#removeContainerProperty(Object) + * @see Container#removeContainerProperty(Object) */ @Override @@ -4369,8 +4361,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.data.Container#addContainerProperty(Object, Class, - * Object) + * @see Container#addContainerProperty(Object, Class, Object) */ @Override @@ -4414,8 +4405,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.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, @@ -4526,7 +4516,7 @@ public class Table extends AbstractSelect implements Action.Container, * {@link #getPageLength()} may produce good enough estimates in some * situations. * - * @see com.vaadin.ui.Select#getVisibleItemIds() + * @see Select#getVisibleItemIds() */ @Override @@ -4550,7 +4540,7 @@ public class Table extends AbstractSelect implements Action.Container, * Container datasource item set change. Table must flush its buffers on * change. * - * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent) + * @see Container.ItemSetChangeListener#containerItemSetChange(Container.ItemSetChangeEvent) */ @Override @@ -4596,7 +4586,7 @@ public class Table extends AbstractSelect implements Action.Container, * Container datasource property set change. Table must flush its buffers on * change. * - * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent) + * @see Container.PropertySetChangeListener#containerPropertySetChange(Container.PropertySetChangeEvent) */ @Override @@ -4644,7 +4634,7 @@ public class Table extends AbstractSelect implements Action.Container, * * @throws UnsupportedOperationException * if set to true. - * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean) + * @see Select#setNewItemsAllowed(boolean) */ @Override @@ -4658,7 +4648,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.data.Container.Ordered#nextItemId(java.lang.Object) + * @see Container.Ordered#nextItemId(java.lang.Object) */ @Override @@ -4670,7 +4660,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.data.Container.Ordered#prevItemId(java.lang.Object) + * @see Container.Ordered#prevItemId(java.lang.Object) */ @Override @@ -4681,7 +4671,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the first Item in the Container. * - * @see com.vaadin.data.Container.Ordered#firstItemId() + * @see Container.Ordered#firstItemId() */ @Override @@ -4692,7 +4682,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the last Item in the Container. * - * @see com.vaadin.data.Container.Ordered#lastItemId() + * @see Container.Ordered#lastItemId() */ @Override @@ -4704,7 +4694,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.data.Container.Ordered#isFirstId(java.lang.Object) + * @see Container.Ordered#isFirstId(java.lang.Object) */ @Override @@ -4716,7 +4706,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.data.Container.Ordered#isLastId(java.lang.Object) + * @see Container.Ordered#isLastId(java.lang.Object) */ @Override @@ -4727,7 +4717,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Adds new item after the given item. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) + * @see Container.Ordered#addItemAfter(java.lang.Object) */ @Override @@ -4744,8 +4734,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Adds new item after the given item. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object, - * java.lang.Object) + * @see Container.Ordered#addItemAfter(java.lang.Object, java.lang.Object) */ @Override @@ -4837,8 +4826,7 @@ public class Table extends AbstractSelect implements Action.Container, * @throws UnsupportedOperationException * if the container data source does not implement * Container.Sortable - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], - * boolean[]) + * @see Container.Sortable#sort(java.lang.Object[], boolean[]) * */ @@ -4892,7 +4880,7 @@ public class Table extends AbstractSelect implements Action.Container, * collection. * </p> * - * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() + * @see Container.Sortable#getSortableContainerPropertyIds() */ @Override diff --git a/server/src/main/java/com/vaadin/ui/TextField.java b/server/src/main/java/com/vaadin/ui/TextField.java index 00628e0593..f3ccbcf89b 100644 --- a/server/src/main/java/com/vaadin/ui/TextField.java +++ b/server/src/main/java/com/vaadin/ui/TextField.java @@ -19,6 +19,7 @@ package com.vaadin.ui; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; +import com.vaadin.data.Buffered; import com.vaadin.data.Property; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; @@ -32,10 +33,9 @@ import com.vaadin.ui.declarative.DesignContext; * * <p> * Since <code>TextField</code> extends <code>AbstractField</code> it implements - * the {@link com.vaadin.data.Buffered} interface. A <code>TextField</code> is - * in write-through mode by default, so - * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)} must be called - * to enable buffering. + * 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. @@ -91,8 +91,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.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/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java index c56acff883..a2b2edde9a 100644 --- a/server/src/main/java/com/vaadin/ui/Tree.java +++ b/server/src/main/java/com/vaadin/ui/Tree.java @@ -497,12 +497,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) { @@ -618,7 +612,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 { @@ -857,7 +851,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item with given ID can have any children. * - * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object) + * @see Container.Hierarchical#areChildrenAllowed(Object) */ @Override public boolean areChildrenAllowed(Object itemId) { @@ -867,7 +861,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.data.Container.Hierarchical#getChildren(Object) + * @see Container.Hierarchical#getChildren(Object) */ @Override public Collection<?> getChildren(Object itemId) { @@ -877,7 +871,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the ID of the parent Item of the specified Item. * - * @see com.vaadin.data.Container.Hierarchical#getParent(Object) + * @see Container.Hierarchical#getParent(Object) */ @Override public Object getParent(Object itemId) { @@ -887,7 +881,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item specified with <code>itemId</code> has child Items. * - * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object) + * @see Container.Hierarchical#hasChildren(Object) */ @Override public boolean hasChildren(Object itemId) { @@ -897,7 +891,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.data.Container.Hierarchical#isRoot(Object) + * @see Container.Hierarchical#isRoot(Object) */ @Override public boolean isRoot(Object itemId) { @@ -907,7 +901,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.data.Container.Hierarchical#rootItemIds() + * @see Container.Hierarchical#rootItemIds() */ @Override public Collection<?> rootItemIds() { @@ -917,8 +911,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Sets the given Item's capability to have children. * - * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object, - * boolean) + * @see Container.Hierarchical#setChildrenAllowed(Object, boolean) */ @Override public boolean setChildrenAllowed(Object itemId, @@ -931,12 +924,6 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, return success; } - /* - * (non-Javadoc) - * - * @see com.vaadin.data.Container.Hierarchical#setParent(java.lang.Object , - * java.lang.Object) - */ @Override public boolean setParent(Object itemId, Object newParentId) { final boolean success = ((Container.Hierarchical) items) @@ -952,7 +939,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Sets the Container that serves as the data source of the viewer. * - * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container) + * @see Container.Viewer#setContainerDataSource(Container) */ @Override public void setContainerDataSource(Container newDataSource) { @@ -987,8 +974,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } @Override - public void containerItemSetChange( - com.vaadin.data.Container.ItemSetChangeEvent event) { + public void containerItemSetChange(Container.ItemSetChangeEvent event) { super.containerItemSetChange(event); if (getContainerDataSource() instanceof Filterable) { boolean hasFilters = !((Filterable) getContainerDataSource()) @@ -1283,7 +1269,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the visible item ids. * - * @see com.vaadin.ui.Select#getVisibleItemIds() + * @see Select#getVisibleItemIds() */ @Override public Collection<?> getVisibleItemIds() { @@ -1327,7 +1313,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tree does not support <code>setNullSelectionItemId</code>. * - * @see com.vaadin.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object) + * @see AbstractSelect#setNullSelectionItemId(java.lang.Object) */ @Override public void setNullSelectionItemId(Object nullSelectionItemId) @@ -1343,7 +1329,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @throws UnsupportedOperationException * if set to true. - * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean) + * @see Select#setNewItemsAllowed(boolean) */ @Override public void setNewItemsAllowed(boolean allowNewOptions) @@ -1579,7 +1565,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * Concrete implementation of {@link DataBoundTransferable} for data * transferred from a tree. * - * @see {@link DataBoundTransferable}. + * @see DataBoundTransferable * * @since 6.3 */ diff --git a/server/src/main/java/com/vaadin/ui/TreeTable.java b/server/src/main/java/com/vaadin/ui/TreeTable.java index e36f672988..1b912589bf 100644 --- a/server/src/main/java/com/vaadin/ui/TreeTable.java +++ b/server/src/main/java/com/vaadin/ui/TreeTable.java @@ -623,8 +623,7 @@ public class TreeTable extends Table implements Hierarchical { } @Override - public void containerItemSetChange( - com.vaadin.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/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java index 68db6db979..cc91a53ec9 100644 --- a/server/src/main/java/com/vaadin/ui/Upload.java +++ b/server/src/main/java/com/vaadin/ui/Upload.java @@ -627,7 +627,7 @@ public class Upload extends AbstractComponent * Adds the upload started event listener. * * @param listener - * the Listener to be added. + * the Listener to be added, not null */ public void addStartedListener(StartedListener listener) { addListener(StartedEvent.class, listener, UPLOAD_STARTED_METHOD); @@ -665,7 +665,7 @@ public class Upload extends AbstractComponent * Adds the upload received event listener. * * @param listener - * the Listener to be added. + * the Listener to be added, not null */ public void addFinishedListener(FinishedListener listener) { addListener(FinishedEvent.class, listener, UPLOAD_FINISHED_METHOD); @@ -703,7 +703,7 @@ public class Upload extends AbstractComponent * Adds the upload interrupted event listener. * * @param listener - * the Listener to be added. + * the Listener to be added, not null */ public void addFailedListener(FailedListener listener) { addListener(FailedEvent.class, listener, UPLOAD_FAILED_METHOD); @@ -741,7 +741,7 @@ public class Upload extends AbstractComponent * Adds the upload success event listener. * * @param listener - * the Listener to be added. + * the Listener to be added, not null */ public void addSucceededListener(SucceededListener listener) { addListener(SucceededEvent.class, listener, UPLOAD_SUCCEEDED_METHOD); @@ -813,7 +813,7 @@ public class Upload extends AbstractComponent * Adds a filename change event listener * * @param listener - * the Listener to add + * the Listener to add, not null */ public void addChangeListener(ChangeListener listener) { super.addListener(EventId.CHANGE, ChangeEvent.class, listener, @@ -1114,8 +1114,8 @@ public class Upload extends AbstractComponent @Override public boolean listenProgress() { - return (progressListeners != null - && !progressListeners.isEmpty()); + return progressListeners != null + && !progressListeners.isEmpty(); } @Override diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java index 76598cf79b..f9be923645 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java @@ -23,11 +23,10 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.ui.Calendar; /** - * Drop details for {@link com.vaadin.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. @@ -71,8 +70,7 @@ public class CalendarTargetDetails extends TargetDetailsImpl { } /** - * @return the {@link com.vaadin.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/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java index f9e4db0510..6a059b9f70 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java @@ -84,8 +84,8 @@ public class ContainerEventProvider /** * Listeners attached to the container */ - private final List<EventSetChangeListener> eventSetChangeListeners = new LinkedList<CalendarEventProvider.EventSetChangeListener>(); - private final List<EventChangeListener> eventChangeListeners = new LinkedList<CalendarEvent.EventChangeListener>(); + private final List<EventSetChangeListener> eventSetChangeListeners = new LinkedList<EventSetChangeListener>(); + private final List<EventChangeListener> eventChangeListeners = new LinkedList<EventChangeListener>(); /** * The event cache contains the events previously created by @@ -240,13 +240,6 @@ public class ContainerEventProvider return event; } - /* - * (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) { eventCache.clear(); @@ -279,14 +272,6 @@ public class ContainerEventProvider return Collections.unmodifiableList(eventCache); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.calendar.event.CalendarEventProvider. - * EventSetChangeNotifier - * #addListener(com.vaadin.addon.calendar.event.CalendarEventProvider. - * EventSetChangeListener) - */ @Override public void addEventSetChangeListener(EventSetChangeListener listener) { if (!eventSetChangeListeners.contains(listener)) { @@ -294,26 +279,11 @@ public class ContainerEventProvider } } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.calendar.event.CalendarEventProvider. - * EventSetChangeNotifier - * #removeListener(com.vaadin.addon.calendar.event.CalendarEventProvider. - * EventSetChangeListener) - */ @Override public void removeEventSetChangeListener(EventSetChangeListener listener) { eventSetChangeListeners.remove(listener); } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier# - * addListener - * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener) - */ @Override public void addEventChangeListener(EventChangeListener listener) { if (eventChangeListeners.contains(listener)) { @@ -321,13 +291,6 @@ public class ContainerEventProvider } } - /* - * (non-Javadoc) - * - * @see com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier# - * removeListener - * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener) - */ @Override public void removeEventChangeListener(EventChangeListener listener) { eventChangeListeners.remove(listener); @@ -421,13 +384,6 @@ public class ContainerEventProvider return allDayProperty; } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange - * (com.vaadin.data.Container.ItemSetChangeEvent) - */ @Override public void containerItemSetChange(ItemSetChangeEvent event) { if (event.getContainer() == container) { @@ -438,13 +394,6 @@ public class ContainerEventProvider } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin.data - * .Property.ValueChangeEvent) - */ @Override public void valueChange(ValueChangeEvent event) { /* @@ -454,14 +403,6 @@ public class ContainerEventProvider */ } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveHandler - * #eventMove - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.MoveEvent) - */ @Override public void eventMove(MoveEvent event) { CalendarEvent ce = event.getCalendarEvent(); @@ -485,14 +426,6 @@ public class ContainerEventProvider } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeHandler - * #eventResize - * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResize) - */ @Override public void eventResize(EventResize event) { CalendarEvent ce = event.getCalendarEvent(); @@ -522,13 +455,6 @@ public class ContainerEventProvider ignoreContainerEvents(); } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent - * (com.vaadin.addon.calendar.event.CalendarEvent) - */ @Override public void addEvent(CalendarEvent event) { Item item; @@ -552,13 +478,6 @@ public class ContainerEventProvider } } - /* - * (non-Javadoc) - * - * @see - * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent - * (com.vaadin.addon.calendar.event.CalendarEvent) - */ @Override public void removeEvent(CalendarEvent event) { container.removeItem(event); diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java index 2378c90b77..1bf88bcf98 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java @@ -371,14 +371,12 @@ public class ColorPickerPopup extends Window @Override public void valueChange(ValueChangeEvent event) { if (!updatingColors) { - float hue = (Float.parseFloat( - event.getProperty().getValue().toString())) / 360f; - float saturation = (Float - .parseFloat(saturationSlider.getValue().toString())) - / 100f; - float value = (Float - .parseFloat(valueSlider.getValue().toString())) - / 100f; + float hue = Float.parseFloat( + event.getProperty().getValue().toString()) / 360f; + float saturation = Float.parseFloat( + saturationSlider.getValue().toString()) / 100f; + float value = Float.parseFloat( + valueSlider.getValue().toString()) / 100f; // Set the color Color color = new Color( @@ -404,14 +402,12 @@ public class ColorPickerPopup extends Window @Override public void valueChange(ValueChangeEvent event) { if (!updatingColors) { - float hue = (Float - .parseFloat(hueSlider.getValue().toString())) - / 360f; - float saturation = (Float.parseFloat( - event.getProperty().getValue().toString())) / 100f; - float value = (Float - .parseFloat(valueSlider.getValue().toString())) - / 100f; + float hue = Float + .parseFloat(hueSlider.getValue().toString()) / 360f; + float saturation = Float.parseFloat( + event.getProperty().getValue().toString()) / 100f; + float value = Float.parseFloat( + valueSlider.getValue().toString()) / 100f; Color color = new Color( Color.HSVtoRGB(hue, saturation, value)); setColor(color); @@ -427,14 +423,12 @@ public class ColorPickerPopup extends Window @Override public void valueChange(ValueChangeEvent event) { if (!updatingColors) { - float hue = (Float - .parseFloat(hueSlider.getValue().toString())) - / 360f; - float saturation = (Float - .parseFloat(saturationSlider.getValue().toString())) - / 100f; - float value = (Float.parseFloat( - event.getProperty().getValue().toString())) / 100f; + float hue = Float + .parseFloat(hueSlider.getValue().toString()) / 360f; + float saturation = Float.parseFloat( + saturationSlider.getValue().toString()) / 100f; + float value = Float.parseFloat( + event.getProperty().getValue().toString()) / 100f; Color color = new Color( Color.HSVtoRGB(hue, saturation, value)); @@ -715,7 +709,7 @@ public class ColorPickerPopup extends Window @Override public Color calculate(int x, int y) { - float h = (x / 220f); + float h = x / 220f; float s = 1f; float v = 1f; @@ -767,8 +761,8 @@ public class ColorPickerPopup extends Window @Override public Color calculate(int x, int y) { - float saturation = 1f - (y / 220.0f); - float value = (x / 220.0f); + float saturation = 1f - y / 220.0f; + float value = x / 220.0f; float hue = Float.parseFloat(hueSlider.getValue().toString()) / 360f; diff --git a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java index 072fe2d471..c225fcb0bc 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java @@ -43,7 +43,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> { * An interface for listening to {@link RendererClickEvent renderer click * events}. * - * @see {@link ButtonRenderer#addClickListener(RendererClickListener)} + * @see ButtonRenderer#addClickListener(RendererClickListener) */ public interface RendererClickListener extends ConnectorEventListener { diff --git a/server/src/main/java/com/vaadin/util/SerializerHelper.java b/server/src/main/java/com/vaadin/util/SerializerHelper.java index 3470684405..604af6f4d3 100644 --- a/server/src/main/java/com/vaadin/util/SerializerHelper.java +++ b/server/src/main/java/com/vaadin/util/SerializerHelper.java @@ -105,9 +105,9 @@ public class SerializerHelper { * List of primitive classes. Google App Engine has problems * serializing/deserializing these (#3064). */ - private static Class<?>[] primitiveClasses = new Class<?>[] { byte.class, - short.class, int.class, long.class, float.class, double.class, - boolean.class, char.class }; + private static final Class<?>[] primitiveClasses = new Class<?>[] { + byte.class, short.class, int.class, long.class, float.class, + double.class, boolean.class, char.class }; /** * Resolves the class given by {@code className}. diff --git a/server/src/test/java/com/vaadin/data/util/MethodPropertyTest.java b/server/src/test/java/com/vaadin/data/util/MethodPropertyTest.java index 962b19a2cb..3257ae27e9 100644 --- a/server/src/test/java/com/vaadin/data/util/MethodPropertyTest.java +++ b/server/src/test/java/com/vaadin/data/util/MethodPropertyTest.java @@ -27,7 +27,7 @@ public class MethodPropertyTest { @Before public void setup() { - testObject = new NestedMethodPropertyTest.Address("some street", 123); + testObject = new Address("some street", 123); } @Test diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java index 9de97b4631..4ef17ee9de 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java @@ -196,8 +196,8 @@ public class SQLContainerTableQueryTest { container.refresh(); - assertThat(getItem(existingItemId).getItemProperty(NAME).toString(), - is("foo")); + assertThat(getItem(existingItemId).getItemProperty(NAME).getValue() + .toString(), is("foo")); } @Test diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java index 1463a27217..b283b5a6a6 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java +++ b/server/src/test/java/com/vaadin/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.data.util.sqlcontainer.connection.MockInitialContextFactory"); + MockInitialContextFactory.class.getCanonicalName()); Context context = EasyMock.createMock(Context.class); context.lookup("testDataSource"); EasyMock.expectLastCall().andReturn(ds); diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java index dd1db30b72..6147cfebde 100644 --- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java +++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java @@ -75,7 +75,7 @@ public class SQLGeneratorsTest { @Test public void generateSelectQuery_filtersAndOrderingSet_shouldSucceed() { SQLGenerator sg = new DefaultSQLGenerator(); - List<com.vaadin.data.Container.Filter> f = new ArrayList<Filter>(); + List<Filter> f = new ArrayList<Filter>(); f.add(new Like("name", "%lle")); List<OrderBy> ob = Arrays.asList(new OrderBy("name", true)); StatementHelper sh = sg.generateSelectQuery("TABLE", f, ob, 0, 0, null); diff --git a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java index 2575b27074..11bbf95f40 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java +++ b/server/src/test/java/com/vaadin/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.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.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java index 4f06a576f4..1d93801c1a 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/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.data.util.converter.Converter.ConversionException { + throws ConversionException { return 42; } @Override public String convertToPresentation(Integer value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.data.util.converter.Converter.ConversionException { + throws ConversionException { return "42"; } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java index bb60a6a472..340e7a7625 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java +++ b/server/src/test/java/com/vaadin/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.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.data.util.converter.Converter.ConversionException { + throws ConversionException { if (value == null) { return null; } diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java index 9be1681f7a..0f353d117b 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java @@ -21,11 +21,10 @@ import org.junit.Test; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.DateField; import com.vaadin.ui.PopupDateField; /** - * Tests the declarative support for implementations of {@link DateField}. + * Tests the declarative support for implementations of {@link PopupDateField}. * * @since 7.4 * @author Vaadin Ltd diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java index 19ae471c16..6f2c781727 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java +++ b/server/src/test/java/com/vaadin/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.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorMissingPropertyTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorMissingPropertyTest.java index 31afc4276b..7d2b9f239a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorMissingPropertyTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorMissingPropertyTest.java @@ -43,7 +43,7 @@ public class GridEditorMissingPropertyTest { private final File file = new File(FILE_NAME_BEFORE, FILE_SIZE_BEFORE); @Before - public void setup() throws SecurityException, NoSuchMethodException { + public void setup() throws SecurityException, NoSuchMethodException { final BeanItem<Entry> folderItem = new BeanItem<Entry>(folder); final BeanItem<Entry> childItem = new BeanItem<Entry>(file); @@ -64,8 +64,8 @@ public class GridEditorMissingPropertyTest { // Item with incomplete property set fieldGroup.setItemDataSource( grid.getContainerDataSource().getItem(folder)); - grid.getColumn(PROPERTY_NAME) - .getEditorField(); // called in grid.doEditItem + grid.getColumn(PROPERTY_NAME).getEditorField(); // called in + // grid.doEditItem assertTrue("Properties in item should be bound", fieldGroup.getBoundPropertyIds().contains(PROPERTY_NAME)); assertFalse("Properties not present in item should not be bound", @@ -158,7 +158,8 @@ public class GridEditorMissingPropertyTest { testCancel(file, PROPERTY_SIZE, FILE_SIZE_BEFORE, FILE_SIZE_AFTER); // Row with missing property - testCancel(folder, PROPERTY_NAME, FOLDER_NAME_BEFORE, FOLDER_NAME_AFTER); + testCancel(folder, PROPERTY_NAME, FOLDER_NAME_BEFORE, + FOLDER_NAME_AFTER); } private void testCancel(Object itemId, String propertyId, @@ -223,8 +224,8 @@ public class GridEditorMissingPropertyTest { grid.doEditItem(); } - private class TestContainer extends - AbstractInMemoryContainer<Object, String, BeanItem> { + private class TestContainer + extends AbstractInMemoryContainer<Object, String, BeanItem> { private final List<BeanItem<Entry>> items; private final List<String> pids; diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java index 9fe345ea85..10f935a498 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java +++ b/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.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.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/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java index 9801fde9ba..c9982af82b 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java +++ b/server/src/test/java/com/vaadin/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.data.util.converter.Converter.ConversionException { + throws ConversionException { return "model"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.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.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.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.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.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.data.util.converter.Converter.ConversionException { + throws ConversionException { return 11; } @Override public String convertToPresentation(Integer value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.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.data.util.converter.Converter.ConversionException { + throws ConversionException { return "model"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.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.data.util.converter.Converter.ConversionException { + throws ConversionException { return "model2"; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws com.vaadin.data.util.converter.Converter.ConversionException { + throws ConversionException { return "presentation2"; } diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java index b34c391505..7134505125 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java @@ -23,15 +23,15 @@ package com.vaadin.shared.ui.grid; public enum ColumnResizeMode { /** - * When column resize mode is set to Animated, columns - * are resized as they are dragged. + * When column resize mode is set to Animated, columns are resized as they + * are dragged. */ ANIMATED, /** - * When column resize mode is set to Simple, dragging to resize - * a column will show a marker, and the column will resize only - * after the mouse button or touch is released. + * When column resize mode is set to Simple, dragging to resize a column + * will show a marker, and the column will resize only after the mouse + * button or touch is released. */ SIMPLE diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java index a050a70759..f1b6550912 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java @@ -143,7 +143,7 @@ public class GridState extends TabIndexState { /** * Column resize mode in grid. - * + * * @since 7.7.5 */ public ColumnResizeMode columnResizeMode = ColumnResizeMode.ANIMATED; |