From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 122c67c..70f6879 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
@@ -151,7 +151,7 @@
MouseEvent newEvent = getTranslatedEvent(ev);
if (isMacOS() && ev.isPopupTrigger() &&
- (ev.getButton() != MouseEvent.BUTTON1))
+ ev.getButton() != MouseEvent.BUTTON1)
{
MouseEvent baseEvent = ev;
if (newEvent != null)
@@ -159,8 +159,8 @@
baseEvent = newEvent;
}
int mods = baseEvent.getModifiersEx();
- mods &= (InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK |
- InputEvent.SHIFT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK);
+ mods &= InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK |
+ InputEvent.SHIFT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK;
mods |= InputEvent.BUTTON1_DOWN_MASK;
final MouseEvent macEvent = new MouseEvent(
baseEvent.getComponent(),
@@ -266,8 +266,8 @@
Rectangle r = getPathBounds(path);
if (r != null)
{
- int newX = r.x + (r.width / 2);
- int newY = r.y + (r.height / 2);
+ int newX = r.x + r.width / 2;
+ int newY = r.y + r.height / 2;
// Simulate an event
newEvent = new MouseEvent(
ev.getComponent(),
@@ -318,8 +318,8 @@
{
Rectangle pathBounds = getPathBounds(closestPath);
if (pathBounds != null &&
- x >= pathBounds.x && x < (getX() + getWidth()) &&
- y >= pathBounds.y && y < (pathBounds.y + pathBounds.height))
+ x >= pathBounds.x && x < getX() + getWidth() &&
+ y >= pathBounds.y && y < pathBounds.y + pathBounds.height)
{
path = closestPath;
}
--
Gitblit v1.10.0