AutoRefactor'ed simplify expressions

Jean-Noel Rouvignac

16.57.2015 a41662c1136b2bb4a4198df89e0e87d2be3ef099

 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)
      {