From d8475ffa48cc7a7ecdca78295bf2ce42c6042e48 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 17 Jun 2011 15:55:07 +0000
Subject: [PATCH] Initial work for OPENDJ-155: Add support for OpenDJ extended matching rules and syntaxes
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
index 354627d..5059b69 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
@@ -382,16 +382,18 @@
}
catch (final UnknownSchemaElementException e)
{
- final LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_STRUCTURAL_CLASS
- .get(oid, structuralClassOID);
+ final LocalizableMessage message =
+ ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_STRUCTURAL_CLASS1
+ .get(getNameOrOID(), structuralClassOID);
throw new SchemaException(message, e);
}
if (structuralClass.getObjectClassType() != ObjectClassType.STRUCTURAL)
{
// This is bad because the associated structural class type is not
// structural.
- final LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_STRUCTURAL_CLASS_NOT_STRUCTURAL
- .get(oid, structuralClass.getOID(), structuralClass.getNameOrOID(),
+ final LocalizableMessage message =
+ ERR_ATTR_SYNTAX_NAME_FORM_STRUCTURAL_CLASS_NOT_STRUCTURAL1
+ .get(getNameOrOID(), structuralClass.getNameOrOID(),
String.valueOf(structuralClass.getObjectClassType()));
throw new SchemaException(message);
}
@@ -409,8 +411,8 @@
{
// This isn't good because it means that the name form requires
// an attribute type that we don't know anything about.
- final LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR
- .get(this.oid, oid);
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR1
+ .get(getNameOrOID(), oid);
throw new SchemaException(message, e);
}
requiredAttributes.add(attributeType);
@@ -431,8 +433,8 @@
// This isn't good because it means that the name form
// requires an attribute type that we don't know anything
// about.
- final LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR
- .get(this.oid, oid);
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR1
+ .get(getNameOrOID(), oid);
throw new SchemaException(message, e);
}
optionalAttributes.add(attributeType);
--
Gitblit v1.10.0