diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2017-02-24 17:06:58 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-03-07 15:43:00 +0200 |
| commit | 23cd4be7547f9988aa4529643f05fa3e92a95c2d (patch) | |
| tree | 83b369758ceda6870df494e85bf910c748a4a10f /compatibility-shared | |
| parent | c07c99184bc5aef5b565eca27fa3a03fae5c6afa (diff) | |
| download | vaadin-framework-23cd4be7547f9988aa4529643f05fa3e92a95c2d.tar.gz vaadin-framework-23cd4be7547f9988aa4529643f05fa3e92a95c2d.zip | |
Revert diamond operator changes
Diffstat (limited to 'compatibility-shared')
| -rw-r--r-- | compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java | 4 | ||||
| -rw-r--r-- | compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/GridState.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java index 155c43b5a6..fc457b4ff9 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/Resolution.java @@ -56,7 +56,7 @@ public enum Resolution { */ public static Iterable<Resolution> getResolutionsHigherOrEqualTo( Resolution r) { - List<Resolution> resolutions = new ArrayList<>(); + List<Resolution> resolutions = new ArrayList<Resolution>(); Resolution[] values = Resolution.values(); for (int i = r.ordinal(); i < values.length; i++) { resolutions.add(values[i]); @@ -74,7 +74,7 @@ public enum Resolution { * @return An iterable for the resolutions lower than r */ public static List<Resolution> getResolutionsLowerThan(Resolution r) { - List<Resolution> resolutions = new ArrayList<>(); + List<Resolution> resolutions = new ArrayList<Resolution>(); Resolution[] values = Resolution.values(); for (int i = r.ordinal() - 1; i >= 0; i--) { resolutions.add(values[i]); diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/GridState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/GridState.java index 577d177d6a..c333ed0d55 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/grid/GridState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/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; @@ -151,12 +151,12 @@ public class GridState extends TabIndexState { /** * Columns in grid. */ - public List<GridColumnState> columns = new ArrayList<>(); + public List<GridColumnState> columns = new ArrayList<GridColumnState>(); /** * Column order in grid. */ - public List<String> columnOrder = new ArrayList<>(); + public List<String> columnOrder = new ArrayList<String>(); public GridStaticSectionState header = new GridStaticSectionState(); |