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/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java b/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
index 3e07e4c..4e93d65 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
@@ -96,7 +96,7 @@
   private JButton cancelButton;
   private JButton okButton;
 
-  private boolean isCancelled = true;
+  private boolean isCanceled = true;
 
   private ApplicationTrustManager trustManager;
   private int timeout;
@@ -144,9 +144,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;
   }
 
   /**
@@ -372,7 +372,7 @@
    */
   private void cancelClicked()
   {
-    isCancelled = true;
+    isCanceled = true;
     dispose();
   }
 
@@ -588,7 +588,7 @@
           UIFactory.setTextStyle(lPwd,
               UIFactory.TextStyle.PRIMARY_FIELD_VALID);
 
-          isCancelled = false;
+          isCanceled = false;
           cancelButton.setEnabled(true);
           okButton.setEnabled(true);
           dispose();

--
Gitblit v1.10.0