Fix for Issue #615. Add support for multiple object-class inheritance. Supp...

ludovicp

31.16.2010 bb6e844a9964c9e36c12c653dc41ac162d1e1a58

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java

@@ -95,7 +95,7 @@

  private SelectAliasDialog aliasDlg;

  private boolean isCancelled = true;
  private boolean isCanceled = true;

  private SecurityOptions securityOptions;

@@ -147,9 +147,9 @@
   * @return <CODE>true</CODE> if the user clicked on cancel and
   * <CODE>false</CODE> otherwise.
   */
  public boolean isCancelled()
  public boolean isCanceled()
  {
    return isCancelled;
    return isCanceled;
  }

  /**
@@ -174,7 +174,7 @@
    securityOptions = options;
    updateContents();

    isCancelled = true;
    isCanceled = true;

    setVisible(true);
  }
@@ -653,7 +653,7 @@
   */
  private void cancelClicked()
  {
    isCancelled = true;
    isCanceled = true;
    dispose();
  }

@@ -710,7 +710,7 @@
              if (!certificateHasAlias)
              {
                selectedAlias = null;
                isCancelled = false;
                isCanceled = false;
                dispose();
              }
              else if (aliases.length > 1)
@@ -721,23 +721,23 @@
                }
                aliasDlg.display(aliases);

                if (!aliasDlg.isCancelled())
                if (!aliasDlg.isCanceled())
                {
                  selectedAlias = aliasDlg.getSelectedAlias();
                  isCancelled = false;
                  isCanceled = false;
                  dispose();
                }
              }
              else
              {
                selectedAlias = aliases[0];
                isCancelled = false;
                isCanceled = false;
                dispose();
              }
            }
            else
            {
              isCancelled = false;
              isCanceled = false;
              dispose();
            }
          }