From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index ee1a804..6780079 100644
--- a/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
@@ -34,17 +34,16 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
+
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.ByteString;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.messages.SchemaMessages.*;
+import static org.opends.messages.SchemaMessages.*;
+import org.opends.messages.Message;
import static org.opends.server.schema.SchemaConstants.*;
@@ -146,17 +145,15 @@
byte[] valueBytes = value.value();
if (valueBytes.length != 36)
{
- int msgID = MSGID_ATTR_SYNTAX_UUID_INVALID_LENGTH;
- String message = getMessage(msgID, value.stringValue(),
- valueBytes.length);
+ Message message = WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(
+ value.stringValue(), valueBytes.length);
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
case WARN:
- logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.MILD_ERROR,
- message, msgID);
+ logError(message);
return new ASN1OctetString(valueBytes);
default:
return new ASN1OctetString(valueBytes);
@@ -177,18 +174,16 @@
case 23:
if (normBytes[i] != '-')
{
- int msgID = MSGID_ATTR_SYNTAX_UUID_EXPECTED_DASH;
- String message = getMessage(msgID, value.stringValue(), i,
- String.valueOf(normBytes[i]));
+ Message message = WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(
+ value.stringValue(), i, String.valueOf(normBytes[i]));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.MILD_ERROR,
- message, msgID);
+ logError(
+ message);
return new ASN1OctetString(valueBytes);
default:
return new ASN1OctetString(valueBytes);
@@ -235,18 +230,16 @@
normBytes[i] = 'f';
break;
default:
- int msgID = MSGID_ATTR_SYNTAX_UUID_EXPECTED_HEX;
- String message = getMessage(msgID, value.stringValue(), i,
- String.valueOf(normBytes[i]));
+ Message message = WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(
+ value.stringValue(), i, String.valueOf(normBytes[i]));
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
throw new DirectoryException(
- ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
case WARN:
- logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.MILD_ERROR,
- message, msgID);
+ logError(
+ message);
return new ASN1OctetString(valueBytes);
default:
return new ASN1OctetString(valueBytes);
--
Gitblit v1.10.0