From 85811b64468e9b7a876bd352a0299b904a53a3fb Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:16:23 +0000
Subject: [PATCH] Fix for Issue #615. Add support for multiple object-class inheritance. Support added in the schema, core server and tools including Control-Panel
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
index 23b87e8..6303404 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
+++ b/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();
}
}
--
Gitblit v1.10.0