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/controlpanel/ui/RefreshOptionsPanel.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
index 011d92d..a089f0e 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2009 Sun Microsystems, Inc.
+ *      Copyright 2009-2010 Sun Microsystems, Inc.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -51,7 +51,7 @@
   private JTextField period;
   private JLabel lPeriod;
 
-  private boolean isCancelled = true;
+  private boolean isCanceled = true;
 
   private int MAX_VALUE = 5000;
 
@@ -143,7 +143,7 @@
    */
   public void okClicked()
   {
-    isCancelled = true;
+    isCanceled = true;
 
     setPrimaryValid(lPeriod);
     LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
@@ -166,7 +166,7 @@
     }
     else
     {
-      isCancelled = false;
+      isCanceled = false;
       Utilities.getParentDialog(this).setVisible(false);
     }
   }
@@ -175,9 +175,9 @@
    * Returns whether this dialog has been cancelled or not.
    * @return whether this dialog has been cancelled or not.
    */
-  public boolean isCancelled()
+  public boolean isCanceled()
   {
-    return isCancelled;
+    return isCanceled;
   }
 
   /**
@@ -187,7 +187,7 @@
   {
     if (visible)
     {
-      isCancelled = true;
+      isCanceled = true;
       long timeInSeconds = getInfo().getPoolingPeriod() / 1000;
       period.setText(String.valueOf(timeInSeconds));
     }

--
Gitblit v1.10.0