summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorAhmed Ashour <asashour@yahoo.com>2017-10-13 15:11:49 +0200
committerTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-10-13 16:11:49 +0300
commitf42e0cc6f2c8623d3acb0033222cd6360e5f521a (patch)
tree264dd788ca94754373c50b1d41fb9536b55ab757 /client
parente651d542cbef31cfc09786e1978e33915cb68a27 (diff)
downloadvaadin-framework-f42e0cc6f2c8623d3acb0033222cd6360e5f521a.tar.gz
vaadin-framework-f42e0cc6f2c8623d3acb0033222cd6360e5f521a.zip
Fix some checkstyle warnings (#10179)
Diffstat (limited to 'client')
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VContextMenu.java9
-rw-r--r--client/src/main/java/com/vaadin/client/ui/VMenuBar.java3
2 files changed, 4 insertions, 8 deletions
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();
}
}