From 0cfb20938f2b15767ebbd367ad8312642b947c8c Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Fri, 24 Feb 2017 17:06:58 +0200 Subject: Revert diamond operator changes --- .../main/java/com/vaadin/v7/ui/AbstractField.java | 4 +- .../main/java/com/vaadin/v7/ui/AbstractSelect.java | 36 ++++----- .../src/main/java/com/vaadin/v7/ui/Calendar.java | 21 +++--- .../src/main/java/com/vaadin/v7/ui/ComboBox.java | 4 +- .../src/main/java/com/vaadin/v7/ui/DateField.java | 4 +- .../src/main/java/com/vaadin/v7/ui/Form.java | 14 ++-- .../src/main/java/com/vaadin/v7/ui/Grid.java | 85 +++++++++++----------- .../main/java/com/vaadin/v7/ui/OptionGroup.java | 2 +- .../src/main/java/com/vaadin/v7/ui/Table.java | 85 +++++++++++----------- .../src/main/java/com/vaadin/v7/ui/Tree.java | 36 ++++----- .../src/main/java/com/vaadin/v7/ui/TreeTable.java | 10 +-- .../src/main/java/com/vaadin/v7/ui/Upload.java | 2 +- .../calendar/ContainerEventProvider.java | 7 +- .../ui/components/calendar/event/BasicEvent.java | 2 +- .../calendar/event/BasicEventProvider.java | 6 +- .../ui/components/colorpicker/ColorPickerGrid.java | 30 ++++---- .../components/colorpicker/ColorPickerHistory.java | 32 ++++---- .../components/colorpicker/ColorPickerPopup.java | 4 +- 18 files changed, 194 insertions(+), 190 deletions(-) (limited to 'compatibility-server/src/main/java/com/vaadin/v7/ui') diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java index 53591e1d97..59e078e378 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java @@ -839,7 +839,7 @@ public abstract class AbstractField extends AbstractLegacyComponent @Override public void addValidator(Validator validator) { if (validators == null) { - validators = new LinkedList<>(); + validators = new LinkedList(); } validators.add(validator); markAsDirty(); @@ -962,7 +962,7 @@ public abstract class AbstractField extends AbstractLegacyComponent } } - List validationExceptions = new ArrayList<>(); + List validationExceptions = new ArrayList(); if (validators != null) { // Gets all the validation errors for (Validator v : validators) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java index 103eebb4e9..0aeef24c68 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java @@ -233,17 +233,17 @@ public abstract class AbstractSelect extends AbstractField implements /** * Keymapper used to map key values. */ - protected KeyMapper itemIdMapper = new KeyMapper<>(); + protected KeyMapper itemIdMapper = new KeyMapper(); /** * Item icons. */ - private final HashMap itemIcons = new HashMap<>(); + private final HashMap itemIcons = new HashMap(); /** * Item captions. */ - private final HashMap itemCaptions = new HashMap<>(); + private final HashMap itemCaptions = new HashMap(); /** * Item caption mode. @@ -471,7 +471,7 @@ public abstract class AbstractSelect extends AbstractField implements // TODO Optimize by adding repaintNotNeeded when applicable // Converts the key-array to id-set - final LinkedList acceptedSelections = new LinkedList<>(); + final LinkedList acceptedSelections = new LinkedList(); for (int i = 0; i < clientSideSelectedKeys.length; i++) { final Object id = itemIdMapper .get(clientSideSelectedKeys[i]); @@ -503,9 +503,9 @@ public abstract class AbstractSelect extends AbstractField implements @SuppressWarnings("unchecked") Set newsel = (Set) getValue(); if (newsel == null) { - newsel = new LinkedHashSet<>(); + newsel = new LinkedHashSet(); } else { - newsel = new LinkedHashSet<>(newsel); + newsel = new LinkedHashSet(newsel); } newsel.removeAll(visibleNotSelected); newsel.addAll(acceptedSelections); @@ -657,14 +657,14 @@ public abstract class AbstractSelect extends AbstractField implements // If the return value is not a set if (retValue == null) { - return new HashSet<>(); + return new HashSet(); } if (retValue instanceof Set) { return Collections.unmodifiableSet((Set) retValue); } else if (retValue instanceof Collection) { return new HashSet((Collection) retValue); } else { - final Set s = new HashSet<>(); + final Set s = new HashSet(); if (items.containsId(retValue)) { s.add(retValue); } @@ -722,7 +722,7 @@ public abstract class AbstractSelect extends AbstractField implements ConversionException, InvalidValueException { if (isMultiSelect()) { if (newFieldValue == null) { - super.setValue(new LinkedHashSet<>(), repaintIsNotNeeded, + super.setValue(new LinkedHashSet(), repaintIsNotNeeded, ignoreReadOnly); } else if (Collection.class .isAssignableFrom(newFieldValue.getClass())) { @@ -974,7 +974,7 @@ public abstract class AbstractSelect extends AbstractField implements if (isMultiSelect()) { Collection valueAsCollection = (Collection) value; - List newSelection = new ArrayList<>( + List newSelection = new ArrayList( valueAsCollection.size()); for (Object subValue : valueAsCollection) { if (containsId(subValue)) { @@ -1125,7 +1125,7 @@ public abstract class AbstractSelect extends AbstractField implements // Convert the value type if (multiSelect) { - final Set s = new HashSet<>(); + final Set s = new HashSet(); if (oldValue != null) { s.add(oldValue); } @@ -1530,7 +1530,7 @@ public abstract class AbstractSelect extends AbstractField implements setValue(itemId); } else if (!isSelected(itemId) && itemId != null && items.containsId(itemId)) { - final Set s = new HashSet<>((Set) getValue()); + final Set s = new HashSet((Set) getValue()); s.add(itemId); setValue(s); } @@ -1548,7 +1548,7 @@ public abstract class AbstractSelect extends AbstractField implements public void unselect(Object itemId) { if (isSelected(itemId)) { if (isMultiSelect()) { - final Set s = new HashSet<>((Set) getValue()); + final Set s = new HashSet((Set) getValue()); s.remove(itemId); setValue(s); } else { @@ -1577,7 +1577,7 @@ public abstract class AbstractSelect extends AbstractField implements public void addPropertySetChangeListener( Container.PropertySetChangeListener listener) { if (propertySetEventListeners == null) { - propertySetEventListeners = new LinkedHashSet<>(); + propertySetEventListeners = new LinkedHashSet(); } propertySetEventListeners.add(listener); } @@ -1627,7 +1627,7 @@ public abstract class AbstractSelect extends AbstractField implements public void addItemSetChangeListener( Container.ItemSetChangeListener listener) { if (itemSetEventListeners == null) { - itemSetEventListeners = new LinkedHashSet<>(); + itemSetEventListeners = new LinkedHashSet(); } itemSetEventListeners.add(listener); } @@ -1914,7 +1914,7 @@ public abstract class AbstractSelect extends AbstractField implements // TODO clean this up - type is either Item.PropertySetChangeNotifier or // Property.ValueChangeNotifier - HashSet captionChangeNotifiers = new HashSet<>(); + HashSet captionChangeNotifiers = new HashSet(); public void addNotifierForItem(Object itemId) { switch (getItemCaptionMode()) { @@ -2038,7 +2038,7 @@ public abstract class AbstractSelect extends AbstractField implements */ private static abstract class AbstractItemSetCriterion extends ClientSideCriterion { - protected final Collection itemIds = new HashSet<>(); + protected final Collection itemIds = new HashSet(); protected AbstractSelect select; public AbstractItemSetCriterion(AbstractSelect select, @@ -2213,7 +2213,7 @@ public abstract class AbstractSelect extends AbstractField implements } protected void readItems(Element design, DesignContext context) { - Set selected = new HashSet<>(); + Set selected = new HashSet(); for (Element child : design.children()) { readItem(child, selected, context); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java index 73b147533c..6e5c1df7f8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java @@ -303,7 +303,7 @@ public class Calendar extends AbstractLegacyComponent public Calendar(String caption, CalendarEventProvider eventProvider) { registerRpc(rpc); setCaption(caption); - handlers = new HashMap<>(); + handlers = new HashMap(); setDefaultHandlers(); currentCalendar.setTime(new Date()); setEventProvider(eventProvider); @@ -467,7 +467,7 @@ public class Calendar extends AbstractLegacyComponent events = getEventProvider().getEvents(firstDateToShow, lastDateToShow); cacheMinMaxTimeOfDay(events); - List calendarStateEvents = new ArrayList<>(); + List calendarStateEvents = new ArrayList(); if (events != null) { for (int i = 0; i < events.size(); i++) { CalendarEvent e = events.get(i); @@ -617,9 +617,9 @@ public class Calendar extends AbstractLegacyComponent DateFormat weeklyCaptionFormatter = getWeeklyCaptionFormatter(); weeklyCaptionFormatter.setTimeZone(currentCalendar.getTimeZone()); - Map> actionMap = new HashMap<>(); + Map> actionMap = new HashMap>(); - List days = new ArrayList<>(); + List days = new ArrayList(); // Send all dates to client from server. This // approach was taken because gwt doesn't @@ -706,7 +706,7 @@ public class Calendar extends AbstractLegacyComponent getTimeZone()); Action[] actions = actionHandler.getActions(range, this); if (actions != null) { - Set actionSet = new LinkedHashSet<>( + Set actionSet = new LinkedHashSet( Arrays.asList(actions)); actionMap.put(range, actionSet); } @@ -719,7 +719,8 @@ public class Calendar extends AbstractLegacyComponent getTimeZone()); Action[] actions = actionHandler.getActions(range, this); if (actions != null) { - Set actionSet = new LinkedHashSet<>(Arrays.asList(actions)); + Set actionSet = new LinkedHashSet( + Arrays.asList(actions)); actionMap.put(range, actionSet); } } @@ -730,7 +731,7 @@ public class Calendar extends AbstractLegacyComponent return null; } - List calendarActions = new ArrayList<>(); + List calendarActions = new ArrayList(); SimpleDateFormat formatter = new SimpleDateFormat( DateConstants.ACTION_DATE_FORMAT_PATTERN); @@ -1519,7 +1520,7 @@ public class Calendar extends AbstractLegacyComponent @Override public TargetDetails translateDropTargetDetails( Map clientVariables) { - Map serverVariables = new HashMap<>(); + Map serverVariables = new HashMap(); if (clientVariables.containsKey("dropSlotIndex")) { int slotIndex = (Integer) clientVariables.get("dropSlotIndex"); @@ -1704,8 +1705,8 @@ public class Calendar extends AbstractLegacyComponent public void addActionHandler(Handler actionHandler) { if (actionHandler != null) { if (actionHandlers == null) { - actionHandlers = new LinkedList<>(); - actionMapper = new KeyMapper<>(); + actionHandlers = new LinkedList(); + actionMapper = new KeyMapper(); } if (!actionHandlers.contains(actionHandler)) { actionHandlers.add(actionHandler); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java index f6a9d32d6b..8a9db41624 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java @@ -672,7 +672,7 @@ public class ComboBox extends AbstractSelect protected List getFilteredOptions() { if (!isFilteringNeeded()) { prevfilterstring = null; - filteredOptions = new LinkedList<>(getItemIds()); + filteredOptions = new LinkedList(getItemIds()); return filteredOptions; } @@ -689,7 +689,7 @@ public class ComboBox extends AbstractSelect } prevfilterstring = filterstring; - filteredOptions = new LinkedList<>(); + filteredOptions = new LinkedList(); for (final Iterator it = items.iterator(); it.hasNext();) { final Object itemId = it.next(); String caption = getItemCaption(itemId); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java index 16b0268354..33ca986fa1 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java @@ -160,7 +160,7 @@ public class DateField extends AbstractField implements private TimeZone timeZone = null; - private static Map variableNameForResolution = new HashMap<>(); + private static Map variableNameForResolution = new HashMap(); private String dateOutOfRangeMessage = "Date is out of allowed range"; @@ -502,7 +502,7 @@ public class DateField extends AbstractField implements // Gets the new date in parts boolean hasChanges = false; - Map calendarFieldChanges = new HashMap<>(); + Map calendarFieldChanges = new HashMap(); for (Resolution r : Resolution .getResolutionsHigherOrEqualTo(resolution)) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java index e0953a1eb4..c671caea93 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java @@ -98,7 +98,7 @@ public class Form extends AbstractField /** * Ordered list of property ids in this editor. */ - private final LinkedList propertyIds = new LinkedList<>(); + private final LinkedList propertyIds = new LinkedList(); /** * Current buffered source exception. @@ -113,12 +113,12 @@ public class Form extends AbstractField /** * Mapping from propertyName to corresponding field. */ - private final HashMap> fields = new HashMap<>(); + private final HashMap> fields = new HashMap>(); /** * Form may act as an Item, its own properties are stored here. */ - private final HashMap> ownProperties = new HashMap<>(); + private final HashMap> ownProperties = new HashMap>(); /** * Field factory for this form. @@ -345,7 +345,7 @@ public class Form extends AbstractField } } catch (final Buffered.SourceException e) { if (problems == null) { - problems = new LinkedList<>(); + problems = new LinkedList(); } problems.add(e); } @@ -389,7 +389,7 @@ public class Form extends AbstractField fields.get(i.next()).discard(); } catch (final Buffered.SourceException e) { if (problems == null) { - problems = new LinkedList<>(); + problems = new LinkedList(); } problems.add(e); } @@ -1105,7 +1105,7 @@ public class Form extends AbstractField if (data instanceof Item) { item = (Item) data; } else if (data != null) { - item = new BeanItem<>(data); + item = new BeanItem(data); } // Sets the datasource to form @@ -1149,7 +1149,7 @@ public class Form extends AbstractField * the visibleProperties to set. */ public void setVisibleItemProperties(Object... visibleProperties) { - LinkedList v = new LinkedList<>(); + LinkedList v = new LinkedList(); for (int i = 0; i < visibleProperties.length; i++) { v.add(visibleProperties[i]); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java index 4b661d577c..207132f364 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java @@ -341,19 +341,19 @@ public class Grid extends AbstractComponent * client. Details components get destroyed once they scroll out of * view. */ - private final Map itemIdToDetailsComponent = new HashMap<>(); + private final Map itemIdToDetailsComponent = new HashMap(); /** * Set of item ids that got null from DetailsGenerator when * {@link DetailsGenerator#getDetails(RowReference)} was called. */ - private final Set emptyDetails = new HashSet<>(); + private final Set emptyDetails = new HashSet(); /** * Set of item IDs for all open details rows. Contains even the ones * that are not currently visible on the client. */ - private final Set openDetails = new HashSet<>(); + private final Set openDetails = new HashSet(); public DetailComponentManager(Grid grid) { this(grid, DetailsGenerator.NULL); @@ -438,7 +438,7 @@ public class Grid extends AbstractComponent * Recreates all visible details components. */ public void refreshDetails() { - Set visibleItemIds = new HashSet<>( + Set visibleItemIds = new HashSet( itemIdToDetailsComponent.keySet()); for (Object itemId : visibleItemIds) { destroyDetails(itemId); @@ -572,7 +572,7 @@ public class Grid extends AbstractComponent @Override protected void bindFields() { - List> fields = new ArrayList<>(getFields()); + List> fields = new ArrayList>(getFields()); Item itemDataSource = getItemDataSource(); if (itemDataSource == null) { @@ -746,7 +746,7 @@ public class Grid extends AbstractComponent private CommitException cause; - private Set errorColumns = new HashSet<>(); + private Set errorColumns = new HashSet(); private String userErrorMessage; @@ -1408,7 +1408,7 @@ public class Grid extends AbstractComponent @Deprecated public static abstract class AbstractSelectionModel extends AbstractGridExtension implements SelectionModel, DataGenerator { - protected final LinkedHashSet selection = new LinkedHashSet<>(); + protected final LinkedHashSet selection = new LinkedHashSet(); @Override public boolean isSelected(final Object itemId) { @@ -1417,7 +1417,7 @@ public class Grid extends AbstractComponent @Override public Collection getSelectedRows() { - return new ArrayList<>(selection); + return new ArrayList(selection); } @Override @@ -1657,7 +1657,7 @@ public class Grid extends AbstractComponent @Override public void select(List rowKeys) { - List items = new ArrayList<>(); + List items = new ArrayList(); for (String rowKey : rowKeys) { items.add(getItemId(rowKey)); } @@ -1666,7 +1666,7 @@ public class Grid extends AbstractComponent @Override public void deselect(List rowKeys) { - List items = new ArrayList<>(); + List items = new ArrayList(); for (String rowKey : rowKeys) { items.add(getItemId(rowKey)); } @@ -1720,7 +1720,8 @@ public class Grid extends AbstractComponent final boolean selectionWillChange = !selection.containsAll(itemIds) && selection.size() < selectionLimit; if (selectionWillChange) { - final HashSet oldSelection = new HashSet<>(selection); + final HashSet oldSelection = new HashSet( + selection); if (selection.size() + itemIds.size() >= selectionLimit) { // Add one at a time if there's a risk of overflow Iterator iterator = itemIds.iterator(); @@ -1807,7 +1808,8 @@ public class Grid extends AbstractComponent final boolean hasCommonElements = !Collections.disjoint(itemIds, selection); if (hasCommonElements) { - final HashSet oldSelection = new HashSet<>(selection); + final HashSet oldSelection = new HashSet( + selection); selection.removeAll(itemIds); fireSelectionEvent(oldSelection, selection); } @@ -1890,7 +1892,7 @@ public class Grid extends AbstractComponent checkItemIdsExist(itemIds); boolean changed = false; - Set selectedRows = new HashSet<>(itemIds); + Set selectedRows = new HashSet(itemIds); final Collection oldSelection = getSelectedRows(); Set added = getDifference(selectedRows, selection); if (!added.isEmpty()) { @@ -1931,7 +1933,7 @@ public class Grid extends AbstractComponent */ private static Set getDifference(Set set1, Set set2) { - Set diff = new HashSet<>(set1); + Set diff = new HashSet(set1); diff.removeAll(set2); return diff; } @@ -2311,8 +2313,8 @@ public class Grid extends AbstractComponent private RowState rowState = new RowState(); protected StaticSection section; - private Map cells = new LinkedHashMap<>(); - private Map, CELLTYPE> cellGroups = new HashMap<>(); + private Map cells = new LinkedHashMap(); + private Map, CELLTYPE> cellGroups = new HashMap, CELLTYPE>(); protected StaticRow(StaticSection section) { this.section = section; @@ -2397,7 +2399,7 @@ public class Grid extends AbstractComponent public CELLTYPE join(Object... propertyIds) { assert propertyIds.length > 1 : "You need to merge at least 2 properties"; - Set cells = new HashSet<>(); + Set cells = new HashSet(); for (int i = 0; i < propertyIds.length; ++i) { cells.add(getCell(propertyIds[i])); } @@ -2415,7 +2417,7 @@ public class Grid extends AbstractComponent public CELLTYPE join(CELLTYPE... cells) { assert cells.length > 1 : "You need to merge at least 2 cells"; - return join(new HashSet<>(Arrays.asList(cells))); + return join(new HashSet(Arrays.asList(cells))); } protected CELLTYPE join(Set cells) { @@ -2432,7 +2434,7 @@ public class Grid extends AbstractComponent // Create new cell data for the group CELLTYPE newCell = createCell(); - Set columnGroup = new HashSet<>(); + Set columnGroup = new HashSet(); for (CELLTYPE cell : cells) { columnGroup.add(cell.getColumnId()); } @@ -2481,7 +2483,7 @@ public class Grid extends AbstractComponent */ protected void writeDesign(Element trElement, DesignContext designContext) { - Set visited = new HashSet<>(); + Set visited = new HashSet(); for (Grid.Column column : section.grid.getColumns()) { CELLTYPE cell = getCell(column.getPropertyId()); if (visited.contains(cell)) { @@ -2533,7 +2535,7 @@ public class Grid extends AbstractComponent int colspan = DesignAttributeHandler.readAttribute( "colspan", element.attributes(), 1, int.class); - Set cells = new HashSet<>(); + Set cells = new HashSet(); for (int c = 0; c < colspan; ++c) { cells.add(getCell(section.grid.getColumns() .get(columnIndex + c).getPropertyId())); @@ -2774,7 +2776,7 @@ public class Grid extends AbstractComponent } protected Grid grid; - protected List rows = new ArrayList<>(); + protected List rows = new ArrayList(); /** * Sets the visibility of the whole section. @@ -4517,17 +4519,17 @@ public class Grid extends AbstractComponent /** * Property id to column instance mapping */ - private final Map columns = new HashMap<>(); + private final Map columns = new HashMap(); /** * Key generator for column server-to-client communication */ - private final KeyMapper columnKeys = new KeyMapper<>(); + private final KeyMapper columnKeys = new KeyMapper(); /** * The current sort order */ - private final List sortOrder = new ArrayList<>(); + private final List sortOrder = new ArrayList(); /** * Property listener for listening to changes in data source properties. @@ -4540,7 +4542,7 @@ public class Grid extends AbstractComponent event.getContainer().getContainerPropertyIds()); // Find columns that need to be removed. - List removedColumns = new LinkedList<>(); + List removedColumns = new LinkedList(); for (Object propertyId : columns.keySet()) { if (!properties.contains(propertyId)) { removedColumns.add(getColumn(propertyId)); @@ -4556,7 +4558,7 @@ public class Grid extends AbstractComponent datasourceExtension.columnsRemoved(removedColumns); // Add new columns - List addedColumns = new LinkedList<>(); + List addedColumns = new LinkedList(); for (Object propertyId : properties) { if (!columns.containsKey(propertyId)) { addedColumns.add(appendColumn(propertyId)); @@ -4621,7 +4623,7 @@ public class Grid extends AbstractComponent * Poperty ID to Field mapping that stores editor fields set by * {@link #setEditorField(Object, Field)}. */ - private Map> editorFields = new HashMap<>(); + private Map> editorFields = new HashMap>(); private CellStyleGenerator cellStyleGenerator; private RowStyleGenerator rowStyleGenerator; @@ -4643,7 +4645,7 @@ public class Grid extends AbstractComponent private DetailComponentManager detailComponentManager = null; - private Set extensionComponents = new HashSet<>(); + private Set extensionComponents = new HashSet(); private static final Method SELECTION_CHANGE_METHOD = ReflectTools .findMethod(SelectionListener.class, "select", @@ -4726,7 +4728,8 @@ public class Grid extends AbstractComponent boolean userOriginated) { assert columnIds.length == directions.length; - List order = new ArrayList<>(columnIds.length); + List order = new ArrayList( + columnIds.length); for (int i = 0; i < columnIds.length; i++) { Object propertyId = getPropertyIdByColumnId(columnIds[i]); order.add(new SortOrder(propertyId, directions[i])); @@ -4922,7 +4925,7 @@ public class Grid extends AbstractComponent errorMessage = event.getUserErrorMessage(); - errorColumnIds = new ArrayList<>(); + errorColumnIds = new ArrayList(); for (Column column : event.getErrorColumns()) { errorColumnIds.add(column.state.id); } @@ -5147,7 +5150,7 @@ public class Grid extends AbstractComponent * @return unmodifiable copy of current columns in visual order */ public List getColumns() { - List columns = new ArrayList<>(); + List columns = new ArrayList(); for (String columnId : getState(false).columnOrder) { columns.add(getColumnByColumnId(columnId)); } @@ -5190,7 +5193,7 @@ public class Grid extends AbstractComponent // Inform the data provider of this new column. Column column = getColumn(propertyId); - List addedColumns = new ArrayList<>(); + List addedColumns = new ArrayList(); addedColumns.add(column); datasourceExtension.columnsAdded(addedColumns); @@ -5255,8 +5258,8 @@ public class Grid extends AbstractComponent * Removes all columns from this Grid. */ public void removeAllColumns() { - List removed = new ArrayList<>(columns.values()); - Set properties = new HashSet<>(columns.keySet()); + List removed = new ArrayList(columns.values()); + Set properties = new HashSet(columns.keySet()); for (Object propertyId : properties) { removeColumn(propertyId); } @@ -5402,7 +5405,7 @@ public class Grid extends AbstractComponent "There is no column for given property id " + propertyId); } - List removed = new ArrayList<>(); + List removed = new ArrayList(); removed.add(getColumn(propertyId)); internalRemoveColumn(propertyId); datasourceExtension.columnsRemoved(removed); @@ -5435,12 +5438,12 @@ public class Grid extends AbstractComponent "The propertyIds array contains duplicates: " + SharedUtil.getDuplicates(propertyIds)); } - Set removePids = new HashSet<>(columns.keySet()); + Set removePids = new HashSet(columns.keySet()); removePids.removeAll(Arrays.asList(propertyIds)); for (Object removePid : removePids) { removeColumn(removePid); } - Set addPids = new HashSet<>(Arrays.asList(propertyIds)); + Set addPids = new HashSet(Arrays.asList(propertyIds)); addPids.removeAll(columns.keySet()); for (Object propertyId : addPids) { addColumn(propertyId); @@ -5462,7 +5465,7 @@ public class Grid extends AbstractComponent "The propertyIds array contains duplicates: " + SharedUtil.getDuplicates(propertyIds)); } - List columnOrder = new ArrayList<>(); + List columnOrder = new ArrayList(); for (Object propertyId : propertyIds) { if (columns.containsKey(propertyId)) { columnOrder.add(columnKeys.key(propertyId)); @@ -6238,7 +6241,7 @@ public class Grid extends AbstractComponent getState().sortColumns = new String[] {}; getState(false).sortDirs = new SortDirection[] {}; } - fireEvent(new SortEvent(this, new ArrayList<>(sortOrder), + fireEvent(new SortEvent(this, new ArrayList(sortOrder), userOriginated)); } else { throw new IllegalStateException( @@ -6579,7 +6582,7 @@ public class Grid extends AbstractComponent public Iterator iterator() { // This is a hash set to avoid adding header/footer components inside // merged cells multiple times - LinkedHashSet componentList = new LinkedHashSet<>(); + LinkedHashSet componentList = new LinkedHashSet(); Header header = getHeader(); for (int i = 0; i < header.getRowCount(); ++i) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java index 667149d0e9..34090225ff 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java @@ -50,7 +50,7 @@ import com.vaadin.v7.shared.ui.optiongroup.OptionGroupState; public class OptionGroup extends AbstractSelect implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier { - private Set disabledItemIds = new HashSet<>(); + private Set disabledItemIds = new HashSet(); public OptionGroup() { super(); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java index b8c649eba5..8b6ad8dbfb 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java @@ -389,57 +389,57 @@ public class Table extends AbstractSelect implements Action.Container, /** * Keymapper for column ids. */ - private final KeyMapper columnIdMap = new KeyMapper<>(); + private final KeyMapper columnIdMap = new KeyMapper(); /** * Holds visible column propertyIds - in order. */ - private LinkedList visibleColumns = new LinkedList<>(); + private LinkedList visibleColumns = new LinkedList(); /** * Holds noncollapsible columns. */ - private HashSet noncollapsibleColumns = new HashSet<>(); + private HashSet noncollapsibleColumns = new HashSet(); /** * Holds propertyIds of currently collapsed columns. */ - private final HashSet collapsedColumns = new HashSet<>(); + private final HashSet collapsedColumns = new HashSet(); /** * Holds headers for visible columns (by propertyId). */ - private final HashMap columnHeaders = new HashMap<>(); + private final HashMap columnHeaders = new HashMap(); /** * Holds footers for visible columns (by propertyId). */ - private final HashMap columnFooters = new HashMap<>(); + private final HashMap columnFooters = new HashMap(); /** * Holds icons for visible columns (by propertyId). */ - private final HashMap columnIcons = new HashMap<>(); + private final HashMap columnIcons = new HashMap(); /** * Holds alignments for visible columns (by propertyId). */ - private HashMap columnAlignments = new HashMap<>(); + private HashMap columnAlignments = new HashMap(); /** * Holds column widths in pixels for visible columns (by propertyId). */ - private final HashMap columnWidths = new HashMap<>(); + private final HashMap columnWidths = new HashMap(); /** * Holds column expand rations for visible columns (by propertyId). */ - private final HashMap columnExpandRatios = new HashMap<>(); + private final HashMap columnExpandRatios = new HashMap(); /** * Holds column generators */ - private final HashMap columnGenerators = new LinkedHashMap<>(); + private final HashMap columnGenerators = new LinkedHashMap(); /** * Holds value of property pageLength. 0 disables paging. @@ -592,11 +592,11 @@ public class Table extends AbstractSelect implements Action.Container, private RowGenerator rowGenerator = null; - private final Map, Property> associatedProperties = new HashMap<>(); + private final Map, Property> associatedProperties = new HashMap, Property>(); private boolean painted = false; - private HashMap> propertyValueConverters = new HashMap<>(); + private HashMap> propertyValueConverters = new HashMap>(); /** * Set to true if the client-side should be informed that the key mapper has @@ -605,7 +605,7 @@ public class Table extends AbstractSelect implements Action.Container, */ private boolean keyMapperReset; - private List exceptionsDuringCachePopulation = new ArrayList<>(); + private List exceptionsDuringCachePopulation = new ArrayList(); private boolean isBeingPainted; @@ -689,7 +689,7 @@ public class Table extends AbstractSelect implements Action.Container, "Can not set visible columns to null value"); } - final LinkedList newVC = new LinkedList<>(); + final LinkedList newVC = new LinkedList(); // Checks that the new visible columns contains no nulls, properties // exist and that there are no duplicates before adding them to newVC. @@ -894,7 +894,7 @@ public class Table extends AbstractSelect implements Action.Container, } // Resets the alignments - final HashMap newCA = new HashMap<>(); + final HashMap newCA = new HashMap(); int i = 0; for (final Iterator it = visibleColumns.iterator(); it.hasNext() && i < columnAlignments.length; i++) { @@ -1471,7 +1471,7 @@ public class Table extends AbstractSelect implements Action.Container, if (columnOrder == null || !isColumnReorderingAllowed()) { return; } - final LinkedList newOrder = new LinkedList<>(); + final LinkedList newOrder = new LinkedList(); for (int i = 0; i < columnOrder.length; i++) { if (columnOrder[i] != null && visibleColumns.contains(columnOrder[i])) { @@ -2202,8 +2202,8 @@ public class Table extends AbstractSelect implements Action.Container, if (replaceListeners) { // initialize the listener collections, this should only be done if // the entire cache is refreshed (through refreshRenderedCells) - listenedProperties = new HashSet<>(); - visibleComponents = new HashSet<>(); + listenedProperties = new HashSet>(); + visibleComponents = new HashSet(); } Object[][] cells = new Object[cols + CELL_FIRSTCOL][rows]; @@ -2644,7 +2644,7 @@ public class Table extends AbstractSelect implements Action.Container, throws UnsupportedOperationException { // remove generated columns from the list of columns being assigned - final LinkedList availableCols = new LinkedList<>(); + final LinkedList availableCols = new LinkedList(); for (Iterator it = visibleColumns.iterator(); it.hasNext();) { Object id = it.next(); if (!columnGenerators.containsKey(id)) { @@ -2735,7 +2735,7 @@ public class Table extends AbstractSelect implements Action.Container, } else { generated = Collections.emptyList(); } - List visibleIds = new ArrayList<>(); + List visibleIds = new ArrayList(); if (generated.isEmpty()) { visibleIds.addAll(newDataSource.getContainerPropertyIds()); } else { @@ -2777,7 +2777,7 @@ public class Table extends AbstractSelect implements Action.Container, newDataSource = new IndexedContainer(); } if (visibleIds == null) { - visibleIds = new ArrayList<>(); + visibleIds = new ArrayList(); } // Retain propertyValueConverters if their corresponding ids are @@ -2786,7 +2786,7 @@ public class Table extends AbstractSelect implements Action.Container, if (propertyValueConverters != null) { Collection newPropertyIds = newDataSource .getContainerPropertyIds(); - LinkedList retainableValueConverters = new LinkedList<>(); + LinkedList retainableValueConverters = new LinkedList(); for (Object propertyId : newPropertyIds) { Converter converter = getConverter(propertyId); if (converter != null) { @@ -2819,7 +2819,7 @@ public class Table extends AbstractSelect implements Action.Container, } // don't add the same id twice - Collection col = new LinkedList<>(); + Collection col = new LinkedList(); for (Iterator it = visibleIds.iterator(); it.hasNext();) { Object id = it.next(); if (!col.contains(id)) { @@ -2860,7 +2860,7 @@ public class Table extends AbstractSelect implements Action.Container, */ private LinkedHashSet getItemIdsInRange(Object itemId, final int length) { - LinkedHashSet ids = new LinkedHashSet<>(); + LinkedHashSet ids = new LinkedHashSet(); for (int i = 0; i < length; i++) { assert itemId != null; // should not be null unless client-server // are out of sync @@ -2883,7 +2883,7 @@ public class Table extends AbstractSelect implements Action.Container, Set renderedButNotSelectedItemIds = getCurrentlyRenderedItemIds(); @SuppressWarnings("unchecked") - HashSet newValue = new LinkedHashSet<>( + HashSet newValue = new LinkedHashSet( (Collection) getValue()); if (variables.containsKey("clearSelections")) { @@ -2938,7 +2938,7 @@ public class Table extends AbstractSelect implements Action.Container, } private Set getCurrentlyRenderedItemIds() { - HashSet ids = new HashSet<>(); + HashSet ids = new HashSet(); if (pageBuffer != null) { for (int i = 0; i < pageBuffer[CELL_ITEMID].length; i++) { ids.add(pageBuffer[CELL_ITEMID][i]); @@ -2971,7 +2971,7 @@ public class Table extends AbstractSelect implements Action.Container, if (!isSelectable() && variables.containsKey("selected")) { // Not-selectable is a special case, AbstractSelect does not support // TODO could be optimized. - variables = new HashMap<>(variables); + variables = new HashMap(variables); variables.remove("selected"); } @@ -2983,7 +2983,7 @@ public class Table extends AbstractSelect implements Action.Container, && variables.containsKey("selected") && multiSelectMode == MultiSelectMode.DEFAULT) { handleSelectedItems(variables); - variables = new HashMap<>(variables); + variables = new HashMap(variables); variables.remove("selected"); } @@ -3082,7 +3082,7 @@ public class Table extends AbstractSelect implements Action.Container, try { final Object[] ids = (Object[]) variables .get("collapsedcolumns"); - Set idSet = new HashSet<>(); + Set idSet = new HashSet(); for (Object id : ids) { idSet.add(columnIdMap.get(id.toString())); } @@ -3648,7 +3648,7 @@ public class Table extends AbstractSelect implements Action.Container, private void paintAvailableColumns(PaintTarget target) throws PaintException { if (columnCollapsingAllowed) { - final HashSet collapsedCols = new HashSet<>(); + final HashSet collapsedCols = new HashSet(); for (Object colId : visibleColumns) { if (isColumnCollapsed(colId)) { collapsedCols.add(colId); @@ -3772,7 +3772,7 @@ public class Table extends AbstractSelect implements Action.Container, private void paintVisibleColumnOrder(PaintTarget target) { // Visible column order - final ArrayList visibleColOrder = new ArrayList<>(); + final ArrayList visibleColOrder = new ArrayList(); for (Object columnId : visibleColumns) { if (!isColumnCollapsed(columnId)) { visibleColOrder.add(columnIdMap.key(columnId)); @@ -3782,9 +3782,9 @@ public class Table extends AbstractSelect implements Action.Container, } private Set findAndPaintBodyActions(PaintTarget target) { - Set actionSet = new LinkedHashSet<>(); + Set actionSet = new LinkedHashSet(); if (actionHandlers != null) { - final ArrayList keys = new ArrayList<>(); + final ArrayList keys = new ArrayList(); for (Handler ah : actionHandlers) { // Getting actions for the null item, which in this case means // the body item @@ -3846,7 +3846,7 @@ public class Table extends AbstractSelect implements Action.Container, } private String[] findSelectedKeys() { - LinkedList selectedKeys = new LinkedList<>(); + LinkedList selectedKeys = new LinkedList(); if (isMultiSelect()) { HashSet sel = new HashSet((Set) getValue()); Collection vids = getVisibleItemIds(); @@ -4002,7 +4002,7 @@ public class Table extends AbstractSelect implements Action.Container, // Actions if (actionHandlers != null) { - final ArrayList keys = new ArrayList<>(); + final ArrayList keys = new ArrayList(); for (Handler ah : actionHandlers) { final Action[] aa = ah.getActions(itemId, this); if (aa != null) { @@ -4197,8 +4197,8 @@ public class Table extends AbstractSelect implements Action.Container, if (actionHandler != null) { if (actionHandlers == null) { - actionHandlers = new LinkedList<>(); - actionMapper = new KeyMapper<>(); + actionHandlers = new LinkedList(); + actionMapper = new KeyMapper(); } if (!actionHandlers.contains(actionHandler)) { @@ -4534,7 +4534,7 @@ public class Table extends AbstractSelect implements Action.Container, @Override public Collection getVisibleItemIds() { - final LinkedList visible = new LinkedList<>(); + final LinkedList visible = new LinkedList(); final Object[][] cells = getVisibleCells(); // may be null if the table has not been rendered yet (e.g. not attached @@ -4616,7 +4616,8 @@ public class Table extends AbstractSelect implements Action.Container, Collection containerPropertyIds = getContainerDataSource() .getContainerPropertyIds(); - LinkedList newVisibleColumns = new LinkedList<>(visibleColumns); + LinkedList newVisibleColumns = new LinkedList( + visibleColumns); for (Iterator iterator = newVisibleColumns.iterator(); iterator .hasNext();) { Object id = iterator.next(); @@ -6179,7 +6180,7 @@ public class Table extends AbstractSelect implements Action.Container, if (colgroup != null) { int i = 0; - List pIds = new ArrayList<>(); + List pIds = new ArrayList(); for (Element col : colgroup.children()) { if (!col.tagName().equals("col")) { throw new DesignException("invalid column"); @@ -6281,7 +6282,7 @@ public class Table extends AbstractSelect implements Action.Container, return; } - Set selected = new HashSet<>(); + Set selected = new HashSet(); for (Element tr : tbody.children()) { readItem(tr, selected, context); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java index 094dd1d5e4..67da52df51 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java @@ -122,12 +122,12 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Item icons alt texts. */ - private final HashMap itemIconAlts = new HashMap<>(); + private final HashMap itemIconAlts = new HashMap(); /** * Set of expanded nodes. */ - private HashSet expanded = new HashSet<>(); + private HashSet expanded = new HashSet(); /** * List of action handlers. @@ -375,7 +375,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, boolean result = true; // Initial stack - final Stack todo = new Stack<>(); + final Stack todo = new Stack(); todo.add(startItemId); // Expands recursively @@ -428,7 +428,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, boolean result = true; // Initial stack - final Stack todo = new Stack<>(); + final Stack todo = new Stack(); todo.add(startItemId); // Collapse recursively @@ -522,7 +522,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, if (!isSelectable() && variables.containsKey("selected")) { // Not-selectable is a special case, AbstractSelect does not support // TODO could be optimized. - variables = new HashMap<>(variables); + variables = new HashMap(variables); variables.remove("selected"); } @@ -561,7 +561,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, if (variables.containsKey("selected") && isMultiSelect() && multiSelectMode == MultiSelectMode.DEFAULT) { handleSelectedItems(variables); - variables = new HashMap<>(variables); + variables = new HashMap(variables); variables.remove("selected"); } @@ -595,7 +595,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, final String[] ka = (String[]) variables.get("selected"); // Converts the key-array to id-set - final LinkedList s = new LinkedList<>(); + final LinkedList s = new LinkedList(); for (int i = 0; i < ka.length; i++) { final Object id = itemIdMapper.get(ka[i]); if (!isNullSelectionAllowed() @@ -666,15 +666,15 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } // Initialize variables - final Set actionSet = new LinkedHashSet<>(); + final Set actionSet = new LinkedHashSet(); // rendered selectedKeys - LinkedList selectedKeys = new LinkedList<>(); + LinkedList selectedKeys = new LinkedList(); - final LinkedList expandedKeys = new LinkedList<>(); + final LinkedList expandedKeys = new LinkedList(); // Iterates through hierarchical tree using a stack of iterators - final Stack> iteratorStack = new Stack<>(); + final Stack> iteratorStack = new Stack>(); Collection ids; if (partialUpdate) { ids = getChildren(expandedItemId); @@ -691,7 +691,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * by right clicking on the Tree body */ if (actionHandlers != null) { - final ArrayList keys = new ArrayList<>(); + final ArrayList keys = new ArrayList(); for (Handler ah : actionHandlers) { // Getting action for the null item, which in this case @@ -780,7 +780,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, // Actions if (actionHandlers != null) { - final ArrayList keys = new ArrayList<>(); + final ArrayList keys = new ArrayList(); final Iterator ahi = actionHandlers .iterator(); while (ahi.hasNext()) { @@ -1242,8 +1242,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, if (actionHandler != null) { if (actionHandlers == null) { - actionHandlers = new LinkedList<>(); - actionMapper = new KeyMapper<>(); + actionHandlers = new LinkedList(); + actionMapper = new KeyMapper(); } if (!actionHandlers.contains(actionHandler)) { @@ -1291,10 +1291,10 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, @Override public Collection getVisibleItemIds() { - final LinkedList visible = new LinkedList<>(); + final LinkedList visible = new LinkedList(); // Iterates trough hierarchical tree using a stack of iterators - final Stack> iteratorStack = new Stack<>(); + final Stack> iteratorStack = new Stack>(); final Collection ids = rootItemIds(); if (ids != null) { iteratorStack.push(ids.iterator()); @@ -1844,7 +1844,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } private void cleanupExpandedItems() { - Set removedItemIds = new HashSet<>(); + Set removedItemIds = new HashSet(); for (Object expandedItemId : expanded) { if (getItem(expandedItemId) == null) { removedItemIds.add(expandedItemId); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java index e2fc9c28bf..8efdbed66c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java @@ -199,7 +199,7 @@ public class TreeTable extends Table implements Hierarchical { */ private class HierarchicalStrategy extends AbstractStrategy { - private final HashSet openItems = new HashSet<>(); + private final HashSet openItems = new HashSet(); @Override public boolean isNodeOpen(Object itemId) { @@ -286,7 +286,7 @@ public class TreeTable extends Table implements Hierarchical { */ private List getPreOrder() { if (preOrder == null) { - preOrder = new ArrayList<>(); + preOrder = new ArrayList(); Collection rootItemIds = getContainerDataSource() .rootItemIds(); for (Object id : rootItemIds) { @@ -896,7 +896,7 @@ public class TreeTable extends Table implements Hierarchical { @Override protected List getItemIds(int firstIndex, int rows) { - List itemIds = new ArrayList<>(); + List itemIds = new ArrayList(); for (int i = firstIndex; i < firstIndex + rows; i++) { itemIds.add(getIdByIndex(i)); } @@ -910,8 +910,8 @@ public class TreeTable extends Table implements Hierarchical { return; } - Set selected = new HashSet<>(); - Stack parents = new Stack<>(); + Set selected = new HashSet(); + Stack parents = new Stack(); int lastDepth = -1; for (Element tr : tbody.children()) { diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java index a1f987b55e..cf855b6868 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java @@ -802,7 +802,7 @@ public class Upload extends AbstractLegacyComponent */ public void addProgressListener(ProgressListener listener) { if (progressListeners == null) { - progressListeners = new LinkedHashSet<>(); + progressListeners = new LinkedHashSet(); } progressListeners.add(listener); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java index 4f15272eb0..d00439cbb8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java @@ -37,7 +37,6 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEditableEventProvider; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier; -import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier; /** @@ -85,14 +84,14 @@ public class ContainerEventProvider /** * Listeners attached to the container */ - private final List eventSetChangeListeners = new LinkedList<>(); - private final List eventChangeListeners = new LinkedList<>(); + private final List eventSetChangeListeners = new LinkedList(); + private final List eventChangeListeners = new LinkedList(); /** * The event cache contains the events previously created by * {@link #getEvents(Date, Date)} */ - private final List eventCache = new LinkedList<>(); + private final List eventCache = new LinkedList(); /** * The container used as datasource diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java index 3f899debd7..114e696058 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java @@ -38,7 +38,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier { private Date end; private Date start; private String styleName; - private transient List listeners = new ArrayList<>(); + private transient List listeners = new ArrayList(); private boolean isAllDay; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java index 2fa32f93e3..99383c165c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java @@ -46,9 +46,9 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSet public class BasicEventProvider implements CalendarEditableEventProvider, EventSetChangeNotifier, CalendarEvent.EventChangeListener { - protected List eventList = new ArrayList<>(); + protected List eventList = new ArrayList(); - private List listeners = new ArrayList<>(); + private List listeners = new ArrayList(); /* * (non-Javadoc) @@ -59,7 +59,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider, */ @Override public List getEvents(Date startDate, Date endDate) { - ArrayList activeEvents = new ArrayList<>(); + ArrayList activeEvents = new ArrayList(); for (CalendarEvent ev : eventList) { long from = startDate.getTime(); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java index 2278bde171..5ba0f2893e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -27,12 +27,12 @@ import com.vaadin.v7.shared.ui.colorpicker.ColorPickerGridState; /** * A component that represents a color selection grid within a color picker. - * + * * @since 7.0.0 */ @Deprecated -public class ColorPickerGrid extends AbstractComponent implements - ColorSelector { +public class ColorPickerGrid extends AbstractComponent + implements ColorSelector { private static final String STYLENAME = "v-colorpicker-grid"; @@ -86,7 +86,7 @@ public class ColorPickerGrid extends AbstractComponent implements private Color[][] colorGrid = new Color[1][1]; /** The changed colors. */ - private final Map changedColors = new HashMap<>(); + private final Map changedColors = new HashMap(); /** * Instantiates a new color picker grid. @@ -100,7 +100,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Instantiates a new color picker grid. - * + * * @param rows * the rows * @param columns @@ -115,7 +115,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Instantiates a new color picker grid. - * + * * @param colors * the colors */ @@ -164,7 +164,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Sets the color grid. - * + * * @param colors * the new color grid */ @@ -185,7 +185,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Adds a color change listener - * + * * @param listener * The color change listener */ @@ -201,7 +201,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Removes a color change listener - * + * * @param listener * The listener */ @@ -220,7 +220,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Sets the position. - * + * * @param x * the x * @param y @@ -235,7 +235,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Gets the position. - * + * * @return the position */ public int[] getPosition() { @@ -244,7 +244,7 @@ public class ColorPickerGrid extends AbstractComponent implements /** * Notifies the listeners that a color change has occurred - * + * * @param color * The color which it changed to */ diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java index 111800b94f..40c0190ac6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -28,12 +28,12 @@ import com.vaadin.v7.shared.ui.colorpicker.Color; /** * A component that represents color selection history within a color picker. - * + * * @since 7.0.0 */ @Deprecated -public class ColorPickerHistory extends CustomComponent implements - ColorSelector, ColorChangeListener { +public class ColorPickerHistory extends CustomComponent + implements ColorSelector, ColorChangeListener { private static final String STYLENAME = "v-colorpicker-history"; @@ -56,7 +56,7 @@ public class ColorPickerHistory extends CustomComponent implements private static final int columns = 15; /** Temporary color history for when the component is detached. */ - private ArrayBlockingQueue tempHistory = new ArrayBlockingQueue<>( + private ArrayBlockingQueue tempHistory = new ArrayBlockingQueue( rows * columns); /** The grid. */ @@ -83,7 +83,7 @@ public class ColorPickerHistory extends CustomComponent implements } private void createColorHistoryIfNecessary() { - List tempColors = new ArrayList<>(tempHistory); + List tempColors = new ArrayList(tempHistory); if (getSession().getAttribute("colorPickerHistory") == null) { getSession().setAttribute("colorPickerHistory", new ArrayBlockingQueue(rows * columns)); @@ -97,8 +97,8 @@ public class ColorPickerHistory extends CustomComponent implements @SuppressWarnings("unchecked") private ArrayBlockingQueue getColorHistory() { if (isAttached()) { - Object colorHistory = getSession().getAttribute( - "colorPickerHistory"); + Object colorHistory = getSession() + .getAttribute("colorPickerHistory"); if (colorHistory instanceof ArrayBlockingQueue) { return (ArrayBlockingQueue) colorHistory; } @@ -135,7 +135,7 @@ public class ColorPickerHistory extends CustomComponent implements } } - List colorList = new ArrayList<>(colorHistory); + List colorList = new ArrayList(colorHistory); // Invert order of colors Collections.reverse(colorList); @@ -168,7 +168,7 @@ public class ColorPickerHistory extends CustomComponent implements /** * Gets the history. - * + * * @return the history */ public List getHistory() { @@ -179,10 +179,10 @@ public class ColorPickerHistory extends CustomComponent implements /** * Checks if the history contains given color. - * + * * @param c * the color - * + * * @return true, if successful */ public boolean hasColor(Color c) { @@ -191,7 +191,7 @@ public class ColorPickerHistory extends CustomComponent implements /** * Adds a color change listener - * + * * @param listener * The listener */ @@ -202,7 +202,7 @@ public class ColorPickerHistory extends CustomComponent implements /** * Removes a color change listener - * + * * @param listener * The listener */ diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java index a6f35fa6f9..ff5334ea83 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java @@ -133,7 +133,7 @@ public class ColorPickerPopup extends Window private ColorPickerSelect colorSelect; /** The selectors. */ - private final Set selectors = new HashSet<>(); + private final Set selectors = new HashSet(); /** * Set true while the slider values are updated after colorChange. When @@ -211,7 +211,7 @@ public class ColorPickerPopup extends Window history.setHeight("22px"); // Create the default colors - List defaultColors = new ArrayList<>(); + List defaultColors = new ArrayList(); defaultColors.add(Color.BLACK); defaultColors.add(Color.WHITE); -- cgit v1.2.3