diff options
5 files changed, 6 insertions, 6 deletions
diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java index 84ee3c2334..fd30d2891d 100644 --- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java @@ -276,7 +276,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { BootstrapContext context = new BootstrapContext(response, new BootstrapFragmentResponse(this, request, session, - uiClass, new ArrayList<Node>(), provider)); + uiClass, new ArrayList<>(), provider)); setupMainDiv(context); diff --git a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java index 54ab672589..e68fbb5903 100644 --- a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java +++ b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java @@ -716,7 +716,7 @@ public class ComponentSizeValidator implements Serializable { public static List<InvalidLayout> validateLayouts(UI ui) { List<InvalidLayout> invalidRelativeSizes = ComponentSizeValidator .validateComponentRelativeSizes(ui.getContent(), - new ArrayList<ComponentSizeValidator.InvalidLayout>(), + new ArrayList<>(), null); // Also check any existing subwindows diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java index 08ca2cb2b3..a634e47cf3 100644 --- a/server/src/main/java/com/vaadin/ui/GridLayout.java +++ b/server/src/main/java/com/vaadin/ui/GridLayout.java @@ -1281,7 +1281,7 @@ public class GridLayout extends AbstractLayout for (Element e : design.children()) { if (e.tagName().equalsIgnoreCase("row")) { rowElements.add(e); - rows.add(new HashMap<Integer, Component>()); + rows.add(new HashMap<>()); } } @@ -1333,7 +1333,7 @@ public class GridLayout extends AbstractLayout + colspan; ++colIndex) { if (rowIndex == rows.size()) { // Rowspan with not enough rows. Fix by adding rows. - rows.add(new HashMap<Integer, Component>()); + rows.add(new HashMap<>()); } rows.get(rowIndex).put(colIndex + skippedColumns, child); 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 87cdae84af..18287d7f90 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java @@ -136,7 +136,7 @@ public abstract class ClickableRenderer<T, V> extends AbstractRenderer<T, V> { T item = grid.getDataCommunicator().getKeyMapper().get(rowKey); Column column = grid.getColumn(columnId); - fireEvent(new RendererClickEvent<T>(grid, item, column, + fireEvent(new RendererClickEvent<>(grid, item, column, mouseDetails)); } }); diff --git a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java index e488c2f964..5752929f97 100644 --- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java @@ -124,7 +124,7 @@ public abstract class DeclarativeTestBase<T extends Component> System.out.println("No comparator found for " + c.getName() + ". Using introspector."); } - return new IntrospectorEqualsAsserter<T>(c); + return new IntrospectorEqualsAsserter<>(c); } return comp; } |