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/GenericDialog.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
index 2e7373d..2033db1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
@@ -187,16 +187,16 @@
for (int i=0; i < container.getComponentCount(); i++)
{
Component comp = container.getComponent(i);
- if ((comp instanceof AbstractButton) ||
- (comp instanceof JTextComponent) ||
- (comp instanceof JList) ||
- (comp instanceof JComboBox) ||
- (comp instanceof JTable))
+ if (comp instanceof AbstractButton ||
+ comp instanceof JTextComponent ||
+ comp instanceof JList ||
+ comp instanceof JComboBox ||
+ comp instanceof JTable)
{
comp.addFocusListener(focusListener);
}
- else if ((comp instanceof JPanel) || (comp instanceof JScrollPane)
- || (comp instanceof JViewport))
+ else if (comp instanceof JPanel || comp instanceof JScrollPane
+ || comp instanceof JViewport)
{
addFocusListener(focusListener, (Container)comp);
}
@@ -210,8 +210,7 @@
{
lastComponentWithFocus = panel.getPreferredFocusComponent();
}
- if (visible && (lastComponentWithFocus != null) &&
- lastComponentWithFocus.isVisible())
+ if (visible && lastComponentWithFocus != null && lastComponentWithFocus.isVisible())
{
if (lastComponentWithFocus == null)
{
--
Gitblit v1.10.0