From 2de572c4a763152308c8be729d87eeaa71b5fe4e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 04 Feb 2014 10:40:49 +0000
Subject: [PATCH] Removed useless empty lines that survived source code formatting.
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java | 6 ------
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java | 2 --
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java | 2 --
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java | 6 ------
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java | 1 -
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java | 3 ---
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java | 5 -----
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java | 8 --------
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java | 9 ---------
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java | 2 --
10 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
index 7888e2a..286326c 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
@@ -86,7 +86,6 @@
// end of the objectclass.
final int sharpPos = valueStr.indexOf('#');
if (sharpPos < 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SHARP1.get(valueStr));
return false;
}
@@ -95,7 +94,6 @@
final String ocName = valueStr.substring(0, sharpPos).trim();
final int ocLength = ocName.length();
if (ocLength == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_OC1.get(valueStr));
return false;
}
@@ -112,7 +110,6 @@
// scope.
final int lastSharpPos = valueStr.lastIndexOf('#');
if (lastSharpPos == sharpPos) {
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_FINAL_SHARP.get(valueStr));
return false;
}
@@ -121,10 +118,8 @@
if (!(scopeStr.equals("baseobject") || scopeStr.equals("onelevel")
|| scopeStr.equals("wholesubtree") || scopeStr.equals("subordinatesubtree"))) {
if (scopeStr.length() == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SCOPE.get(valueStr));
} else {
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_INVALID_SCOPE.get(valueStr,
scopeStr));
}
@@ -137,7 +132,6 @@
final String criteria = valueStr.substring(sharpPos + 1, lastSharpPos).trim();
final int criteriaLength = criteria.length();
if (criteriaLength == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_CRITERIA.get(valueStr));
return false;
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java
index 896ea8b..02c58aa 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java
@@ -119,7 +119,6 @@
// The value must contain at least one character.
if (valueLength == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_EMPTY.get());
return false;
}
@@ -127,7 +126,6 @@
// The first character must be a printable string character.
char c = valueString.charAt(0);
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE.get(valueString, String
.valueOf(c), 0));
return false;
@@ -144,7 +142,6 @@
break;
} else {
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE.get(valueString,
String.valueOf(c), pos));
}
@@ -155,7 +152,6 @@
// We're at the end of the value, so it must be valid unless the
// last character was a dollar sign.
if (c == '$') {
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_END_WITH_DOLLAR.get(valueString));
return false;
} else {
@@ -171,7 +167,6 @@
if (c == '$') {
final String paramStr = valueString.substring(paramStartPos, pos);
if (!ALLOWED_FAX_PARAMETERS.contains(paramStr)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_ILLEGAL_PARAMETER.get(
valueString, paramStr, paramStartPos, (pos - 1)));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java
index 67f1d3f..8031282 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java
@@ -98,7 +98,6 @@
return criteriaIsValid(schema, criteria.substring(i + 2), valueStr,
invalidReason);
} else {
-
invalidReason.append(ERR_ATTR_SYNTAX_GUIDE_ILLEGAL_CHAR.get(
valueStr, criteria, c, (i + 1)));
return false;
@@ -316,7 +315,6 @@
final String ocName = valueStr.substring(0, sharpPos).trim();
final int ocLength = ocName.length();
if (ocLength == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_GUIDE_NO_OC1.get(valueStr));
return false;
}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java
index f466192..df6705c 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java
@@ -110,7 +110,6 @@
for (int i = sharpPos + 2; i < endPos; i++) {
final char c = valueString.charAt(i);
if (!(c == '0' || c == '1')) {
-
invalidReason.append(ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT.get(
valueString, String.valueOf(c), i));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java
index ba15902..0e8b149 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java
@@ -88,7 +88,6 @@
// It must have at least one digit or space.
if (length == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE.get());
return false;
}
@@ -98,7 +97,6 @@
for (int i = 0; i < length; i++) {
final char c = valueString.charAt(i);
if (!(isDigit(c) || c == ' ')) {
-
invalidReason.append(WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR.get(valueString,
String.valueOf(c), i));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java
index 342a0df..533a8c8 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java
@@ -79,7 +79,6 @@
// Check to see if the provided value was null. If so, then that's
// not acceptable.
if (value == null) {
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE.get());
return false;
}
@@ -89,7 +88,6 @@
final String valueString = value.toString();
final int valueLength = valueString.length();
if (valueLength == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE.get());
return false;
}
@@ -102,7 +100,6 @@
final char c = valueString.charAt(pos);
if (c == '$') {
if (pos == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_NO_MBTYPE.get(valueString));
return false;
}
@@ -110,7 +107,6 @@
pos++;
break;
} else if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MBTYPE_CHAR.get(
valueString, String.valueOf(c), pos));
return false;
@@ -119,7 +115,6 @@
// Make sure there is at least one character left for the mailbox.
if (pos >= valueLength) {
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_NO_MAILBOX.get(valueString));
return false;
}
@@ -129,7 +124,6 @@
for (; pos < valueLength; pos++) {
final char c = valueString.charAt(pos);
if (c != (c & 0x7F)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MB_CHAR.get(valueString,
String.valueOf(c), pos));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java
index 3c57a73..2aa67d8 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java
@@ -179,7 +179,6 @@
// Check to see if the provided value was null. If so, then that's
// not acceptable.
if (value == null) {
-
invalidReason.append(WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE.get());
return false;
}
@@ -189,7 +188,6 @@
final String valueString = value.toString();
final int valueLength = valueString.length();
if (valueLength == 0) {
-
invalidReason.append(WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE.get());
return false;
}
@@ -199,7 +197,6 @@
for (int i = 0; i < valueLength; i++) {
final char c = valueString.charAt(i);
if (!isPrintableCharacter(c)) {
-
invalidReason.append(WARN_ATTR_SYNTAX_PRINTABLE_STRING_ILLEGAL_CHARACTER.get(
valueString, String.valueOf(c), i));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java
index f80515f..a8e43dc 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java
@@ -114,7 +114,6 @@
// The value must contain at least one character.
if (valueLength == 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_EMPTY.get());
return false;
}
@@ -122,7 +121,6 @@
// The first character must be a printable string character.
char c = valueString.charAt(0);
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(valueString, String
.valueOf(c), 0));
return false;
@@ -139,7 +137,6 @@
break;
} else {
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(valueString,
String.valueOf(c), pos));
}
@@ -150,7 +147,6 @@
// We're at the end of the value, so it must be valid unless the
// last character was a dollar sign.
if (c == '$') {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_END_WITH_DOLLAR.get(valueString));
return false;
} else {
@@ -178,14 +174,12 @@
final int colonPos = paramStr.indexOf(':');
if (colonPos < 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON.get(valueString));
return false;
}
final String paramName = paramStr.substring(0, colonPos);
if (!ALLOWED_TTX_PARAMETERS.contains(paramName)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER.get(
valueString, paramName));
return false;
@@ -200,14 +194,12 @@
final String paramStr = valueString.substring(paramStartPos);
final int colonPos = paramStr.indexOf(':');
if (colonPos < 0) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON.get(valueString));
return false;
}
final String paramName = paramStr.substring(0, colonPos);
if (!ALLOWED_TTX_PARAMETERS.contains(paramName)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER.get(valueString,
paramName));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java
index 58a620a..b11b8cb 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java
@@ -89,7 +89,6 @@
final int valueLength = valueString.length();
if (valueLength < 5) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TOO_SHORT.get(valueString));
return false;
}
@@ -97,7 +96,6 @@
// The first character must be a printable string character.
char c = valueString.charAt(0);
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(valueString, String
.valueOf(c), 0));
return false;
@@ -113,7 +111,6 @@
break;
} else {
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(valueString, String
.valueOf(c), pos));
}
@@ -121,7 +118,6 @@
}
if (pos >= valueLength) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TRUNCATED.get(valueString));
return false;
}
@@ -129,7 +125,6 @@
// The next character must be a printable string character.
c = valueString.charAt(pos++);
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(valueString, String
.valueOf(c), (pos - 1)));
return false;
@@ -144,7 +139,6 @@
break;
} else {
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(valueString, String
.valueOf(c), pos));
return false;
@@ -153,7 +147,6 @@
}
if (pos >= valueLength) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TRUNCATED.get(valueString));
return false;
}
@@ -161,7 +154,6 @@
// The next character must be a printable string character.
c = valueString.charAt(pos++);
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(valueString, String
.valueOf(c), (pos - 1)));
return false;
@@ -172,7 +164,6 @@
for (; pos < valueLength; pos++) {
c = valueString.charAt(pos);
if (!PrintableStringSyntaxImpl.isPrintableCharacter(c)) {
-
invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(valueString, String
.valueOf(c), pos));
return false;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java
index ae093cd..2263712 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java
@@ -70,7 +70,6 @@
// bytes long.
final String valueString = value.toString();
if (valueString.length() != 36) {
-
invalidReason.append(WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(valueString, valueString
.length()));
return false;
@@ -86,7 +85,6 @@
case 18:
case 23:
if (valueString.charAt(i) != '-') {
-
invalidReason.append(WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(valueString, i,
String.valueOf(valueString.charAt(i))));
return false;
--
Gitblit v1.10.0