From f2160f4bd1c8ac67e5a86a6710d431e8932877f9 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 May 2010 11:47:51 +0000
Subject: [PATCH] Synchronize SDK on java.net with internal repository.
---
sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
index 1fb555a..80964d4 100644
--- a/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
+++ b/sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java
@@ -30,7 +30,8 @@
import static com.sun.opends.sdk.messages.Messages.*;
-import static org.opends.sdk.schema.SchemaConstants.*;
+import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
+import static org.opends.sdk.schema.SchemaConstants.SYNTAX_LDAP_SYNTAX_NAME;
import java.util.*;
import java.util.regex.Pattern;
@@ -46,9 +47,9 @@
/**
- * This class defines the LDAP syntax description syntax, which is used
- * to hold attribute syntax definitions in the schema. The format of
- * this syntax is defined in RFC 2252.
+ * This class defines the LDAP syntax description syntax, which is used to hold
+ * attribute syntax definitions in the schema. The format of this syntax is
+ * defined in RFC 2252.
*/
final class LDAPSyntaxDescriptionSyntaxImpl extends AbstractSyntaxImpl
{
@@ -75,8 +76,8 @@
- public boolean valueIsAcceptable(Schema schema, ByteSequence value,
- LocalizableMessageBuilder invalidReason)
+ public boolean valueIsAcceptable(final Schema schema,
+ final ByteSequence value, final LocalizableMessageBuilder invalidReason)
{
// We'll use the decodeNameForm method to determine if the value is
// acceptable.
@@ -93,8 +94,8 @@
{
// This means that the value was empty or contained only
// whitespace. That is illegal.
- final LocalizableMessage message =
- ERR_ATTR_SYNTAX_ATTRSYNTAX_EMPTY_VALUE.get();
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRSYNTAX_EMPTY_VALUE
+ .get();
final DecodeException e = DecodeException.error(message);
StaticUtils.DEBUG_LOG.throwing("LDAPSyntaxDescriptionSyntax",
"valueIsAcceptable", e);
@@ -106,9 +107,8 @@
final char c = reader.read();
if (c != '(')
{
- final LocalizableMessage message =
- ERR_ATTR_SYNTAX_ATTRSYNTAX_EXPECTED_OPEN_PARENTHESIS.get(
- definition, (reader.pos() - 1), String.valueOf(c));
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRSYNTAX_EXPECTED_OPEN_PARENTHESIS
+ .get(definition, (reader.pos() - 1), String.valueOf(c));
final DecodeException e = DecodeException.error(message);
StaticUtils.DEBUG_LOG.throwing("LDAPSyntaxDescriptionSyntax",
"valueIsAcceptable", e);
@@ -122,8 +122,7 @@
// The next set of characters must be the OID.
final String oid = SchemaUtils.readOID(reader);
- Map<String, List<String>> extraProperties =
- Collections.emptyMap();
+ Map<String, List<String>> extraProperties = Collections.emptyMap();
// At this point, we should have a pretty specific syntax that
// describes what may come next, but some of the components are
// optional and it would be pretty easy to put something in the
@@ -158,13 +157,12 @@
{
extraProperties = new HashMap<String, List<String>>();
}
- extraProperties.put(tokenName, SchemaUtils
- .readExtensions(reader));
+ extraProperties.put(tokenName, SchemaUtils.readExtensions(reader));
}
else
{
- final LocalizableMessage message =
- ERR_ATTR_SYNTAX_ILLEGAL_TOKEN.get(tokenName);
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_ILLEGAL_TOKEN
+ .get(tokenName);
final DecodeException e = DecodeException.error(message);
StaticUtils.DEBUG_LOG.throwing("LDAPSyntaxDescriptionSyntax",
"valueIsAcceptable", e);
@@ -177,8 +175,7 @@
{
if (property.getKey().equalsIgnoreCase("x-pattern"))
{
- final Iterator<String> values =
- property.getValue().iterator();
+ final Iterator<String> values = property.getValue().iterator();
if (values.hasNext())
{
final String pattern = values.next();
@@ -188,14 +185,11 @@
}
catch (final Exception e)
{
- final LocalizableMessage message =
- WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_INVALID_PATTERN
- .get(oid, pattern);
- final DecodeException de =
- DecodeException.error(message, e);
- StaticUtils.DEBUG_LOG.throwing(
- "LDAPSyntaxDescriptionSyntax", "valueIsAcceptable",
- de);
+ final LocalizableMessage message = WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_INVALID_PATTERN
+ .get(oid, pattern);
+ final DecodeException de = DecodeException.error(message, e);
+ StaticUtils.DEBUG_LOG.throwing("LDAPSyntaxDescriptionSyntax",
+ "valueIsAcceptable", de);
throw de;
}
break;
@@ -211,13 +205,11 @@
{
if (entry.equals(values.get(j)))
{
- final LocalizableMessage message =
- WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_DUPLICATE_VALUE
- .get(oid, entry, j);
+ final LocalizableMessage message = WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_DUPLICATE_VALUE
+ .get(oid, entry, j);
final DecodeException e = DecodeException.error(message);
- StaticUtils.DEBUG_LOG.throwing(
- "LDAPSyntaxDescriptionSyntax", "valueIsAcceptable",
- e);
+ StaticUtils.DEBUG_LOG.throwing("LDAPSyntaxDescriptionSyntax",
+ "valueIsAcceptable", e);
throw e;
}
}
--
Gitblit v1.10.0