From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
index 1160af4..76a6b57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.components;
@@ -181,12 +181,12 @@
notifyNewEvent(macEvent, NewEventType.MOUSE_PRESSED);
}
- if (ev.isPopupTrigger() && (popupMenu != null)) {
- if ((getPathForLocation(ev.getPoint().x, ev.getPoint().y) != null) ||
- (newEvent != null))
- {
- popupMenu.show(ev.getComponent(), ev.getX(), ev.getY());
- }
+ if (ev.isPopupTrigger()
+ && popupMenu != null
+ && (getPathForLocation(ev.getPoint().x, ev.getPoint().y) != null
+ || newEvent != null))
+ {
+ popupMenu.show(ev.getComponent(), ev.getX(), ev.getY());
}
if (newEvent != null)
{
@@ -204,13 +204,13 @@
return;
}
MouseEvent newEvent = getTranslatedEvent(ev);
- if (ev.isPopupTrigger() && (popupMenu != null) &&
- !popupMenu.isVisible()) {
- if ((getPathForLocation(ev.getPoint().x, ev.getPoint().y) != null) ||
- (newEvent != null))
- {
- popupMenu.show(ev.getComponent(), ev.getX(), ev.getY());
- }
+ if (ev.isPopupTrigger()
+ && popupMenu != null
+ && !popupMenu.isVisible()
+ && (getPathForLocation(ev.getPoint().x, ev.getPoint().y) != null
+ || newEvent != null))
+ {
+ popupMenu.show(ev.getComponent(), ev.getX(), ev.getY());
}
if (newEvent != null)
--
Gitblit v1.10.0