From 157717b205d4c1f957cf810e04e06f11530c619c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 08:57:43 +0000
Subject: [PATCH] Renamed: - ChangeNumber to CSN - ChangeNumberGenerator to CSNGenerator - ChangeNumberTest to CSNTest - ChangeNumberGeneratorTest to CSNGeneratorTest

---
 opends/src/server/org/opends/server/replication/protocol/OperationContext.java |   51 +++++++++++++++++++++++++--------------------------
 1 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/protocol/OperationContext.java b/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
index 4185cf1..33a79bf 100644
--- a/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
+++ b/opends/src/server/org/opends/server/replication/protocol/OperationContext.java
@@ -23,11 +23,11 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2012 ForgeRock AS.
+ *      Portions copyright 2012-2013 ForgeRock AS
  */
 package org.opends.server.replication.protocol;
 
-import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.CSN;
 import org.opends.server.types.Operation;
 import org.opends.server.types.operation.PluginOperation;
 
@@ -43,9 +43,9 @@
   public static final String SYNCHROCONTEXT = "replicationContext";
 
   /**
-   * The change Number of the Operation.
+   * The CSN of the Operation.
    */
-  private ChangeNumber changeNumber;
+  private CSN csn;
 
   /**
    * The unique Id of the entry that was modified in the original operation.
@@ -54,23 +54,23 @@
 
   /**
    * Create a new OperationContext.
-   * @param changeNumber The change number of the operation.
+   * @param csn The CSN of the operation.
    * @param entryUUID The unique Identifier of the modified entry.
    */
-  protected OperationContext(ChangeNumber changeNumber, String entryUUID)
+  protected OperationContext(CSN csn, String entryUUID)
   {
-    this.changeNumber = changeNumber;
+    this.csn = csn;
     this.entryUUID = entryUUID;
   }
 
   /**
-   * Gets The change number of the Operation.
+   * Gets the CSN of the Operation.
    *
-   * @return The change number of the Operation.
+   * @return The CSN of the Operation.
    */
-  public ChangeNumber getChangeNumber()
+  public CSN getCSN()
   {
-    return changeNumber;
+    return csn;
   }
 
   /**
@@ -84,40 +84,40 @@
   }
 
   /**
-   * Get the change number of an operation.
+   * Get the CSN of an operation.
    *
    * @param  op The operation.
    *
-   * @return The change number of the provided operation, or null if there is
-   *         no change number associated with the operation.
+   * @return The CSN of the provided operation, or null if there is
+   *         no CSN associated with the operation.
    */
-  public static ChangeNumber getChangeNumber(Operation op)
+  public static CSN getCSN(Operation op)
   {
     OperationContext ctx = (OperationContext)op.getAttachment(SYNCHROCONTEXT);
     if (ctx == null)
     {
       return null;
     }
-    return ctx.changeNumber;
+    return ctx.csn;
   }
 
   /**
-   * Get the change number of an operation from the synchronization context
+   * Get the CSN of an operation from the synchronization context
    * attached to the provided operation.
    *
    * @param  op The operation.
    *
-   * @return The change number of the provided operation, or null if there is
-   *         no change number associated with the operation.
+   * @return The CSN of the provided operation, or null if there is
+   *         no CSN associated with the operation.
    */
-  public static ChangeNumber getChangeNumber(PluginOperation op)
+  public static CSN getCSN(PluginOperation op)
   {
     OperationContext ctx = (OperationContext)op.getAttachment(SYNCHROCONTEXT);
     if (ctx == null)
     {
       return null;
     }
-    return ctx.changeNumber;
+    return ctx.csn;
   }
 
   /**
@@ -129,11 +129,10 @@
     if (obj instanceof OperationContext)
     {
       OperationContext ctx = (OperationContext) obj;
-      return ((this.changeNumber.equals(ctx.getChangeNumber()) &&
-          (this.entryUUID.equals(ctx.getEntryUUID()))));
+      return this.csn.equals(ctx.getCSN())
+          && this.entryUUID.equals(ctx.getEntryUUID());
     }
-    else
-      return false;
+    return false;
   }
 
   /**
@@ -142,7 +141,7 @@
   @Override
   public int hashCode()
   {
-    return changeNumber.hashCode() + entryUUID.hashCode();
+    return csn.hashCode() + entryUUID.hashCode();
   }
 
 

--
Gitblit v1.10.0