From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/server/org/opends/server/protocols/asn1/GSERParser.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/GSERParser.java b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/GSERParser.java
index 4f4a04e..bf74b8f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/GSERParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/asn1/GSERParser.java
@@ -23,6 +23,7 @@
  *
  *      Copyright 2013-2014 Manuel Gaupp
  *      Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014 ForgeRock AS
  */
 package org.opends.server.protocols.asn1;
 
@@ -31,7 +32,7 @@
 import java.math.BigInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import static org.opends.messages.ProtocolMessages.*;
 import static org.forgerock.util.Reject.*;
 
@@ -231,7 +232,7 @@
     }
     else
     {
-      Message msg = ERR_GSER_PATTERN_NO_MATCH.get(pattern.pattern(),
+      LocalizableMessage msg = ERR_GSER_PATTERN_NO_MATCH.get(pattern.pattern(),
                       gserValue.substring(pos,length));
       throw new GSERException(msg);
     }
@@ -257,7 +258,7 @@
     }
     else
     {
-      Message msg = ERR_GSER_PATTERN_NO_MATCH.get(pattern.pattern(),
+      LocalizableMessage msg = ERR_GSER_PATTERN_NO_MATCH.get(pattern.pattern(),
                       gserValue.substring(pos,length));
       throw new GSERException(msg);
     }
@@ -345,7 +346,7 @@
   {
     if (!hasNext(GSER_SEP))
     {
-      Message msg = ERR_GSER_NO_VALID_SEPARATOR.get(gserValue
+      LocalizableMessage msg = ERR_GSER_NO_VALID_SEPARATOR.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }
@@ -368,7 +369,7 @@
   {
     if (!hasNext(GSER_STRING))
     {
-      Message msg = ERR_GSER_NO_VALID_STRING.get(gserValue
+      LocalizableMessage msg = ERR_GSER_NO_VALID_STRING.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }
@@ -392,7 +393,7 @@
   {
     if (!hasNext(GSER_INTEGER))
     {
-      Message msg = ERR_GSER_NO_VALID_INTEGER.get(gserValue
+      LocalizableMessage msg = ERR_GSER_NO_VALID_INTEGER.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }
@@ -413,7 +414,7 @@
   {
     if (!hasNext(GSER_INTEGER))
     {
-      Message msg = ERR_GSER_NO_VALID_INTEGER.get(gserValue
+      LocalizableMessage msg = ERR_GSER_NO_VALID_INTEGER.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }
@@ -434,14 +435,14 @@
   {
     if (!hasNext(GSER_IDENTIFIER))
     {
-      Message msg = ERR_GSER_NO_VALID_IDENTIFIER.get(gserValue
+      LocalizableMessage msg = ERR_GSER_NO_VALID_IDENTIFIER.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }
     String identifier = next(GSER_IDENTIFIER);
     if (!hasNext(GSER_MSP))
     {
-      Message msg = ERR_GSER_SPACE_CHAR_EXPECTED.get(gserValue
+      LocalizableMessage msg = ERR_GSER_SPACE_CHAR_EXPECTED.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }
@@ -463,7 +464,7 @@
   {
     if (!hasNext(GSER_CHOICE_IDENTIFIER))
     {
-      Message msg = ERR_GSER_NO_VALID_IDENTIFIEDCHOICE.get(gserValue
+      LocalizableMessage msg = ERR_GSER_NO_VALID_IDENTIFIEDCHOICE.get(gserValue
                       .substring(pos,length));
       throw new GSERException(msg);
     }

--
Gitblit v1.10.0