From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/schema/ObjectClassSyntax.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 10c2f5a..22d1e39 100644
--- a/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -44,18 +44,10 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.ByteString;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.ObjectClass;
-import org.opends.server.types.ObjectClassType;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.Schema;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
+import org.opends.server.types.*;
import static org.opends.messages.SchemaMessages.*;
import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
@@ -213,7 +205,7 @@
/**
* {@inheritDoc}
*/
- public boolean valueIsAcceptable(ByteString value,
+ public boolean valueIsAcceptable(ByteSequence value,
MessageBuilder invalidReason)
{
// We'll use the decodeObjectClass method to determine if the value is
@@ -260,13 +252,13 @@
* @throws DirectoryException If the provided value cannot be decoded as an
* objectclass definition.
*/
- public static ObjectClass decodeObjectClass(ByteString value, Schema schema,
+ public static ObjectClass decodeObjectClass(ByteSequence value, Schema schema,
boolean allowUnknownElements)
throws DirectoryException
{
// Get string representations of the provided value using the provided form
// and with all lowercase characters.
- String valueStr = value.stringValue();
+ String valueStr = value.toString();
String lowerStr = toLowerCase(valueStr);
@@ -836,7 +828,7 @@
- return new ObjectClass(value.stringValue(), primaryName, names, oid,
+ return new ObjectClass(value.toString(), primaryName, names, oid,
description, superiorClass, requiredAttributes,
optionalAttributes, objectClassType, isObsolete,
extraProperties);
--
Gitblit v1.10.0