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 2006/12/19 11:35:41 UTC
svn commit: r488616 -
/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/
Author: elecharny
Date: Tue Dec 19 02:35:39 2006
New Revision: 488616
URL: http://svn.apache.org/viewvc?view=rev&rev=488616
Log:
- Added a protected constructor which takes a String (oid) parameter. This is needed if one want to
create a subclass of a SyntaxChecker
- Added some protection againsta potential NPE in RegexpSC
Modified:
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/RegexSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/SyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxChecker.java
directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxChecker.java
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -31,8 +31,7 @@
/**
* Creates a SyntaxChecker which accepts all values.
*
- * @param oid
- * the oid of the Syntax this checker is associated with
+ * @param oid the oid of the Syntax this checker is associated with
*/
public AcceptAllSyntaxChecker(String oid)
{
@@ -45,7 +44,7 @@
*
* @see SyntaxChecker#isValidSyntax(Object)
*/
- public boolean isValidSyntax( Object a_value )
+ public boolean isValidSyntax( Object value )
{
return true;
}
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -86,6 +86,18 @@
{
super( SC_OID );
}
+
+ /**
+ *
+ * Creates a new instance of AttributeTypeDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected AttributeTypeDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -38,10 +38,27 @@
{
/** The Apache OID for meta syntax checker */
private static final String SC_OID = "1.3.6.1.4.1.18060.0.4.0.0.3";
-
+
+ /**
+ *
+ * Creates a new instance of AttributeTypeUsageSyntaxChecker.
+ *
+ */
public AttributeTypeUsageSyntaxChecker()
{
super( SC_OID );
+ }
+
+ /**
+ *
+ * Creates a new instance of AttributeTypeUsageSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected AttributeTypeUsageSyntaxChecker( String oid )
+ {
+ super( oid );
}
/* (non-Javadoc)
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -41,6 +41,18 @@
}
/**
+ *
+ * Creates a new instance of BinarySyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected BinarySyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
+ /**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
*/
public boolean isValidSyntax( Object value )
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -52,6 +52,18 @@
}
/**
+ *
+ * Creates a new instance of BitStringSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected BitStringSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
+ /**
* A shared and static method used to check that the string is a BitString.
* A BitString is a string of bits, between quots and followed by a 'B' :
*
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -49,6 +49,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of BooleanSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected BooleanSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -96,6 +96,18 @@
}
+ /**
+ *
+ * Creates a new instance of CountrySyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected CountrySyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -67,6 +67,18 @@
}
+ /**
+ *
+ * Creates a new instance of DITContentRuleDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected DITContentRuleDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -68,6 +68,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of DITStructureRuleDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected DITStructureRuleDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -46,6 +46,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of DNSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected DNSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -81,6 +81,18 @@
/**
*
+ * Creates a new instance of DeliveryMethodSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected DeliveryMethodSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
+ /**
+ *
* Check if the string contains a delivery method which has
* not already been found.
*
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -49,6 +49,18 @@
}
+ /**
+ *
+ * Creates a new instance of DirectoryStringSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected DirectoryStringSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -86,6 +86,18 @@
}
+ /**
+ *
+ * Creates a new instance of FacsimileTelephoneNumberSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected FacsimileTelephoneNumberSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -95,6 +95,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of GeneralizedTimeSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected GeneralizedTimeSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -48,6 +48,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of Ia5StringSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected Ia5StringSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -56,6 +56,18 @@
}
+ /**
+ *
+ * Creates a new instance of IntegerSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected IntegerSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JpegSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -52,6 +52,18 @@
}
+ /**
+ *
+ * Creates a new instance of JpegSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected JpegSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -60,6 +60,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of LdapSyntaxDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected LdapSyntaxDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -68,6 +68,18 @@
}
+ /**
+ *
+ * Creates a new instance of MatchingRuleDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected MatchingRuleDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -65,6 +65,18 @@
}
+ /**
+ *
+ * Creates a new instance of MatchingRuleUseDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected MatchingRuleUseDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -55,6 +55,18 @@
}
+ /**
+ *
+ * Creates a new instance of NameAndOptionalUIDSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected NameAndOptionalUIDSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -66,6 +66,18 @@
}
+ /**
+ *
+ * Creates a new instance of NameFormDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected NameFormDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -51,6 +51,18 @@
}
+ /**
+ *
+ * Creates a new instance of NumberSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected NumberSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -57,6 +57,18 @@
}
+ /**
+ *
+ * Creates a new instance of NumericOidSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected NumericOidSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -55,6 +55,18 @@
}
+ /**
+ *
+ * Creates a new instance of NumericStringSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected NumericStringSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -72,6 +72,18 @@
}
+ /**
+ *
+ * Creates a new instance of ObjectClassDescriptionSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected ObjectClassDescriptionSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -46,6 +46,18 @@
}
+ /**
+ *
+ * Creates a new instance of ObjectClassTypeSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected ObjectClassTypeSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OctetStringSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -48,6 +48,18 @@
super( SC_OID );
}
+ /**
+ *
+ * Creates a new instance of OctetStringSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected OctetStringSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -49,9 +49,26 @@
/** The Syntax OID */
private static final String SC_OID = "1.3.6.1.4.1.18060.0.4.0.0.5";
+ /**
+ *
+ * Creates a new instance of OidLenSyntaxChecker.
+ *
+ */
public OidLenSyntaxChecker()
{
super( SC_OID );
+ }
+
+ /**
+ *
+ * Creates a new instance of OidLenSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected OidLenSyntaxChecker( String oid )
+ {
+ super( oid );
}
/* (non-Javadoc)
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -62,6 +62,18 @@
}
+ /**
+ *
+ * Creates a new instance of OidSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected OidSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/PrintableStringSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -91,6 +91,18 @@
}
+ /**
+ *
+ * Creates a new instance of PrintableStringSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected PrintableStringSyntaxChecker( String oid )
+ {
+ super( oid );
+ }
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/RegexSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/RegexSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/RegexSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/RegexSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -19,6 +19,9 @@
*/
package org.apache.directory.shared.ldap.schema.syntax;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* A SyntaxChecker implemented using Perl5 regular expressions to constrain
@@ -30,7 +33,7 @@
public class RegexSyntaxChecker extends AbstractSyntaxChecker
{
/** the set of regular expressions */
- private final String[] expressions;
+ private List<String> expressions;
/**
@@ -45,11 +48,37 @@
public RegexSyntaxChecker( String oid, String[] matchExprArray )
{
super( oid );
- expressions = matchExprArray;
+
+ if ( ( matchExprArray != null ) && ( matchExprArray.length != 0 ) )
+ {
+ expressions = new ArrayList<String>( matchExprArray.length );
+
+ for ( String regexp:matchExprArray )
+ {
+ expressions.add( regexp );
+ }
+ }
+ else
+ {
+ expressions = new ArrayList<String>();
+ }
}
/**
+ *
+ * Creates a new instance of RegexSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
+ */
+ protected RegexSyntaxChecker( String oid )
+ {
+ super( oid );
+ expressions = new ArrayList<String>();
+ }
+
+ /**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(java.lang.Object)
*/
public boolean isValidSyntax( Object value )
@@ -61,9 +90,9 @@
{
str = ( String ) value;
- for ( int i = 0; i < expressions.length; i++ )
+ for ( String regexp:expressions )
{
- match = match && str.matches( expressions[i] );
+ match = match && str.matches( regexp );
if ( !match )
{
@@ -73,5 +102,29 @@
}
return match;
+ }
+
+ /**
+ * Get the list of regexp stored into this SyntaxChecker
+ *
+ * @return AN array containing all the stored regexp
+ */
+ public String[] getExpressions()
+ {
+ return (String[])expressions.toArray();
+ }
+
+ /**
+ * Add a list of regexp to be applied by this SyntaxChecker
+ *
+ * @param expressions The regexp list to add
+ */
+ public void setExpressions( String[] expressions )
+ {
+ for ( String regexp:expressions )
+ {
+ this.expressions.add( regexp );
+ }
+
}
}
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/SyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/SyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/SyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/SyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -37,7 +37,7 @@
*
* @return the object identifier of the Syntax this SyntaxChecker validates
*/
- abstract String getSyntaxOid();
+ String getSyntaxOid();
/**
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/TelephoneNumberSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -45,7 +45,7 @@
public class TelephoneNumberSyntaxChecker extends AbstractSyntaxChecker
{
/** The Syntax OID, according to RFC 4517, par. 3.3.31 */
- private static final String OID = "1.3.6.1.4.1.1466.115.121.1.50";
+ private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.50";
/** Other regexps to extend the initial one */
private List<String> regexps;
@@ -67,11 +67,13 @@
*/
public TelephoneNumberSyntaxChecker()
{
- super( OID );
+ super( SC_OID );
}
/**
* Creates a new instance of TelephoneNumberSyntaxChecker.
+ *
+ * @param The OID to associate with this SyntaxChecker
*/
protected TelephoneNumberSyntaxChecker( String oid )
{
Modified: directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxChecker.java?view=diff&rev=488616&r1=488615&r2=488616
==============================================================================
--- directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxChecker.java (original)
+++ directory/trunks/shared/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/UtcTimeSyntaxChecker.java Tue Dec 19 02:35:39 2006
@@ -22,11 +22,6 @@
import java.util.regex.Pattern;
-import javax.naming.NamingException;
-
-
-import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -63,10 +58,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class UtcTimeSyntaxChecker implements SyntaxChecker
+public class UtcTimeSyntaxChecker extends AbstractSyntaxChecker
{
/** The Syntax OID, according to RFC 4517, par. 3.3.34 */
- public static final String OID = "1.3.6.1.4.1.1466.115.121.1.53";
+ private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.53";
/** The GeneralizedDate pattern matching */
private static final String UTC_TIME_PATTERN =
@@ -90,30 +85,22 @@
*/
public UtcTimeSyntaxChecker()
{
+ super( SC_OID );
}
- /* (non-Javadoc)
- * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#assertSyntax(java.lang.Object)
- */
- public void assertSyntax( Object value ) throws NamingException
- {
- if ( ! isValidSyntax( value ) )
- {
- throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#getSyntaxOid()
+ /**
+ *
+ * Creates a new instance of UtcTimeSyntaxChecker.
+ *
+ * @param the oid to associate with this new SyntaxChecker
+ *
*/
- public String getSyntaxOid()
+ protected UtcTimeSyntaxChecker( String oid )
{
- return OID;
+ super( oid );
}
-
-
+
/* (non-Javadoc)
* @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
*/