From 1b570922c1772fde4fbd44855453dbd86bb9e276 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Mar 2016 16:17:05 +0000
Subject: [PATCH] Prep work for OPENDJ-2803 Migrate Attribute

---
 opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
index 5215cf4..678149b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
@@ -905,7 +905,7 @@
           {
             // We cannot have multiple pending value sets.
             LocalizableMessage message =
-                ERR_CONFIG_ATTR_MULTIPLE_PENDING_VALUE_SETS.get(a.getName());
+                ERR_CONFIG_ATTR_MULTIPLE_PENDING_VALUE_SETS.get(a.getAttributeDescription().getNameOrOID());
             throw new ConfigException(message);
           }
 
@@ -914,7 +914,7 @@
             if (isRequired())
             {
               // This is illegal -- it must have a value.
-              LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
+              LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getAttributeDescription().getNameOrOID());
               throw new ConfigException(message);
             }
             else
@@ -930,7 +930,7 @@
             {
               // This is illegal -- the attribute is single-valued.
               LocalizableMessage message =
-                  ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getName());
+                  ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getAttributeDescription().getNameOrOID());
               throw new ConfigException(message);
             }
 
@@ -945,7 +945,7 @@
               catch (Exception e)
               {
                 LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
-                    v, a.getName(), e);
+                    v, a.getAttributeDescription().getNameOrOID(), e);
                 throw new ConfigException(message, e);
               }
 
@@ -953,14 +953,14 @@
               if (hasLowerBound && longValue < lowerBound)
               {
                 LocalizableMessage message = ERR_CONFIG_ATTR_INT_BELOW_LOWER_BOUND.get(
-                    a.getName(), longValue, lowerBound);
+                    a.getAttributeDescription().getNameOrOID(), longValue, lowerBound);
                 throw new ConfigException(message);
               }
 
               if (hasUpperBound && longValue > upperBound)
               {
                 LocalizableMessage message = ERR_CONFIG_ATTR_INT_ABOVE_UPPER_BOUND.get(
-                    a.getName(), longValue, upperBound);
+                    a.getAttributeDescription().getNameOrOID(), longValue, upperBound);
                 throw new ConfigException(message);
               }
 
@@ -974,7 +974,7 @@
           // configuration attributes.
           LocalizableMessage message =
               ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED.get(
-                      a.getName());
+                      a.getAttributeDescription().getNameOrOID());
           throw new ConfigException(message);
         }
       }
@@ -985,7 +985,7 @@
         {
           // We cannot have multiple active value sets.
           LocalizableMessage message =
-              ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(a.getName());
+              ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(a.getAttributeDescription().getNameOrOID());
           throw new ConfigException(message);
         }
 
@@ -994,7 +994,7 @@
           if (isRequired())
           {
             // This is illegal -- it must have a value.
-            LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
+            LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getAttributeDescription().getNameOrOID());
             throw new ConfigException(message);
           }
           else
@@ -1010,7 +1010,7 @@
           {
             // This is illegal -- the attribute is single-valued.
             LocalizableMessage message =
-                ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getName());
+                ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getAttributeDescription().getNameOrOID());
             throw new ConfigException(message);
           }
 
@@ -1025,7 +1025,7 @@
             catch (Exception e)
             {
               LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
-                  v, a.getName(), e);
+                  v, a.getAttributeDescription().getNameOrOID(), e);
               throw new ConfigException(message, e);
             }
 
@@ -1033,14 +1033,14 @@
             if (hasLowerBound && longValue < lowerBound)
             {
               LocalizableMessage message = ERR_CONFIG_ATTR_INT_BELOW_LOWER_BOUND.get(
-                  a.getName(), longValue, lowerBound);
+                  a.getAttributeDescription().getNameOrOID(), longValue, lowerBound);
               throw new ConfigException(message);
             }
 
             if (hasUpperBound && longValue > upperBound)
             {
               LocalizableMessage message = ERR_CONFIG_ATTR_INT_ABOVE_UPPER_BOUND.get(
-                  a.getName(), longValue, upperBound);
+                  a.getAttributeDescription().getNameOrOID(), longValue, upperBound);
               throw new ConfigException(message);
             }
 

--
Gitblit v1.10.0