AutoRefactor'ed simplify expressions

Jean-Noel Rouvignac

16.57.2015 a41662c1136b2bb4a4198df89e0e87d2be3ef099

 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java

@@ -755,7 +755,7 @@
    if (!Utils.isWebStart())
    {
      String javaHome = System.getProperty("java.home");
      if ((javaHome == null) || (javaHome.length() == 0))
      if (javaHome == null || javaHome.length() == 0)
      {
        javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
      }
@@ -912,21 +912,20 @@

  private boolean displayWebStartWarningIfRequired()
  {
    boolean returnValue = true;
    if (Utils.isWebStart() && !userAgreedWithWebStart)
    {
      JavaArguments args = getJavaArguments();
      if (!args.equals(javaArguments) &&
          ((args.getInitialMemory() != -1) ||
              (args.getMaxMemory() != -1) ||
              (args.getAdditionalArguments().length > 0)))
          (args.getInitialMemory() != -1 ||
              args.getMaxMemory() != -1 ||
              args.getAdditionalArguments().length > 0))
      {
        returnValue = displayConfirmationDialog(
        userAgreedWithWebStart = displayConfirmationDialog(
            INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART.get(),
            INFO_CONFIRMATION_TITLE.get());
        userAgreedWithWebStart = returnValue;
        return userAgreedWithWebStart;
      }
    }
    return returnValue;
    return true;
  }
}