From dcc67378350418e11e50e72996c24b61f1ea8f81 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 04 Jun 2007 07:36:45 +0000
Subject: [PATCH] single valued attribute conflict resolution : issue 609

---
 opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java b/opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java
index 66ded95..21baec5 100644
--- a/opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java
+++ b/opends/src/server/org/opends/server/replication/plugin/AttrInfoWithOptions.java
@@ -36,14 +36,14 @@
  */
 public class AttrInfoWithOptions
 {
-  private HashMap<Set<String> ,AttrInfo> attributesInfo;
+  private HashMap<Set<String> ,AttributeInfo> attributesInfo;
 
   /**
    * creates a new AttrInfoWithOptions.
    */
   public AttrInfoWithOptions()
   {
-    attributesInfo = new HashMap<Set<String> ,AttrInfo>();
+    attributesInfo = new HashMap<Set<String> ,AttributeInfo>();
   }
 
   /**
@@ -52,7 +52,7 @@
    * @param options the options
    * @return the information
    */
-  public AttrInfo get(Set<String> options)
+  public AttributeInfo get(Set<String> options)
   {
     return attributesInfo.get(options);
   }
@@ -64,7 +64,7 @@
    * @param attrInfo the info to associate
    * @return the info to associate
    */
-  public AttrInfo put(Set<String> options,AttrInfo attrInfo )
+  public AttributeInfo put(Set<String> options, AttributeInfo attrInfo )
   {
     return attributesInfo.put(options, attrInfo);
   }
@@ -73,7 +73,7 @@
    * get the Attributes information associated to this object.
    * @return the set of informations
    */
-  public HashMap<Set<String>, AttrInfo> getAttributesInfo()
+  public HashMap<Set<String>, AttributeInfo> getAttributesInfo()
   {
     return attributesInfo;
   }

--
Gitblit v1.10.0