From f42e0cc6f2c8623d3acb0033222cd6360e5f521a Mon Sep 17 00:00:00 2001 From: Ahmed Ashour Date: Fri, 13 Oct 2017 15:11:49 +0200 Subject: Fix some checkstyle warnings (#10179) --- client/src/main/java/com/vaadin/client/ui/VContextMenu.java | 9 +++------ client/src/main/java/com/vaadin/client/ui/VMenuBar.java | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'client/src') diff --git a/client/src/main/java/com/vaadin/client/ui/VContextMenu.java b/client/src/main/java/com/vaadin/client/ui/VContextMenu.java index fec956270e..d9feb6193f 100644 --- a/client/src/main/java/com/vaadin/client/ui/VContextMenu.java +++ b/client/src/main/java/com/vaadin/client/ui/VContextMenu.java @@ -293,12 +293,9 @@ public class VContextMenu extends VOverlay implements SubPartAware { com.google.gwt.user.client.Element subElement) { if (getElement().isOrHasChild(subElement)) { com.google.gwt.dom.client.Element e = subElement; - { - while (e != null - && !e.getTagName().toLowerCase().equals("tr")) { - e = e.getParentElement(); - // ApplicationConnection.getConsole().log("Found row"); - } + while (e != null && !e.getTagName().toLowerCase().equals("tr")) { + e = e.getParentElement(); + // ApplicationConnection.getConsole().log("Found row"); } com.google.gwt.dom.client.TableSectionElement parentElement = (TableSectionElement) e .getParentElement(); diff --git a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java index 432f44fe05..293206760d 100644 --- a/client/src/main/java/com/vaadin/client/ui/VMenuBar.java +++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java @@ -697,8 +697,7 @@ public class VMenuBar extends SimpleFocusablePanel * @param item */ public void hideChildMenu(CustomMenuItem item) { - if (visibleChildMenu != null - && !(visibleChildMenu == item.getSubMenu())) { + if (visibleChildMenu != null && visibleChildMenu != item.getSubMenu()) { popup.hide(); } } -- cgit v1.2.3