Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaUtils.java Fri Jun 6 23:28:06 2008
@@ -423,10 +423,10 @@
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( oc.getOid() );
- if ( oc.getNames() != null && oc.getNames().length > 0 )
+ if ( oc.getNamesRef() != null && oc.getNamesRef().length > 0 )
{
buf.append( " NAME " );
- render( buf, oc.getNames() ).append( " " );
+ render( buf, oc.getNamesRef() ).append( " " );
}
else
{
@@ -542,10 +542,10 @@
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( at.getOid() );
- if ( at.getNames() != null && at.getNames().length > 0 )
+ if ( at.getNamesRef() != null && at.getNamesRef().length > 0 )
{
buf.append( " NAME " );
- render( buf, at.getNames() ).append( " " );
+ render( buf, at.getNamesRef() ).append( " " );
}
else
{
@@ -865,10 +865,10 @@
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( mr.getOid() );
- if ( mr.getNames() != null && mr.getNames().length > 0 )
+ if ( mr.getNamesRef() != null && mr.getNamesRef().length > 0 )
{
buf.append( " NAME " );
- render( buf, mr.getNames() ).append( " " );
+ render( buf, mr.getNamesRef() ).append( " " );
}
else
{
@@ -964,7 +964,7 @@
{
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( mru.getOid() ).append( " NAME " );
- render( buf, mru.getNames() ).append( " " );
+ render( buf, mru.getNamesRef() ).append( " " );
if ( mru.getDescription() != null )
{
@@ -991,7 +991,7 @@
{
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( dcr.getOid() ).append( " NAME " );
- render( buf, dcr.getNames() ).append( " " );
+ render( buf, dcr.getNamesRef() ).append( " " );
if ( dcr.getDescription() != null )
{
@@ -1018,7 +1018,7 @@
{
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( dsr.getOid() ).append( " NAME " );
- render( buf, dsr.getNames() ).append( " " );
+ render( buf, dsr.getNamesRef() ).append( " " );
if ( dsr.getDescription() != null )
{
@@ -1040,7 +1040,7 @@
{
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( nf.getOid() ).append( " NAME " );
- render( buf, nf.getNames() ).append( " " );
+ render( buf, nf.getNamesRef() ).append( " " );
if ( nf.getDescription() != null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/UsageEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/UsageEnum.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/UsageEnum.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/UsageEnum.java Fri Jun 6 23:28:06 2008
@@ -86,26 +86,26 @@
}
catch( IllegalArgumentException iae )
{
- if ( "directoryOperation".equals( usage ) )
- {
- return DIRECTORY_OPERATION;
- }
- else if ( "distributedOperation".equals( usage ) )
- {
- return DISTRIBUTED_OPERATION;
- }
- else if ( "dSAOperation".equals( usage ) )
- {
- return DSA_OPERATION;
- }
- else if ( "userApplications".equals( usage ) )
- {
- return USER_APPLICATIONS;
- }
- else
- {
- return null;
- }
+ if ( "directoryOperation".equals( usage ) )
+ {
+ return DIRECTORY_OPERATION;
+ }
+ else if ( "distributedOperation".equals( usage ) )
+ {
+ return DISTRIBUTED_OPERATION;
+ }
+ else if ( "dSAOperation".equals( usage ) )
+ {
+ return DSA_OPERATION;
+ }
+ else if ( "userApplications".equals( usage ) )
+ {
+ return USER_APPLICATIONS;
+ }
+ else
+ {
+ return null;
+ }
}
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java Fri Jun 6 23:28:06 2008
@@ -233,6 +233,10 @@
// Object overrides
// ------------------------------------------------------------------------
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
return getOid().hashCode();
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java Fri Jun 6 23:28:06 2008
@@ -160,6 +160,10 @@
// Object overrides
// ------------------------------------------------------------------------
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
return getOid().hashCode();
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParser.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParser.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/OpenLdapSchemaParser.java Fri Jun 6 23:28:06 2008
@@ -20,19 +20,20 @@
package org.apache.directory.shared.ldap.schema.parser;
-import org.apache.directory.shared.ldap.schema.parser.antlrOpenLdapSchemaLexer;
-import org.apache.directory.shared.ldap.schema.parser.antlrOpenLdapSchemaParser;
-import org.apache.directory.shared.ldap.util.ExceptionUtils;
-
-import java.util.List;
-import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.FileInputStream;
+import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
+import java.io.InputStreamReader;
import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.directory.shared.ldap.schema.syntax.AbstractSchemaDescription;
+import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.syntax.parser.AbstractSchemaParser;
+import org.apache.directory.shared.ldap.util.ExceptionUtils;
import antlr.RecognitionException;
import antlr.TokenStreamException;
@@ -44,14 +45,17 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 494164 $
*/
-public class OpenLdapSchemaParser
+public class OpenLdapSchemaParser extends AbstractSchemaParser
{
- /** the monitor to use for this parser */
- private ParserMonitor monitor = new ParserMonitorAdapter();
- /** The antlr generated parser */
- private antlrOpenLdapSchemaParser parser = null;
- /** A pipe into the parser */
- private PipedOutputStream parserIn = null;
+
+ /** The list of parsed schema descriptions */
+ private List<AbstractSchemaDescription> schemaDescriptions;
+
+ /** The list of attribute type literals, initialized by splitParsedSchemaDescriptions() */
+ private List<AttributeTypeLiteral> attributeTypeLiterals;
+
+ /** the list of object class literals, initialized by splitParsedSchemaDescriptions()*/
+ private List<ObjectClassLiteral> objectClassLiterals;
/**
@@ -67,34 +71,86 @@
/**
* Initializes a parser and its plumbing.
- *
- * @throws IOException if a pipe cannot be formed.
*/
- public void init() throws IOException
+ public void init()
{
- parserIn = new PipedOutputStream();
- PipedInputStream in = new PipedInputStream();
- parserIn.connect( in );
- antlrOpenLdapSchemaLexer lexer = new antlrOpenLdapSchemaLexer( in );
- parser = new antlrOpenLdapSchemaParser( lexer );
}
+ /**
+ * Reset the parser
+ */
public synchronized void clear()
{
- parser.clear();
}
- public List getAttributeTypes()
+ /**
+ * @return the AttributeTypes list
+ */
+ public List<AttributeTypeLiteral> getAttributeTypes()
{
- return parser.getAttributeTypes();
+ if ( attributeTypeLiterals == null )
+ {
+ splitParsedSchemaDescriptions();
+ }
+
+ return attributeTypeLiterals;
}
- public List getObjectClassTypes()
+ public List<ObjectClassLiteral> getObjectClassTypes()
{
- return parser.getObjectClasses();
+ if ( objectClassLiterals == null )
+ {
+ splitParsedSchemaDescriptions();
+ }
+
+ return objectClassLiterals;
+ }
+
+
+ private void splitParsedSchemaDescriptions()
+ {
+ objectClassLiterals = new ArrayList<ObjectClassLiteral>();
+ attributeTypeLiterals = new ArrayList<AttributeTypeLiteral>();
+
+ for ( AbstractSchemaDescription schemaDescription : schemaDescriptions )
+ {
+ if ( schemaDescription instanceof AttributeTypeDescription )
+ {
+ AttributeTypeDescription atd = ( AttributeTypeDescription ) schemaDescription;
+ AttributeTypeLiteral literal = new AttributeTypeLiteral( atd.getNumericOid() );
+ literal.setNames( atd.getNames().toArray( new String[atd.getNames().size()] ) );
+ literal.setDescription( atd.getDescription() );
+ literal.setSuperior( atd.getSuperType() );
+ literal.setEquality( atd.getEqualityMatchingRule() );
+ literal.setOrdering( atd.getOrderingMatchingRule() );
+ literal.setSubstr( atd.getSubstringsMatchingRule() );
+ literal.setSyntax( atd.getSyntax() );
+ literal.setLength( atd.getSyntaxLength() );
+ literal.setObsolete( atd.isObsolete() );
+ literal.setCollective( atd.isCollective() );
+ literal.setSingleValue( atd.isSingleValued() );
+ literal.setNoUserModification( !atd.isUserModifiable() );
+ literal.setUsage( atd.getUsage() );
+ attributeTypeLiterals.add( literal );
+ }
+ else if ( schemaDescription instanceof ObjectClassDescription )
+ {
+ ObjectClassDescription ocd = ( ObjectClassDescription ) schemaDescription;
+ ObjectClassLiteral literal = new ObjectClassLiteral( ocd.getNumericOid() );
+ literal.setNames( ocd.getNames().toArray( new String[ocd.getNames().size()] ) );
+ literal.setDescription( ocd.getDescription() );
+ literal.setSuperiors( ocd.getSuperiorObjectClasses().toArray(
+ new String[ocd.getSuperiorObjectClasses().size()] ) );
+ literal.setMay( ocd.getMayAttributeTypes().toArray( new String[ocd.getMayAttributeTypes().size()] ) );
+ literal.setMust( ocd.getMustAttributeTypes().toArray( new String[ocd.getMustAttributeTypes().size()] ) );
+ literal.setClassType( ocd.getKind() );
+ literal.setObsolete( ocd.isObsolete() );
+ objectClassLiterals.add( literal );
+ }
+ }
}
@@ -102,32 +158,36 @@
* Thread safe method parses an OpenLDAP schemaObject element/object.
*
* @param schemaObject the String image of a complete schema object
+ * @throws IOException If the schemaObject can't be transformed to a byteArrayInputStream
+ * @throws ParseException If the schemaObject can't be parsed
*/
- public synchronized void parse( String schemaObject ) throws IOException, ParseException
+ public synchronized AbstractSchemaDescription parse( String schemaObject ) throws ParseException
{
if ( schemaObject == null || schemaObject.trim().equals( "" ) )
{
throw new ParseException( "The schemaObject is either null or is " + "the empty String!", 0 );
}
- this.schemaIn = new ByteArrayInputStream( schemaObject.getBytes() );
+ reset( schemaObject ); // reset and initialize the parser / lexer pair
+ invokeParser( schemaObject );
- if ( producerThread == null )
+ if ( !schemaDescriptions.isEmpty() )
{
- producerThread = new Thread( new DataProducer() );
+ return schemaDescriptions.get( 0 );
+ }
+ else
+ {
+ return null;
}
-
- producerThread.start();
- invokeParser( schemaObject );
}
- private void invokeParser( String subject ) throws IOException, ParseException
+ private void invokeParser( String subject ) throws ParseException
{
try
{
monitor.startedParse( "starting parse on:\n" + subject );
- parser.parseSchema();
+ schemaDescriptions = parser.openLdapSchema();
monitor.finishedParse( "Done parsing!" );
}
catch ( RecognitionException e )
@@ -146,26 +206,20 @@
}
}
- byte[] buf = new byte[128];
- private InputStream schemaIn;
- private Thread producerThread;
-
/**
* Thread safe method parses a stream of OpenLDAP schemaObject elements/objects.
*
* @param schemaIn a stream of schema objects
+ * @throws IOException If the schemaObject can't be transformed to a byteArrayInputStream
+ * @throws ParseException If the schemaObject can't be parsed
*/
public synchronized void parse( InputStream schemaIn ) throws IOException, ParseException
{
- this.schemaIn = schemaIn;
-
- if ( producerThread == null )
- {
- producerThread = new Thread( new DataProducer() );
- }
+ InputStreamReader in = new InputStreamReader( schemaIn );
+ lexer.prepareNextInput( in );
+ parser.resetState();
- producerThread.start();
invokeParser( "schema input stream ==> " + schemaIn.toString() );
}
@@ -174,48 +228,16 @@
* Thread safe method parses a file of OpenLDAP schemaObject elements/objects.
*
* @param schemaFile a file of schema objects
+ * @throws IOException If the schemaObject can't be transformed to a byteArrayInputStream
+ * @throws ParseException If the schemaObject can't be parsed
*/
public synchronized void parse( File schemaFile ) throws IOException, ParseException
{
- this.schemaIn = new FileInputStream( schemaFile );
-
- if ( producerThread == null )
- {
- producerThread = new Thread( new DataProducer() );
- }
+ FileReader in = new FileReader( schemaFile );
+ lexer.prepareNextInput( in );
+ parser.resetState();
- producerThread.start();
invokeParser( "schema file ==> " + schemaFile.getAbsolutePath() );
}
-
- public void setParserMonitor( ParserMonitor monitor )
- {
- this.monitor = monitor;
- this.parser.setParserMonitor( monitor );
- }
-
- class DataProducer implements Runnable
- {
- public void run()
- {
- int count = -1;
-
- try
- {
- while ( ( count = schemaIn.read( buf ) ) != -1 )
- {
- parserIn.write( buf, 0, count );
- parserIn.flush();
- }
-
- // using an input termination token END - need extra space to return
- parserIn.write( "END ".getBytes() );
- }
- catch ( IOException e )
- {
- e.printStackTrace();
- }
- }
- }
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ACIItemSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -61,10 +61,13 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractAdsSchemaDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractAdsSchemaDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractAdsSchemaDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractAdsSchemaDescription.java Fri Jun 6 23:28:06 2008
@@ -27,6 +27,7 @@
* the BASE64 encoded bytecode of the class.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public abstract class AbstractAdsSchemaDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java Fri Jun 6 23:28:06 2008
@@ -112,6 +112,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
return numericOid.hashCode();
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -24,13 +24,11 @@
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
/**
- * Document me.
+ * The abstrcat class implementing common operations for the syntax checking.
*
- * @todo put me into shared-ldap
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 485042 $
*/
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AcceptAllSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -59,6 +59,8 @@
/**
* @see SyntaxChecker#getSyntaxOid()
+ *
+ * @return the OID syntax
*/
public String getSyntaxOid()
{
@@ -70,6 +72,9 @@
* Returns true every time.
*
* @see SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
@@ -81,6 +86,9 @@
* Does nothing but return immediately and no exceptions are ever thrown.
*
* @see SyntaxChecker#assertSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @throws NamingException if the value does not conform to the attribute syntax.
*/
public void assertSyntax( Object value ) throws NamingException
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AccessPointSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -54,6 +54,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescription.java Fri Jun 6 23:28:06 2008
@@ -28,6 +28,7 @@
* RFC 4512 - 4.1.2. Attribute Types
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class AttributeTypeDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -74,7 +74,7 @@
/** The Syntax OID, according to RFC 4517, par. 3.3.1 */
private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.3";
- /** The schema parser used to parse the AttributeTypeDescription Syntax */
+ /** The schema parser used to parse the AttributeTypeDescription Syntax */
private AttributeTypeDescriptionSchemaParser schemaParser = new AttributeTypeDescriptionSchemaParser();
/**
@@ -104,7 +104,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeUsageSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -66,7 +66,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
@@ -103,10 +103,8 @@
{
return true;
}
- else
- {
- return false;
- }
+
+ return false;
case( 'u' ):
return "userApplications".equals( strValue );
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AudioSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -60,6 +60,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BinarySyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -58,6 +58,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BitStringSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -20,8 +20,8 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -117,7 +117,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/BooleanSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -20,8 +20,8 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -65,7 +65,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateListSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -62,6 +62,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificatePairSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -62,6 +62,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CertificateSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -62,6 +62,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ComparatorDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ComparatorDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ComparatorDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ComparatorDescription.java Fri Jun 6 23:28:06 2008
@@ -25,6 +25,7 @@
* An ApacheDS specific schema description.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class ComparatorDescription extends AbstractAdsSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/CountrySyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -58,7 +58,8 @@
"JE", "JM", "JO", "JP",
"KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ",
"LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY",
- "MA", "MC", "MD", "ME", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ",
+ "MA", "MC", "MD", "ME", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX",
+ "MY", "MZ",
"NA", "NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ",
"OM",
"PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY",
@@ -74,7 +75,7 @@
};
/** The Set which contains the countries */
- private final static Set<String> COUNTRIES = new HashSet<String>();
+ private static final Set<String> COUNTRIES = new HashSet<String>();
/** Initialization of the country set */
static
@@ -113,7 +114,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescription.java Fri Jun 6 23:28:06 2008
@@ -29,6 +29,7 @@
* RFC 4512 - 4.1.6. DIT Content Rule Description
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class DITContentRuleDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITContentRuleDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -84,7 +84,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescription.java Fri Jun 6 23:28:06 2008
@@ -29,6 +29,7 @@
* RFC 4512 - 4.1.7. DIT Structure Rule Description
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class DITStructureRuleDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DITStructureRuleDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -85,7 +85,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DLSubmitPermissionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -54,6 +54,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DNSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -63,7 +63,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSAQualitySyntaxSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -71,7 +71,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DSETypeSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -55,7 +55,7 @@
/** The Set which contains the DESBits */
- private final static Set<String> DSE_BITS = new HashSet<String>();
+ private static final Set<String> DSE_BITS = new HashSet<String>();
/** Initialization of the country set */
static
@@ -95,7 +95,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
@@ -158,7 +158,7 @@
String keyword = strValue.substring( i, pos );
i = pos;
- if ( DSE_BITS.contains( keyword ) == false )
+ if ( !DSE_BITS.contains( keyword ) )
{
// Unkown keyword
return false;
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DataQualitySyntaxSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -54,6 +54,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DeliveryMethodSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -57,7 +57,7 @@
};
/** The Set which contains the delivery methods */
- private final static Set<String> DELIVERY_METHODS = new HashSet<String>();
+ private static final Set<String> DELIVERY_METHODS = new HashSet<String>();
/** Initialization of the delivery methods set */
static
@@ -96,8 +96,13 @@
* Check if the string contains a delivery method which has
* not already been found.
*
+ * @param strValue The string we want to look into for a PDM
+ * @param pos The current position in the string
+ * @param pdms The set containing all the PDM
+ * @return if a Prefered Delivery Method is found in the given string, returns
+ * its position, otherwise, returns -1
*/
- private int isPdm( String strValue, int pos, Set<String> pmds )
+ private int isPdm( String strValue, int pos, Set<String> pdms )
{
int start = pos;
@@ -112,23 +117,23 @@
return -1;
}
- String pmd = strValue.substring( start, pos );
+ String pdm = strValue.substring( start, pos );
- if ( ! DELIVERY_METHODS.contains( pmd ) )
+ if ( ! DELIVERY_METHODS.contains( pdm ) )
{
// The delivery method is unknown
return -1;
}
else
{
- if ( pmds.contains( pmd ) )
+ if ( pdms.contains( pdm ) )
{
// The delivery method has already been found
return -1;
}
else
{
- pmds.add( pmd );
+ pdms.add( pdm );
return pos;
}
}
@@ -139,7 +144,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/DirectoryStringSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -20,8 +20,8 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -63,7 +63,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/EnhancedGuideSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -57,6 +57,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FacsimileTelephoneNumberSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -54,13 +54,13 @@
private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.22";
/** Fax parameters possible values */
- private final static String TWO_DIMENSIONAL = "twoDimensional";
- private final static String FINE_RESOLUTION = "fineResolution";
- private final static String UNLIMITED_LENGTH = "unlimitedLength";
- private final static String B4_LENGTH = "b4Length";
- private final static String A3_LENGTH = "a3Width";
- private final static String B4_WIDTH = "b4Width";
- private final static String UNCOMPRESSED = "uncompressed";
+ private static final String TWO_DIMENSIONAL = "twoDimensional";
+ private static final String FINE_RESOLUTION = "fineResolution";
+ private static final String UNLIMITED_LENGTH = "unlimitedLength";
+ private static final String B4_LENGTH = "b4Length";
+ private static final String A3_LENGTH = "a3Width";
+ private static final String B4_WIDTH = "b4Width";
+ private static final String UNCOMPRESSED = "uncompressed";
/** A set which contaons all the possible fax parameters values */
private static Set<String> faxParameters = new HashSet<String>();
@@ -103,7 +103,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/FaxSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -57,6 +57,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GeneralizedTimeSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -22,8 +22,8 @@
import java.util.regex.Pattern;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -110,7 +110,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/GuideSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -56,6 +56,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/Ia5StringSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -65,7 +65,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/IntegerSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -20,8 +20,8 @@
package org.apache.directory.shared.ldap.schema.syntax;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -71,7 +71,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue =null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -71,7 +71,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -72,7 +72,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue =null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -71,7 +71,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -71,7 +71,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescription.java Fri Jun 6 23:28:06 2008
@@ -29,10 +29,16 @@
* RFC 4512 - 4.1.5. LDAP Syntaxes
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class LdapSyntaxDescription extends AbstractSchemaDescription
{
+ /**
+ *
+ * Creates a new instance of LdapSyntaxDescription.
+ *
+ */
public LdapSyntaxDescription()
{
this.numericOid = "";
@@ -41,18 +47,6 @@
}
- public List<String> getNames()
- {
- throw new UnsupportedOperationException( "Not supported by LdapSyntaxDescription" );
- }
-
-
- public void setNames( List<String> names )
- {
- throw new UnsupportedOperationException( "Not supported by LdapSyntaxDescription" );
- }
-
-
public boolean isObsolete()
{
throw new UnsupportedOperationException( "Not supported by LdapSyntaxDescription" );
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -46,7 +46,7 @@
/** The Syntax OID, according to RFC 4517, par. 3.3.18 */
private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.54";
- /** The schema parser used to parse the LdapSyntaxDescription Syntax */
+ /** The schema parser used to parse the LdapSyntaxDescription Syntax */
private LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
@@ -77,7 +77,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue =null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MHSORAddressSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -55,6 +55,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MailPreferenceSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -67,7 +67,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue =null;
if ( value == null )
{
@@ -92,6 +92,7 @@
return false;
}
- return ( ( "NO-LISTS".equals( strValue ) ) || ( "ANY-LIST".equals( strValue ) ) || ( "PROFESSIONAL-LISTS".equals( strValue ) ) );
+ return ( ( "NO-LISTS".equals( strValue ) ) || ( "ANY-LIST".equals( strValue ) ) ||
+ ( "PROFESSIONAL-LISTS".equals( strValue ) ) );
}
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MasterAndShadowAccessPointSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -55,6 +55,9 @@
/**
* @see org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker#isValidSyntax(Object)
+ *
+ * @param value the value of some attribute with the syntax
+ * @return true if the value is in the valid syntax, false otherwise
*/
public boolean isValidSyntax( Object value )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescription.java Fri Jun 6 23:28:06 2008
@@ -25,25 +25,39 @@
* RFC 4512 - 4.1.3. Matching Rule Description
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class MatchingRuleDescription extends AbstractSchemaDescription
{
-
+ /** The matching rule's description */
private String syntax;
+ /**
+ *
+ * Creates a new instance of MatchingRuleDescription.
+ *
+ */
public MatchingRuleDescription()
{
syntax = null;
}
+ /**
+ * @return The matchingRule's syntax description
+ */
public String getSyntax()
{
return syntax;
}
+ /**
+ * Set the matchingRule's syntax description
+ *
+ * @param syntax The description
+ */
public void setSyntax( String syntax )
{
this.syntax = syntax;
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -53,7 +53,7 @@
/** The Syntax OID, according to RFC 4517, par. 3.3.19 */
private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.30";
- /** The schema parser used to parse the MatchingRuleDescription Syntax */
+ /** The schema parser used to parse the MatchingRuleDescription Syntax */
private MatchingRuleDescriptionSchemaParser schemaParser = new MatchingRuleDescriptionSchemaParser();
@@ -85,7 +85,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescription.java Fri Jun 6 23:28:06 2008
@@ -30,6 +30,7 @@
* RFC 4512 - 4.1.4. Matching Rule Use Description
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class MatchingRuleUseDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -50,7 +50,7 @@
/** The Syntax OID, according to RFC 4517, par. 3.3.20 */
private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.31";
- /** The schema parser used to parse the MatchingRuleUseDescription Syntax */
+ /** The schema parser used to parse the MatchingRuleUseDescription Syntax */
private MatchingRuleUseDescriptionSchemaParser schemaParser = new MatchingRuleUseDescriptionSchemaParser();
@@ -82,7 +82,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameAndOptionalUIDSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -72,7 +72,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescription.java Fri Jun 6 23:28:06 2008
@@ -29,6 +29,7 @@
* RFC 4512 - 4.1.7.2. Name Form Description
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class NameFormDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NameFormDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -83,7 +83,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NormalizerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NormalizerDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NormalizerDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NormalizerDescription.java Fri Jun 6 23:28:06 2008
@@ -25,6 +25,7 @@
* An ApacheDS specific schema description.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class NormalizerDescription extends AbstractAdsSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumberSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -68,7 +68,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericOidSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -74,7 +74,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/NumericStringSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -72,7 +72,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescription.java Fri Jun 6 23:28:06 2008
@@ -31,6 +31,7 @@
* RFC 4512 - 4.1.1. Object Class Description
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class ObjectClassDescription extends AbstractSchemaDescription
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -57,7 +57,7 @@
/** The Syntax OID, according to RFC 4517, par. 3.3.24 */
private static final String SC_OID = "1.3.6.1.4.1.1466.115.121.1.37";
- /** The schema parser used to parse the ObjectClassDescription Syntax */
+ /** The schema parser used to parse the ObjectClassDescription Syntax */
private ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
@@ -89,7 +89,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassTypeSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -63,7 +63,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
@@ -97,10 +97,8 @@
{
return true;
}
- else
- {
- return false;
- }
+
+ return false;
case( 'S' ):
return "STRUCTURAL".equals( strValue );
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectNameSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -80,7 +80,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidLenSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -76,7 +76,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java?rev=664290&r1=664289&r2=664290&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/OidSyntaxChecker.java Fri Jun 6 23:28:06 2008
@@ -79,7 +79,7 @@
*/
public boolean isValidSyntax( Object value )
{
- String strValue;
+ String strValue = null;
if ( value == null )
{
|