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/SelectAliasDialog.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
index 247da0b..ee0b585 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installer.ui;
@@ -58,7 +58,7 @@
{
private JButton okButton;
private JComboBox comboAliases;
- private boolean isCancelled;
+ private boolean isCanceled;
private static final long serialVersionUID = -8140704273612764046L;
@@ -103,7 +103,7 @@
throw new IllegalArgumentException(
"The provided aliases are null or empty.");
}
- isCancelled = true;
+ isCanceled = true;
TreeSet<String> s = new TreeSet<String>();
for (int i=0; i<aliases.length; i++)
{
@@ -122,9 +122,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;
}
/**
@@ -231,7 +231,7 @@
*/
private void cancelClicked()
{
- isCancelled = true;
+ isCanceled = true;
dispose();
}
@@ -241,7 +241,7 @@
*/
private void okClicked()
{
- isCancelled = false;
+ isCanceled = false;
dispose();
}
--
Gitblit v1.10.0