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 2012/01/24 18:44:32 UTC
svn commit: r1235374 [14/27] - in /directory/shared/trunk:
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/csn/
ldap/model/src/main/java/org/apache/directory/sha...
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
@@ -44,8 +45,8 @@ public class OctetStringSyntaxChecker ex
{
super( SchemaConstants.OCTET_STRING_SYNTAX );
}
-
-
+
+
/**
* Creates a new instance of OctetStringSyntaxChecker, with a specific OID
*
@@ -55,8 +56,8 @@ public class OctetStringSyntaxChecker ex
{
super( oid );
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -53,6 +53,7 @@ public class OidLenSyntaxChecker extends
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( OidLenSyntaxChecker.class );
+
/**
*
* Creates a new instance of OidLenSyntaxChecker.
@@ -62,7 +63,7 @@ public class OidLenSyntaxChecker extends
{
super( SchemaConstants.OID_LEN_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -76,14 +77,14 @@ public class OidLenSyntaxChecker extends
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -95,15 +96,15 @@ public class OidLenSyntaxChecker extends
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// We are looking at the first position of the len part
int pos = strValue.indexOf( '{' );
-
+
if ( pos < 0 )
{
// Not found ... but it may still be a valid OID
- boolean result = Oid.isOid(strValue);
-
+ boolean result = Oid.isOid( strValue );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -112,44 +113,52 @@ public class OidLenSyntaxChecker extends
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
else
{
// we should have a len value. First check that the OID is valid
String oid = strValue.substring( 0, pos );
-
+
if ( !Oid.isOid( oid ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
String len = strValue.substring( pos );
-
+
// We must have a lnumber and a '}' at the end
- if ( len.charAt( len.length() -1 ) != '}' )
+ if ( len.charAt( len.length() - 1 ) != '}' )
{
// No final '}'
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
for ( int i = 1; i < len.length() - 1; i++ )
{
- switch ( len.charAt(i) )
+ switch ( len.charAt( i ) )
{
- case '0': case '1': case '2' : case '3': case '4':
- case '5': case '6': case '7' : case '8': case '9':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
break;
-
- default:
+
+ default:
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
}
-
+
if ( ( len.charAt( 1 ) == '0' ) && len.length() > 3 )
{
// A number can't start with a '0' unless it's the only
@@ -157,7 +166,7 @@ public class OidLenSyntaxChecker extends
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -56,6 +56,7 @@ public class OidSyntaxChecker extends Sy
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( OidSyntaxChecker.class );
+
/**
* Creates a new instance of OidSyntaxChecker.
*/
@@ -64,7 +65,7 @@ public class OidSyntaxChecker extends Sy
super( SchemaConstants.OID_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
@@ -77,14 +78,14 @@ public class OidSyntaxChecker extends Sy
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -96,12 +97,12 @@ public class OidSyntaxChecker extends Sy
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// if the first character is a digit it's an attempt at an OID and must be
// checked to make sure there are no other chars except '.' and digits.
- if ( Chars.isDigit(strValue.charAt(0)) )
+ if ( Chars.isDigit( strValue.charAt( 0 ) ) )
{
- if ( ! Oid.isOid(strValue) )
+ if ( !Oid.isOid( strValue ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -115,17 +116,17 @@ public class OidSyntaxChecker extends Sy
// here we just need to make sure that we have the right characters in the
// string and that it starts with a letter.
- if ( Chars.isAlphaASCII(strValue, 0) )
+ if ( Chars.isAlphaASCII( strValue, 0 ) )
{
for ( int index = 0; index < strValue.length(); index++ )
{
- if ( ! Chars.isAlphaDigitMinus(strValue, index))
+ if ( !Chars.isAlphaDigitMinus( strValue, index ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
}
-
+
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -43,6 +43,7 @@ public class OtherMailboxSyntaxChecker e
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( OtherMailboxSyntaxChecker.class );
+
/**
* Creates a new instance of OtherMailboxSyntaxChecker.
*/
@@ -50,8 +51,8 @@ public class OtherMailboxSyntaxChecker e
{
super( SchemaConstants.OTHER_MAILBOX_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -64,14 +65,14 @@ public class OtherMailboxSyntaxChecker e
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -86,36 +87,36 @@ public class OtherMailboxSyntaxChecker e
// Search for the '$' separator
int dollar = strValue.indexOf( '$' );
-
+
if ( dollar == -1 )
{
// No '$' => error
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
String mailboxType = strValue.substring( 0, dollar );
-
+
String mailbox = ( ( dollar < strValue.length() - 1 )
? strValue.substring( dollar + 1 ) : "" );
-
+
// The mailbox should not contains a '$'
if ( mailbox.indexOf( '$' ) != -1 )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that the mailboxType is a PrintableString
- if ( !Strings.isPrintableString(mailboxType) )
+ if ( !Strings.isPrintableString( mailboxType ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that the mailbox is an IA5String
- boolean result = ( Strings.isIA5String(mailbox) );
-
+ boolean result = ( Strings.isIA5String( mailbox ) );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -124,7 +125,7 @@ public class OtherMailboxSyntaxChecker e
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -42,6 +42,7 @@ public class PostalAddressSyntaxChecker
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( PostalAddressSyntaxChecker.class );
+
/**
* Creates a new instance of PostalAddressSyntaxChecker.
*/
@@ -49,8 +50,8 @@ public class PostalAddressSyntaxChecker
{
super( SchemaConstants.POSTAL_ADDRESS_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -63,14 +64,14 @@ public class PostalAddressSyntaxChecker
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -85,7 +86,7 @@ public class PostalAddressSyntaxChecker
// Search for the '$' separator
int dollar = strValue.indexOf( '$' );
-
+
if ( dollar == -1 )
{
// No '$' => only a dstring
@@ -98,25 +99,26 @@ public class PostalAddressSyntaxChecker
{
// check that the element between each '$' is not empty
String address = strValue.substring( pos, dollar );
-
- if ( Strings.isEmpty(address) )
+
+ if ( Strings.isEmpty( address ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
pos = dollar + 1;
-
+
if ( pos == strValue.length() )
{
// we should not have a '$' at the end
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
dollar = strValue.indexOf( '$', pos );
- } while ( dollar > -1 );
-
+ }
+ while ( dollar > -1 );
+
return true;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +38,7 @@ public class PresentationAddressSyntaxCh
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( PresentationAddressSyntaxChecker.class );
+
/**
* Creates an instance of PresentationAddressSyntaxChecker
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -63,6 +63,7 @@ public class PrintableStringSyntaxChecke
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( PrintableStringSyntaxChecker.class );
+
/**
* Creates a new instance of PrintableStringSyntaxChecker.
*/
@@ -71,7 +72,7 @@ public class PrintableStringSyntaxChecke
super( SchemaConstants.PRINTABLE_STRING_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
@@ -84,14 +85,14 @@ public class PrintableStringSyntaxChecke
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -103,7 +104,7 @@ public class PrintableStringSyntaxChecke
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// We must have at least one char
if ( strValue.length() == 0 )
{
@@ -111,8 +112,8 @@ public class PrintableStringSyntaxChecke
return false;
}
- boolean result = Strings.isPrintableString(strValue);
-
+ boolean result = Strings.isPrintableString( strValue );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -121,7 +122,7 @@ public class PrintableStringSyntaxChecke
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -37,6 +38,7 @@ public class ProtocolInformationSyntaxCh
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ProtocolInformationSyntaxChecker.class );
+
/**
* Creates a new instance of ProtocolInformationSyntaxChecker.
*/
@@ -45,6 +47,7 @@ public class ProtocolInformationSyntaxCh
super( SchemaConstants.PROTOCOL_INFORMATION_SYNTAX );
}
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import java.util.ArrayList;
import java.util.List;
@@ -42,6 +43,7 @@ public class RegexSyntaxChecker extends
/** the set of regular expressions */
private List<String> expressions;
+
/**
* Creates a Syntax validator for a specific Syntax using Perl5 matching
* rules for validation.
@@ -54,12 +56,12 @@ public class RegexSyntaxChecker extends
public RegexSyntaxChecker( String oid, String[] matchExprArray )
{
super( oid );
-
+
if ( ( matchExprArray != null ) && ( matchExprArray.length != 0 ) )
{
expressions = new ArrayList<String>( matchExprArray.length );
-
- for ( String regexp:matchExprArray )
+
+ for ( String regexp : matchExprArray )
{
expressions.add( regexp );
}
@@ -83,7 +85,7 @@ public class RegexSyntaxChecker extends
super( oid );
expressions = new ArrayList<String>();
}
-
+
/**
* {@inheritDoc}
@@ -97,7 +99,7 @@ public class RegexSyntaxChecker extends
{
str = ( String ) value;
- for ( String regexp:expressions )
+ for ( String regexp : expressions )
{
match = match && str.matches( regexp );
@@ -108,18 +110,19 @@ public class RegexSyntaxChecker extends
}
}
- if ( match )
- {
- LOG.debug( "Syntax valid for '{}'", value );
- }
- else
- {
- LOG.debug( "Syntax invalid for '{}'", value );
- }
-
- return match;
+ if ( match )
+ {
+ LOG.debug( "Syntax valid for '{}'", value );
+ }
+ else
+ {
+ LOG.debug( "Syntax invalid for '{}'", value );
+ }
+
+ return match;
}
+
/**
* Get the list of regexp stored into this SyntaxChecker
*
@@ -127,10 +130,11 @@ public class RegexSyntaxChecker extends
*/
public String[] getExpressions()
{
- String[] exprs = new String[ expressions.size() ];
+ String[] exprs = new String[expressions.size()];
return expressions.toArray( exprs );
}
+
/**
* Add a list of regexp to be applied by this SyntaxChecker
*
@@ -138,7 +142,7 @@ public class RegexSyntaxChecker extends
*/
public void setExpressions( String[] expressions )
{
- for ( String regexp:expressions )
+ for ( String regexp : expressions )
{
this.expressions.add( regexp );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -45,6 +45,7 @@ public class SearchScopeSyntaxChecker ex
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SearchScopeSyntaxChecker.class );
+
/**
* Creates a new instance of SearchScopeSyntaxChecker.
*/
@@ -52,8 +53,8 @@ public class SearchScopeSyntaxChecker ex
{
super( SchemaConstants.SEARCH_SCOPE_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -66,14 +67,14 @@ public class SearchScopeSyntaxChecker ex
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -81,7 +82,7 @@ public class SearchScopeSyntaxChecker ex
}
strValue = Strings.trim( Strings.toLowerCase( strValue ) );
-
- return ( "base".equals( strValue ) || "one".equals( strValue ) || "sub".equals( strValue ) );
+
+ return ( "base".equals( strValue ) || "one".equals( strValue ) || "sub".equals( strValue ) );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +39,7 @@ public class SubstringAssertionSyntaxChe
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SubstringAssertionSyntaxChecker.class );
+
/**
* Creates an instance of SubstringAssertionSyntaxChecker
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import java.text.ParseException;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -43,9 +44,10 @@ public class SubtreeSpecificationSyntaxC
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SubtreeSpecificationSyntaxChecker.class );
- /** The associated checker */
+ /** The associated checker */
private SubtreeSpecificationChecker subtreeSpecificationChecker;
+
/**
* Creates an instance of SubtreeSpecificationSyntaxChecker
*/
@@ -67,14 +69,14 @@ public class SubtreeSpecificationSyntaxC
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -89,11 +91,11 @@ public class SubtreeSpecificationSyntaxC
try
{
- synchronized( subtreeSpecificationChecker )
+ synchronized ( subtreeSpecificationChecker )
{
subtreeSpecificationChecker.parse( strValue );
}
-
+
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -36,6 +37,7 @@ public class SupplierAndConsumerSyntaxCh
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupplierAndConsumerSyntaxChecker.class );
+
/**
* Creates an instance of SupplierAndConsumerSyntaxChecker
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -36,6 +37,7 @@ public class SupplierInformationSyntaxCh
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupplierInformationSyntaxChecker.class );
+
/**
* Creates an instance of SupplierInformationSyntaxChecker
*/
@@ -44,7 +46,7 @@ public class SupplierInformationSyntaxCh
super( SchemaConstants.SUPPLIER_INFORMATION_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -36,6 +37,7 @@ public class SupplierOrConsumerSyntaxChe
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupplierOrConsumerSyntaxChecker.class );
+
/**
* Creates a new instance of SupplierOrConsumerSyntaxChecker.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +38,7 @@ public class SupportedAlgorithmSyntaxChe
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( SupportedAlgorithmSyntaxChecker.class );
+
/**
* Creates a new instance of SupportedAlgorithmSyntaxChecker.
*/
@@ -46,7 +48,7 @@ public class SupportedAlgorithmSyntaxChe
setOid( SchemaConstants.SUPPORTED_ALGORITHM_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,8 +19,10 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+
/**
* A SyntaxChecker for the SyntaxChecker schema element
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -53,19 +53,20 @@ public class TelephoneNumberSyntaxChecke
/** Other regexps to extend the initial one */
private List<String> regexps;
-
+
/** Other regexp to extend the initial one, compiled */
private List<Pattern> compiledREs;
-
+
/** The default pattern used to check a TelephoneNumber */
private static final String DEFAULT_REGEXP = "^ *[+]? *((\\([0-9- ]+\\))|[0-9- ]+)+$";
-
+
/** The compiled default pattern */
- private Pattern defaultPattern = Pattern.compile( DEFAULT_REGEXP );
-
+ private Pattern defaultPattern = Pattern.compile( DEFAULT_REGEXP );
+
/** A flag set when only the default regexp should be tested */
protected boolean defaultMandatory = false;
-
+
+
/**
* Creates a new instance of TelephoneNumberSyntaxChecker.
*/
@@ -85,17 +86,17 @@ public class TelephoneNumberSyntaxChecke
{
return;
}
-
+
try
{
Pattern compiledRE = Pattern.compile( regexp );
if ( regexps == null )
- {
+ {
regexps = new ArrayList<String>();
compiledREs = new ArrayList<Pattern>();
}
-
+
regexps.add( regexp );
compiledREs.add( compiledRE );
}
@@ -126,7 +127,8 @@ public class TelephoneNumberSyntaxChecke
return;
}
}
-
+
+
/**
* {@inheritDoc}
*/
@@ -139,14 +141,14 @@ public class TelephoneNumberSyntaxChecke
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -158,13 +160,13 @@ public class TelephoneNumberSyntaxChecke
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// We will use a regexp to check the TelephoneNumber.
if ( defaultMandatory )
{
// We have a unique regexp to check, the default one
boolean result = defaultPattern.matcher( strValue ).matches();
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -173,7 +175,7 @@ public class TelephoneNumberSyntaxChecke
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
else
@@ -190,10 +192,10 @@ public class TelephoneNumberSyntaxChecke
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// The default is not enough, let's try
// the other regexps
- for ( Pattern pattern:compiledREs )
+ for ( Pattern pattern : compiledREs )
{
if ( pattern.matcher( strValue ).matches() )
{
@@ -201,7 +203,7 @@ public class TelephoneNumberSyntaxChecke
return true;
}
}
-
+
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -47,6 +47,7 @@ public class TeletexTerminalIdentifierSy
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( TeletexTerminalIdentifierSyntaxChecker.class );
+
/**
* Creates a new instance of TeletexTerminalIdentifier.
*/
@@ -54,8 +55,8 @@ public class TeletexTerminalIdentifierSy
{
super( SchemaConstants.TELETEX_TERMINAL_IDENTIFIER_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -68,14 +69,14 @@ public class TeletexTerminalIdentifierSy
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -90,52 +91,52 @@ public class TeletexTerminalIdentifierSy
// Search for the first '$' separator
int dollar = strValue.indexOf( '$' );
-
+
String terminalIdentifier = ( ( dollar == -1 ) ? strValue : strValue.substring( 0, dollar ) );
-
+
if ( terminalIdentifier.length() == 0 )
{
// It should not be null
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
- if ( !Strings.isPrintableString(terminalIdentifier) )
+
+ if ( !Strings.isPrintableString( terminalIdentifier ) )
{
// It's not a valid PrintableString
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
if ( dollar == -1 )
{
// No ttx-param : let's get out
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
-
+
// Ok, now let's deal withh optional ttx-params
String[] ttxParams = strValue.substring( dollar + 1 ).split( "\\$" );
-
+
if ( ttxParams.length == 0 )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
- for ( String ttxParam:ttxParams )
+
+ for ( String ttxParam : ttxParams )
{
int colon = ttxParam.indexOf( ':' );
-
+
if ( colon == -1 )
{
// we must have a ':' separator
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
String key = ttxParam.substring( 0, colon );
-
+
if ( key.startsWith( "graphic" )
|| key.startsWith( "control" )
|| key.startsWith( "misc" )
@@ -147,19 +148,19 @@ public class TeletexTerminalIdentifierSy
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
boolean hasEsc = false;
-
- for ( byte b: Strings.getBytesUtf8(ttxParam) )
+
+ for ( byte b : Strings.getBytesUtf8( ttxParam ) )
{
switch ( b )
{
- case 0x24 :
+ case 0x24:
// '$' is not accepted
LOG.debug( "Syntax invalid for '{}'", value );
return false;
-
- case 0x5c :
+
+ case 0x5c:
if ( hasEsc )
{
// two following \ are not accepted
@@ -170,34 +171,34 @@ public class TeletexTerminalIdentifierSy
{
hasEsc = true;
}
-
+
continue;
-
- case '2' :
+
+ case '2':
continue;
- case '4' :
+ case '4':
// We have found a "\24"
hasEsc = false;
continue;
-
- case '5' :
+
+ case '5':
continue;
- case 'c' :
- case 'C' :
+ case 'c':
+ case 'C':
// We have found a "\5c" or a "\5C"
hasEsc = false;
continue;
-
- default :
+
+ default:
if ( hasEsc )
{
// A \ should be followed by "24" or "5c" or "5C"
return false;
}
-
- continue;
+
+ continue;
}
}
}
@@ -207,7 +208,7 @@ public class TeletexTerminalIdentifierSy
return false;
}
}
-
+
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -44,6 +44,7 @@ public class TelexNumberSyntaxChecker ex
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( TelexNumberSyntaxChecker.class );
+
/**
* Creates a new instance of TelexNumberSyntaxChecker.
*/
@@ -51,8 +52,8 @@ public class TelexNumberSyntaxChecker ex
{
super( SchemaConstants.TELEX_NUMBER_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -65,14 +66,14 @@ public class TelexNumberSyntaxChecker ex
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -87,7 +88,7 @@ public class TelexNumberSyntaxChecker ex
// Search for the first '$' separator
int dollar = strValue.indexOf( '$' );
-
+
// We must have one, and not on first position
if ( dollar <= 0 )
{
@@ -95,26 +96,26 @@ public class TelexNumberSyntaxChecker ex
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
String actualNumber = strValue.substring( 0, dollar );
-
+
// The actualNumber must not be empty
if ( actualNumber.length() == 0 )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// The actual number should be a PrintableString
- if ( ! Strings.isPrintableString(actualNumber) )
+ if ( !Strings.isPrintableString( actualNumber ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Search for the second separator
int dollar2 = strValue.indexOf( '$', dollar + 1 );
-
+
// We must have one
if ( dollar2 == -1 )
{
@@ -124,21 +125,21 @@ public class TelexNumberSyntaxChecker ex
}
String countryCode = strValue.substring( dollar + 1, dollar2 );
-
+
// The countryCode must not be empty
if ( countryCode.length() == 0 )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// The country Code should be a PrintableString
- if ( ! Strings.isPrintableString(countryCode) )
+ if ( !Strings.isPrintableString( countryCode ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Now, check for the answerBack
if ( dollar2 + 1 == strValue.length() )
{
@@ -146,19 +147,19 @@ public class TelexNumberSyntaxChecker ex
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
String answerBack = strValue.substring( dollar2 + 1 );
-
+
// The answerBack should be a PrintableString
- if ( ! Strings.isPrintableString(answerBack) )
+ if ( !Strings.isPrintableString( answerBack ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that the mailboxType is a PrintableString
- boolean result = Strings.isPrintableString(answerBack);
-
+ boolean result = Strings.isPrintableString( answerBack );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -167,7 +168,7 @@ public class TelexNumberSyntaxChecker ex
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -69,18 +69,19 @@ public class UtcTimeSyntaxChecker extend
/** The GeneralizedDate pattern matching */
private static final String UTC_TIME_PATTERN =
- "^\\d{2}" // year : 00 to 99
- + "(0[1-9]|1[0-2])" // month : 01 to 12
- + "(0[1-9]|[12]\\d|3[01])" // day : 01 to 31
- + "([01]\\d|2[0-3])" // hour: 00 to 23
- + "([0-5]\\d)" // minute : 00 to 59
- + "("
- + "([0-5]\\d)?" // optional second : 00 to 59
- + "(Z|([+-]([01]\\d|2[0-3])[0-5]\\d))?" // optionnal time-zone
- + ")$";
-
+ "^\\d{2}" // year : 00 to 99
+ + "(0[1-9]|1[0-2])" // month : 01 to 12
+ + "(0[1-9]|[12]\\d|3[01])" // day : 01 to 31
+ + "([01]\\d|2[0-3])" // hour: 00 to 23
+ + "([0-5]\\d)" // minute : 00 to 59
+ + "("
+ + "([0-5]\\d)?" // optional second : 00 to 59
+ + "(Z|([+-]([01]\\d|2[0-3])[0-5]\\d))?" // optionnal time-zone
+ + ")$";
+
// The regexp pattern, java.util.regex.Pattern is immutable so only one instance is needed.
- private static final Pattern DATE_PATTERN = Pattern.compile( UTC_TIME_PATTERN );
+ private static final Pattern DATE_PATTERN = Pattern.compile( UTC_TIME_PATTERN );
+
/**
*
@@ -91,8 +92,8 @@ public class UtcTimeSyntaxChecker extend
{
super( SchemaConstants.UTC_TIME_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -105,14 +106,14 @@ public class UtcTimeSyntaxChecker extend
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -125,10 +126,10 @@ public class UtcTimeSyntaxChecker extend
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Start the date parsing
boolean result = DATE_PATTERN.matcher( strValue ).find();
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -40,6 +40,7 @@ public class UuidSyntaxChecker extends S
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( UuidSyntaxChecker.class );
+
/**
* Creates a new instance of UUIDSyntaxChecker.
*/
@@ -59,13 +60,13 @@ public class UuidSyntaxChecker extends S
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
- if ( ! ( value instanceof String ) )
+
+ if ( !( value instanceof String ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
- return Strings.isValidUuid((String) value);
+ return Strings.isValidUuid( ( String ) value );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AdministrativeRole.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AdministrativeRole.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AdministrativeRole.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AdministrativeRole.java Tue Jan 24 17:44:03 2012
@@ -19,8 +19,10 @@
*/
package org.apache.directory.shared.ldap.model.subtree;
+
import org.apache.directory.shared.util.Strings;
+
/**
* The Administrative roles
*
@@ -29,38 +31,39 @@ import org.apache.directory.shared.util.
public enum AdministrativeRole
{
/** The AutonomousArea role */
- AutonomousArea( "autonomousArea" ),
+ AutonomousArea("autonomousArea"),
/** The AccessControlSpecificArea role */
- AccessControlSpecificArea( "accessControlSpecificArea" ),
+ AccessControlSpecificArea("accessControlSpecificArea"),
/** The AccessControlInnerArea role */
- AccessControlInnerArea( "accessControlInnerArea" ),
+ AccessControlInnerArea("accessControlInnerArea"),
/** The CollectiveAttributeSpecificArea role */
- CollectiveAttributeSpecificArea( "collectiveAttributeSpecificArea" ),
+ CollectiveAttributeSpecificArea("collectiveAttributeSpecificArea"),
/** The CollectiveAttributeInnerArea role */
- CollectiveAttributeInnerArea( "collectiveAttributeInnerArea" ),
+ CollectiveAttributeInnerArea("collectiveAttributeInnerArea"),
/** The SubSchemaSpecificArea role */
- SubSchemaSpecificArea( "subSchemaSpecificArea" ),
+ SubSchemaSpecificArea("subSchemaSpecificArea"),
/** The TriggerExecutionSpecificArea role */
- TriggerExecutionSpecificArea( "triggerExecutionSpecificArea" ),
+ TriggerExecutionSpecificArea("triggerExecutionSpecificArea"),
/** The TriggerExecutionInnerArea role */
- TriggerExecutionInnerArea( "triggerExecutionInnerArea" );
+ TriggerExecutionInnerArea("triggerExecutionInnerArea");
/** The AdministrativeRole as a String */
private String role;
+
/**
* Creates an instance of AdministrativeRole
*/
private AdministrativeRole( String role )
{
- this.role = Strings.toLowerCase(Strings.trim(role));
+ this.role = Strings.toLowerCase( Strings.trim( role ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AndRefinement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AndRefinement.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AndRefinement.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/AndRefinement.java Tue Jan 24 17:44:03 2012
@@ -19,9 +19,11 @@
*/
package org.apache.directory.shared.ldap.model.subtree;
+
import java.util.ArrayList;
import java.util.List;
+
/**
* A class holding a AND refinement, as defined in RFC 3672
*
@@ -33,6 +35,7 @@ public class AndRefinement implements Re
/** The set of refinements */
private List<Refinement> refinements = new ArrayList<Refinement>();
+
/**
* Creates a new instance of AndRefinement.
*
@@ -42,8 +45,8 @@ public class AndRefinement implements Re
{
this.refinements = refinements;
}
-
-
+
+
/**
* @return Gets the set of refinements
*/
@@ -51,20 +54,20 @@ public class AndRefinement implements Re
{
return refinements;
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "and: { " );
boolean isFirst = true;
-
- for ( Refinement refinement:refinements )
+
+ for ( Refinement refinement : refinements )
{
if ( isFirst )
{
@@ -77,7 +80,7 @@ public class AndRefinement implements Re
sb.append( refinement );
}
-
+
sb.append( " }" );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/BaseSubtreeSpecification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/BaseSubtreeSpecification.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/BaseSubtreeSpecification.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/BaseSubtreeSpecification.java Tue Jan 24 17:44:03 2012
@@ -182,6 +182,7 @@ public class BaseSubtreeSpecification im
return this.base;
}
+
/**
* @return The set of ChopBefore exclusions
*/
@@ -249,7 +250,7 @@ public class BaseSubtreeSpecification im
buffer.append( '{' );
// The base
- if ( !base.isEmpty() )
+ if ( !base.isEmpty() )
{
buffer.append( " base \"" );
buffer.append( base.getName() );
@@ -258,7 +259,7 @@ public class BaseSubtreeSpecification im
}
// The minimum
- if ( minBaseDistance > 0 )
+ if ( minBaseDistance > 0 )
{
if ( isFirst )
{
@@ -269,13 +270,13 @@ public class BaseSubtreeSpecification im
{
buffer.append( ", " );
}
-
+
buffer.append( "minimum " );
buffer.append( minBaseDistance );
}
// The maximum
- if ( maxBaseDistance > UNBOUNDED_MAX )
+ if ( maxBaseDistance > UNBOUNDED_MAX )
{
if ( isFirst )
{
@@ -286,7 +287,7 @@ public class BaseSubtreeSpecification im
{
buffer.append( ", " );
}
-
+
buffer.append( "maximum " );
buffer.append( maxBaseDistance );
}
@@ -303,9 +304,9 @@ public class BaseSubtreeSpecification im
{
buffer.append( ", " );
}
-
+
buffer.append( "specificExclusions { " );
-
+
boolean isFirstExclusion = true;
if ( chopBefore != null )
@@ -320,7 +321,7 @@ public class BaseSubtreeSpecification im
{
buffer.append( ", " );
}
-
+
buffer.append( "chopBefore: \"" );
buffer.append( exclusion.getName() );
buffer.append( '"' );
@@ -339,7 +340,7 @@ public class BaseSubtreeSpecification im
{
buffer.append( ", " );
}
-
+
buffer.append( "chopAfter: \"" );
buffer.append( exclusion.getName() );
buffer.append( '"' );
@@ -360,13 +361,13 @@ public class BaseSubtreeSpecification im
{
buffer.append( ", " );
}
-
+
buffer.append( "specificationFilter " );
buffer.append( refinement.toString() );
}
buffer.append( " }" );
-
+
return buffer.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ItemRefinement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ItemRefinement.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ItemRefinement.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ItemRefinement.java Tue Jan 24 17:44:03 2012
@@ -19,8 +19,10 @@
*/
package org.apache.directory.shared.ldap.model.subtree;
+
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+
/**
* A class holding a n ITEM refinement, as defined in RFC 3672
*
@@ -31,8 +33,8 @@ public class ItemRefinement implements R
{
/** The item */
private ObjectClass item;
-
-
+
+
/**
* Creates a new instance of ItemRefinement.
*
@@ -42,8 +44,8 @@ public class ItemRefinement implements R
{
this.item = item;
}
-
-
+
+
/**
* @return the item
*/
@@ -68,10 +70,10 @@ public class ItemRefinement implements R
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "item : " );
sb.append( item.getName() );
-
+
return sb.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/NotRefinement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/NotRefinement.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/NotRefinement.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/NotRefinement.java Tue Jan 24 17:44:03 2012
@@ -31,12 +31,13 @@ public class NotRefinement implements Re
/** The refinement */
private Refinement refinement;
+
public NotRefinement( Refinement refinement )
{
this.refinement = refinement;
}
-
-
+
+
/**
* @return the refinement
*/
@@ -44,18 +45,18 @@ public class NotRefinement implements Re
{
return refinement;
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "not: " );
sb.append( refinement );
-
+
return sb.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/OrRefinement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/OrRefinement.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/OrRefinement.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/OrRefinement.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.subtree;
+
import java.util.ArrayList;
import java.util.List;
@@ -34,7 +35,7 @@ public class OrRefinement implements Ref
/** The set of refinements */
private List<Refinement> refinements = new ArrayList<Refinement>();
-
+
/**
* Creates a new instance of OrRefinement.
*
@@ -44,8 +45,8 @@ public class OrRefinement implements Ref
{
this.refinements = refinements;
}
-
-
+
+
/**
* @return Gets the set of refinements
*/
@@ -53,20 +54,20 @@ public class OrRefinement implements Ref
{
return refinements;
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "or: { " );
boolean isFirst = true;
-
- for ( Refinement refinement:refinements )
+
+ for ( Refinement refinement : refinements )
{
if ( isFirst )
{
@@ -79,7 +80,7 @@ public class OrRefinement implements Ref
sb.append( refinement );
}
-
+
sb.append( " }" );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/Refinement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/Refinement.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/Refinement.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/Refinement.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.subtree;
+
/**
* An empty interface used for Refinements.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationChecker.java Tue Jan 24 17:44:03 2012
@@ -41,7 +41,7 @@ class ReusableAntlrSubtreeSpecificationC
/**
* Creates a ReusableAntlrSubtreeSpecificationParser instance.
*/
- public ReusableAntlrSubtreeSpecificationChecker(TokenStream lexer)
+ public ReusableAntlrSubtreeSpecificationChecker( TokenStream lexer )
{
super( lexer );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationCheckerLexer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationCheckerLexer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationCheckerLexer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationCheckerLexer.java Tue Jan 24 17:44:03 2012
@@ -52,7 +52,7 @@ public class ReusableAntlrSubtreeSpecifi
* @param in
* the input to the lexer
*/
- public ReusableAntlrSubtreeSpecificationCheckerLexer(Reader in)
+ public ReusableAntlrSubtreeSpecificationCheckerLexer( Reader in )
{
super( in );
savedCaseSensitive = getCaseSensitive();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationLexer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationLexer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationLexer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationLexer.java Tue Jan 24 17:44:03 2012
@@ -52,7 +52,7 @@ public class ReusableAntlrSubtreeSpecifi
* @param in
* the input to the lexer
*/
- public ReusableAntlrSubtreeSpecificationLexer(Reader in)
+ public ReusableAntlrSubtreeSpecificationLexer( Reader in )
{
super( in );
savedCaseSensitive = getCaseSensitive();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationParser.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/ReusableAntlrSubtreeSpecificationParser.java Tue Jan 24 17:44:03 2012
@@ -41,7 +41,7 @@ class ReusableAntlrSubtreeSpecificationP
/**
* Creates a ReusableAntlrSubtreeSpecificationParser instance.
*/
- public ReusableAntlrSubtreeSpecificationParser(TokenStream lexer)
+ public ReusableAntlrSubtreeSpecificationParser( TokenStream lexer )
{
super( lexer );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecification.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecification.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecification.java Tue Jan 24 17:44:03 2012
@@ -115,8 +115,8 @@ public interface SubtreeSpecification
* specification
*/
ExprNode getRefinement();
-
-
+
+
/**
* Converts this item into its string representation as stored
* in directory.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationChecker.java Tue Jan 24 17:44:03 2012
@@ -59,7 +59,7 @@ public class SubtreeSpecificationChecker
this.lexer = new ReusableAntlrSubtreeSpecificationCheckerLexer( in );
this.parser = new ReusableAntlrSubtreeSpecificationChecker( lexer );
this.parser.init( schemaManager ); // this method MUST be called while we cannot do
- // constructor overloading for antlr generated parser
+ // constructor overloading for antlr generated parser
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationParser.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/subtree/SubtreeSpecificationParser.java Tue Jan 24 17:44:03 2012
@@ -58,7 +58,7 @@ public class SubtreeSpecificationParser
public SubtreeSpecificationParser( SchemaManager schemaManager )
{
StringReader in = new StringReader( "" ); // place holder for the
- // first input
+ // first input
this.lexer = new ReusableAntlrSubtreeSpecificationLexer( in );
this.parser = new ReusableAntlrSubtreeSpecificationParser( lexer );
this.parser.init( schemaManager ); // this method MUST be called while we cannot do
@@ -70,11 +70,11 @@ public class SubtreeSpecificationParser
/**
* Creates a normalizing subtree specification parser.
*/
- public SubtreeSpecificationParser( @SuppressWarnings("rawtypes")
- NormalizerMappingResolver resolver, SchemaManager schemaManager )
+ public SubtreeSpecificationParser( @SuppressWarnings("rawtypes") NormalizerMappingResolver resolver,
+ SchemaManager schemaManager )
{
StringReader in = new StringReader( "" ); // place holder for the
- // first input
+ // first input
this.lexer = new ReusableAntlrSubtreeSpecificationLexer( in );
this.parser = new ReusableAntlrSubtreeSpecificationParser( lexer );
this.parser.setNormalizerMappingResolver( resolver );