You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/05/17 17:53:52 UTC
svn commit: r945224 - in
/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap:
schema/syntaxCheckers/UuidSyntaxChecker.java util/StringTools.java
Author: elecharny
Date: Mon May 17 15:53:51 2010
New Revision: 945224
URL: http://svn.apache.org/viewvc?rev=945224&view=rev
Log:
o Made the StringTools arrays private to protect them against external modifications
o Added an isHex(byte) method
o Delete an unused array
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java?rev=945224&r1=945223&r2=945224&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/UuidSyntaxChecker.java Mon May 17 15:53:51 2010
@@ -45,9 +45,10 @@ public class UuidSyntaxChecker extends S
// Tells if the byte is alphanumeric
private static boolean isHex( byte b )
{
- return ( b > 0 ) && StringTools.ALPHA_DIGIT[b];
+ return StringTools.isHex( b );
}
+
/**
* Creates a new instance of UUIDSyntaxChecker.
*/
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java?rev=945224&r1=945223&r2=945224&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java Mon May 17 15:53:51 2010
@@ -88,7 +88,7 @@ public class StringTools
private static final int UTF8_SIX_BYTES = 0x00FC;
/** <alpha> ::= [0x41-0x5A] | [0x61-0x7A] */
- public static final boolean[] ALPHA =
+ private static final boolean[] ALPHA =
{
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
@@ -109,7 +109,7 @@ public class StringTools
};
/** <alpha-lower-case> ::= [0x61-0x7A] */
- public static final boolean[] ALPHA_LOWER_CASE =
+ private static final boolean[] ALPHA_LOWER_CASE =
{
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
@@ -130,7 +130,7 @@ public class StringTools
};
/** <alpha-upper-case> ::= [0x41-0x5A] */
- public static final boolean[] ALPHA_UPPER_CASE =
+ private static final boolean[] ALPHA_UPPER_CASE =
{
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
@@ -151,7 +151,7 @@ public class StringTools
};
/** <alpha-digit> | <digit> */
- public static final boolean[] ALPHA_DIGIT =
+ private static final boolean[] ALPHA_DIGIT =
{
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
@@ -172,7 +172,7 @@ public class StringTools
};
/** <alpha> | <digit> | '-' */
- public static final boolean[] CHAR =
+ private static final boolean[] CHAR =
{
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
@@ -288,34 +288,6 @@ public class StringTools
-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1 // 60 -> 6F ( a, b, c, d, e, f )
};
- /** lowerCase = 'a' .. 'z', '0'..'9', '-' */
- private static final char[] LOWER_CASE =
- {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, '-', 0, 0,
- '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 0, 0, 0, 0, 0, 0,
- 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
- 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
- 'x', 'y', 'z', 0, 0, 0, 0, 0,
- 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
- 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
- 'x', 'y', 'z', 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0
- };
private static final char[] TO_LOWER_CASE =
{
@@ -1848,6 +1820,20 @@ public class StringTools
return HEX_VALUE[c];
}
+
+ /**
+ * Check if the current byte is an Hex Char
+ * <hex> ::= [0x30-0x39] | [0x41-0x46] | [0x61-0x66]
+ *
+ * @param byte The byte we want to check
+ * @return <code>true</code> if the current byte is a Hex byte
+ */
+ public static final boolean isHex( byte b )
+ {
+ return ( ( b | 0x7F ) == 0x7F ) || HEX[b];
+ }
+
+
/**
* Check if the current character is an Hex Char <hex> ::= [0x30-0x39] |
* [0x41-0x46] | [0x61-0x66]