directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r577354 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax: JavaByteSyntaxChecker.java JavaIntegerSyntaxChecker.java JavaLongSyntaxChecker.java JavaShortSyntaxChecker.java
Date Wed, 19 Sep 2007 16:44:06 GMT
Author: elecharny
Date: Wed Sep 19 09:44:03 2007
New Revision: 577354

URL: http://svn.apache.org/viewvc?rev=577354&view=rev
Log:
Removed the ^M

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java?rev=577354&r1=577353&r2=577354&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaByteSyntaxChecker.java
Wed Sep 19 09:44:03 2007
@@ -1,159 +1,159 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.shared.ldap.schema.syntax;
-
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-/**
- * A SyntaxChecker which verifies that a value is a valid Java primitive short or
- * the Short wrapper.  Essentially this constrains the min and max values of
- * the Integer.
- *
- * From RFC 4517 :
- *
- * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
- *
- * From RFC 4512 :
- * number  = DIGIT | ( LDIGIT 1*DIGIT )
- * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
- * LDIGIT  = %x31-39             ; "1"-"9"
- * HYPHEN  = %x2D                ; hyphen ("-")
- *
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class JavaByteSyntaxChecker extends AbstractSyntaxChecker
-{
-    /**
-     *
-     * Creates a new instance of JavaByteSyntaxChecker.
-     *
-     */
-    public JavaByteSyntaxChecker()
-    {
-        super( SchemaConstants.JAVA_BYTE_SYNTAX );
-    }
-
-
-    /**
-     *
-     * Creates a new instance of JavaByteSyntaxChecker.
-     *
-     * @param oid the oid to associate with this new SyntaxChecker
-     *
-     */
-    protected JavaByteSyntaxChecker( String oid )
-    {
-        super( oid );
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
-     */
-    public boolean isValidSyntax( Object value )
-    {
-        String strValue;
-
-        if ( value == null )
-        {
-            return false;
-        }
-
-        if ( value instanceof String )
-        {
-            strValue = ( String ) value;
-        }
-        else if ( value instanceof byte[] )
-        {
-            strValue = StringTools.utf8ToString( ( byte[] ) value );
-        }
-        else
-        {
-            strValue = value.toString();
-        }
-
-        if ( strValue.length() == 0 )
-        {
-            return false;
-        }
-
-        // The first char must be either a '-' or in [0..9].
-        // If it's a '0', then there should be any other char after
-        int pos = 0;
-        char c = strValue.charAt( pos );
-
-        if ( c == '-' )
-        {
-            pos = 1;
-        }
-        else if ( !StringTools.isDigit( c ) )
-        {
-            return false;
-        }
-        else if ( c == '0' )
-        {
-            if ( strValue.length() > 1 )
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        // We must have at least a digit which is not '0'
-        if ( !StringTools.isDigit( strValue, pos ) )
-        {
-            return false;
-        }
-        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
-        {
-            return false;
-        }
-        else
-        {
-            pos++;
-        }
-
-        while ( StringTools.isDigit( strValue, pos) )
-        {
-            pos++;
-        }
-
-        if ( pos != strValue.length() )
-        {
-            return false;
-        }
-
-        // Should get a NumberFormatException for Byte values out of range
-        try
-        {
-            Byte.valueOf( strValue );
-            return true;
-        }
-        catch ( NumberFormatException e )
-        {
-            return false;
-        }
-    }
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntax;
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+/**
+ * A SyntaxChecker which verifies that a value is a valid Java primitive short or
+ * the Short wrapper.  Essentially this constrains the min and max values of
+ * the Integer.
+ *
+ * From RFC 4517 :
+ *
+ * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
+ *
+ * From RFC 4512 :
+ * number  = DIGIT | ( LDIGIT 1*DIGIT )
+ * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
+ * LDIGIT  = %x31-39             ; "1"-"9"
+ * HYPHEN  = %x2D                ; hyphen ("-")
+ *
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class JavaByteSyntaxChecker extends AbstractSyntaxChecker
+{
+    /**
+     *
+     * Creates a new instance of JavaByteSyntaxChecker.
+     *
+     */
+    public JavaByteSyntaxChecker()
+    {
+        super( SchemaConstants.JAVA_BYTE_SYNTAX );
+    }
+
+
+    /**
+     *
+     * Creates a new instance of JavaByteSyntaxChecker.
+     *
+     * @param oid the oid to associate with this new SyntaxChecker
+     *
+     */
+    protected JavaByteSyntaxChecker( String oid )
+    {
+        super( oid );
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
+     */
+    public boolean isValidSyntax( Object value )
+    {
+        String strValue;
+
+        if ( value == null )
+        {
+            return false;
+        }
+
+        if ( value instanceof String )
+        {
+            strValue = ( String ) value;
+        }
+        else if ( value instanceof byte[] )
+        {
+            strValue = StringTools.utf8ToString( ( byte[] ) value );
+        }
+        else
+        {
+            strValue = value.toString();
+        }
+
+        if ( strValue.length() == 0 )
+        {
+            return false;
+        }
+
+        // The first char must be either a '-' or in [0..9].
+        // If it's a '0', then there should be any other char after
+        int pos = 0;
+        char c = strValue.charAt( pos );
+
+        if ( c == '-' )
+        {
+            pos = 1;
+        }
+        else if ( !StringTools.isDigit( c ) )
+        {
+            return false;
+        }
+        else if ( c == '0' )
+        {
+            if ( strValue.length() > 1 )
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        // We must have at least a digit which is not '0'
+        if ( !StringTools.isDigit( strValue, pos ) )
+        {
+            return false;
+        }
+        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
+        {
+            return false;
+        }
+        else
+        {
+            pos++;
+        }
+
+        while ( StringTools.isDigit( strValue, pos) )
+        {
+            pos++;
+        }
+
+        if ( pos != strValue.length() )
+        {
+            return false;
+        }
+
+        // Should get a NumberFormatException for Byte values out of range
+        try
+        {
+            Byte.valueOf( strValue );
+            return true;
+        }
+        catch ( NumberFormatException e )
+        {
+            return false;
+        }
+    }
+}

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java?rev=577354&r1=577353&r2=577354&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaIntegerSyntaxChecker.java
Wed Sep 19 09:44:03 2007
@@ -1,152 +1,152 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.shared.ldap.schema.syntax;
-
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-
-/**
- * A SyntaxChecker which verifies that a value is a valid Java primitive int or
- * the Integer wrapper.  Essentially this constrains the min and max values of
- * the Integer.
- *
- * From RFC 4517 :
- *
- * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
- *
- * From RFC 4512 :
- * number  = DIGIT | ( LDIGIT 1*DIGIT )
- * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
- * LDIGIT  = %x31-39             ; "1"-"9"
- * HYPHEN  = %x2D                ; hyphen ("-")
- *
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class JavaIntegerSyntaxChecker extends AbstractSyntaxChecker
-{
-    /**
-     *
-     * Creates a new instance of IntegerSyntaxChecker.
-     *
-     */
-    public JavaIntegerSyntaxChecker()
-    {
-        super( SchemaConstants.JAVA_INT_SYNTAX );
-    }
-
-
-    /**
-     *
-     * Creates a new instance of IntegerSyntaxChecker.
-     *
-     * @param oid the oid to associate with this new SyntaxChecker
-     *
-     */
-    protected JavaIntegerSyntaxChecker( String oid )
-    {
-        super( oid );
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
-     */
-    public boolean isValidSyntax( Object value )
-    {
-        String strValue;
-
-        if ( value == null )
-        {
-            return false;
-        }
-
-        if ( value instanceof String )
-        {
-            strValue = ( String ) value;
-        }
-        else if ( value instanceof byte[] )
-        {
-            strValue = StringTools.utf8ToString( ( byte[] ) value );
-        }
-        else
-        {
-            strValue = value.toString();
-        }
-
-        if ( strValue.length() == 0 )
-        {
-            return false;
-        }
-
-        // The first char must be either a '-' or in [0..9].
-        // If it's a '0', then there should be any other char after
-        int pos = 0;
-        char c = strValue.charAt( pos );
-
-        if ( c == '-' )
-        {
-            pos = 1;
-        }
-        else if ( !StringTools.isDigit( c ) )
-        {
-            return false;
-        }
-        else if ( c == '0' )
-        {
-            return strValue.length() <= 1;
-        }
-
-        // We must have at least a digit which is not '0'
-        if ( !StringTools.isDigit( strValue, pos ) )
-        {
-            return false;
-        }
-        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
-        {
-            return false;
-        }
-        else
-        {
-            pos++;
-        }
-
-        while ( StringTools.isDigit( strValue, pos) )
-        {
-            pos++;
-        }
-
-        if ( pos != strValue.length() )
-        {
-            return false;
-        }
-
-        try
-        {
-            Integer.valueOf( strValue );
-            return true;
-        }
-        catch ( NumberFormatException e )
-        {
-            return false;
-        }
-    }
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntax;
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+
+/**
+ * A SyntaxChecker which verifies that a value is a valid Java primitive int or
+ * the Integer wrapper.  Essentially this constrains the min and max values of
+ * the Integer.
+ *
+ * From RFC 4517 :
+ *
+ * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
+ *
+ * From RFC 4512 :
+ * number  = DIGIT | ( LDIGIT 1*DIGIT )
+ * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
+ * LDIGIT  = %x31-39             ; "1"-"9"
+ * HYPHEN  = %x2D                ; hyphen ("-")
+ *
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class JavaIntegerSyntaxChecker extends AbstractSyntaxChecker
+{
+    /**
+     *
+     * Creates a new instance of IntegerSyntaxChecker.
+     *
+     */
+    public JavaIntegerSyntaxChecker()
+    {
+        super( SchemaConstants.JAVA_INT_SYNTAX );
+    }
+
+
+    /**
+     *
+     * Creates a new instance of IntegerSyntaxChecker.
+     *
+     * @param oid the oid to associate with this new SyntaxChecker
+     *
+     */
+    protected JavaIntegerSyntaxChecker( String oid )
+    {
+        super( oid );
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
+     */
+    public boolean isValidSyntax( Object value )
+    {
+        String strValue;
+
+        if ( value == null )
+        {
+            return false;
+        }
+
+        if ( value instanceof String )
+        {
+            strValue = ( String ) value;
+        }
+        else if ( value instanceof byte[] )
+        {
+            strValue = StringTools.utf8ToString( ( byte[] ) value );
+        }
+        else
+        {
+            strValue = value.toString();
+        }
+
+        if ( strValue.length() == 0 )
+        {
+            return false;
+        }
+
+        // The first char must be either a '-' or in [0..9].
+        // If it's a '0', then there should be any other char after
+        int pos = 0;
+        char c = strValue.charAt( pos );
+
+        if ( c == '-' )
+        {
+            pos = 1;
+        }
+        else if ( !StringTools.isDigit( c ) )
+        {
+            return false;
+        }
+        else if ( c == '0' )
+        {
+            return strValue.length() <= 1;
+        }
+
+        // We must have at least a digit which is not '0'
+        if ( !StringTools.isDigit( strValue, pos ) )
+        {
+            return false;
+        }
+        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
+        {
+            return false;
+        }
+        else
+        {
+            pos++;
+        }
+
+        while ( StringTools.isDigit( strValue, pos) )
+        {
+            pos++;
+        }
+
+        if ( pos != strValue.length() )
+        {
+            return false;
+        }
+
+        try
+        {
+            Integer.valueOf( strValue );
+            return true;
+        }
+        catch ( NumberFormatException e )
+        {
+            return false;
+        }
+    }
+}

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java?rev=577354&r1=577353&r2=577354&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaLongSyntaxChecker.java
Wed Sep 19 09:44:03 2007
@@ -1,159 +1,159 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.shared.ldap.schema.syntax;
-
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-/**
- * A SyntaxChecker which verifies that a value is a valid Java primitive long or
- * the Long wrapper.  Essentially this constrains the min and max values of
- * the Integer.
- *
- * From RFC 4517 :
- *
- * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
- *
- * From RFC 4512 :
- * number  = DIGIT | ( LDIGIT 1*DIGIT )
- * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
- * LDIGIT  = %x31-39             ; "1"-"9"
- * HYPHEN  = %x2D                ; hyphen ("-")
- *
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class JavaLongSyntaxChecker extends AbstractSyntaxChecker
-{
-    /**
-     *
-     * Creates a new instance of JavaLongSyntaxChecker.
-     *
-     */
-    public JavaLongSyntaxChecker()
-    {
-        super( SchemaConstants.JAVA_LONG_SYNTAX );
-    }
-
-
-    /**
-     *
-     * Creates a new instance of JavaLongSyntaxChecker.
-     *
-     * @param oid the oid to associate with this new SyntaxChecker
-     *
-     */
-    protected JavaLongSyntaxChecker( String oid )
-    {
-        super( oid );
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
-     */
-    public boolean isValidSyntax( Object value )
-    {
-        String strValue;
-
-        if ( value == null )
-        {
-            return false;
-        }
-
-        if ( value instanceof String )
-        {
-            strValue = ( String ) value;
-        }
-        else if ( value instanceof byte[] )
-        {
-            strValue = StringTools.utf8ToString( ( byte[] ) value );
-        }
-        else
-        {
-            strValue = value.toString();
-        }
-
-        if ( strValue.length() == 0 )
-        {
-            return false;
-        }
-
-        // The first char must be either a '-' or in [0..9].
-        // If it's a '0', then there should be any other char after
-        int pos = 0;
-        char c = strValue.charAt( pos );
-
-        if ( c == '-' )
-        {
-            pos = 1;
-        }
-        else if ( !StringTools.isDigit( c ) )
-        {
-            return false;
-        }
-        else if ( c == '0' )
-        {
-            if ( strValue.length() > 1 )
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        // We must have at least a digit which is not '0'
-        if ( !StringTools.isDigit( strValue, pos ) )
-        {
-            return false;
-        }
-        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
-        {
-            return false;
-        }
-        else
-        {
-            pos++;
-        }
-
-        while ( StringTools.isDigit( strValue, pos) )
-        {
-            pos++;
-        }
-
-        if ( pos != strValue.length() )
-        {
-            return false;
-        }
-
-        // Should get a NumberFormatException for Byte values out of range
-        try
-        {
-            Long.valueOf( strValue );
-            return true;
-        }
-        catch ( NumberFormatException e )
-        {
-            return false;
-        }
-    }
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntax;
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+/**
+ * A SyntaxChecker which verifies that a value is a valid Java primitive long or
+ * the Long wrapper.  Essentially this constrains the min and max values of
+ * the Integer.
+ *
+ * From RFC 4517 :
+ *
+ * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
+ *
+ * From RFC 4512 :
+ * number  = DIGIT | ( LDIGIT 1*DIGIT )
+ * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
+ * LDIGIT  = %x31-39             ; "1"-"9"
+ * HYPHEN  = %x2D                ; hyphen ("-")
+ *
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class JavaLongSyntaxChecker extends AbstractSyntaxChecker
+{
+    /**
+     *
+     * Creates a new instance of JavaLongSyntaxChecker.
+     *
+     */
+    public JavaLongSyntaxChecker()
+    {
+        super( SchemaConstants.JAVA_LONG_SYNTAX );
+    }
+
+
+    /**
+     *
+     * Creates a new instance of JavaLongSyntaxChecker.
+     *
+     * @param oid the oid to associate with this new SyntaxChecker
+     *
+     */
+    protected JavaLongSyntaxChecker( String oid )
+    {
+        super( oid );
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
+     */
+    public boolean isValidSyntax( Object value )
+    {
+        String strValue;
+
+        if ( value == null )
+        {
+            return false;
+        }
+
+        if ( value instanceof String )
+        {
+            strValue = ( String ) value;
+        }
+        else if ( value instanceof byte[] )
+        {
+            strValue = StringTools.utf8ToString( ( byte[] ) value );
+        }
+        else
+        {
+            strValue = value.toString();
+        }
+
+        if ( strValue.length() == 0 )
+        {
+            return false;
+        }
+
+        // The first char must be either a '-' or in [0..9].
+        // If it's a '0', then there should be any other char after
+        int pos = 0;
+        char c = strValue.charAt( pos );
+
+        if ( c == '-' )
+        {
+            pos = 1;
+        }
+        else if ( !StringTools.isDigit( c ) )
+        {
+            return false;
+        }
+        else if ( c == '0' )
+        {
+            if ( strValue.length() > 1 )
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        // We must have at least a digit which is not '0'
+        if ( !StringTools.isDigit( strValue, pos ) )
+        {
+            return false;
+        }
+        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
+        {
+            return false;
+        }
+        else
+        {
+            pos++;
+        }
+
+        while ( StringTools.isDigit( strValue, pos) )
+        {
+            pos++;
+        }
+
+        if ( pos != strValue.length() )
+        {
+            return false;
+        }
+
+        // Should get a NumberFormatException for Byte values out of range
+        try
+        {
+            Long.valueOf( strValue );
+            return true;
+        }
+        catch ( NumberFormatException e )
+        {
+            return false;
+        }
+    }
+}

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java?rev=577354&r1=577353&r2=577354&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/JavaShortSyntaxChecker.java
Wed Sep 19 09:44:03 2007
@@ -1,159 +1,159 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *  
- *    http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License. 
- *  
- */
-package org.apache.directory.shared.ldap.schema.syntax;
-
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-/**
- * A SyntaxChecker which verifies that a value is a valid Java primitive int or
- * the Integer wrapper.  Essentially this constrains the min and max values of
- * the Integer.
- *
- * From RFC 4517 :
- *
- * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
- *
- * From RFC 4512 :
- * number  = DIGIT | ( LDIGIT 1*DIGIT )
- * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
- * LDIGIT  = %x31-39             ; "1"-"9"
- * HYPHEN  = %x2D                ; hyphen ("-")
- *
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class JavaShortSyntaxChecker extends AbstractSyntaxChecker
-{
-    /**
-     *
-     * Creates a new instance of IntegerSyntaxChecker.
-     *
-     */
-    public JavaShortSyntaxChecker()
-    {
-        super( SchemaConstants.JAVA_SHORT_SYNTAX );
-    }
-
-
-    /**
-     *
-     * Creates a new instance of IntegerSyntaxChecker.
-     *
-     * @param oid the oid to associate with this new SyntaxChecker
-     *
-     */
-    protected JavaShortSyntaxChecker( String oid )
-    {
-        super( oid );
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
-     */
-    public boolean isValidSyntax( Object value )
-    {
-        String strValue;
-
-        if ( value == null )
-        {
-            return false;
-        }
-
-        if ( value instanceof String )
-        {
-            strValue = ( String ) value;
-        }
-        else if ( value instanceof byte[] )
-        {
-            strValue = StringTools.utf8ToString( ( byte[] ) value );
-        }
-        else
-        {
-            strValue = value.toString();
-        }
-
-        if ( strValue.length() == 0 )
-        {
-            return false;
-        }
-
-        // The first char must be either a '-' or in [0..9].
-        // If it's a '0', then there should be any other char after
-        int pos = 0;
-        char c = strValue.charAt( pos );
-
-        if ( c == '-' )
-        {
-            pos = 1;
-        }
-        else if ( !StringTools.isDigit( c ) )
-        {
-            return false;
-        }
-        else if ( c == '0' )
-        {
-            if ( strValue.length() > 1 )
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-        }
-
-        // We must have at least a digit which is not '0'
-        if ( !StringTools.isDigit( strValue, pos ) )
-        {
-            return false;
-        }
-        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
-        {
-            return false;
-        }
-        else
-        {
-            pos++;
-        }
-
-        while ( StringTools.isDigit( strValue, pos) )
-        {
-            pos++;
-        }
-
-        if ( pos != strValue.length() )
-        {
-            return false;
-        }
-
-        // Should get a NumberFormatException for Byte values out of range
-        try
-        {
-            Short.valueOf( strValue );
-            return true;
-        }
-        catch ( NumberFormatException e )
-        {
-            return false;
-        }
-    }
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntax;
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.util.StringTools;
+
+/**
+ * A SyntaxChecker which verifies that a value is a valid Java primitive int or
+ * the Integer wrapper.  Essentially this constrains the min and max values of
+ * the Integer.
+ *
+ * From RFC 4517 :
+ *
+ * Integer = ( HYPHEN LDIGIT *DIGIT ) | number
+ *
+ * From RFC 4512 :
+ * number  = DIGIT | ( LDIGIT 1*DIGIT )
+ * DIGIT   = %x30 | LDIGIT       ; "0"-"9"
+ * LDIGIT  = %x31-39             ; "1"-"9"
+ * HYPHEN  = %x2D                ; hyphen ("-")
+ *
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class JavaShortSyntaxChecker extends AbstractSyntaxChecker
+{
+    /**
+     *
+     * Creates a new instance of IntegerSyntaxChecker.
+     *
+     */
+    public JavaShortSyntaxChecker()
+    {
+        super( SchemaConstants.JAVA_SHORT_SYNTAX );
+    }
+
+
+    /**
+     *
+     * Creates a new instance of IntegerSyntaxChecker.
+     *
+     * @param oid the oid to associate with this new SyntaxChecker
+     *
+     */
+    protected JavaShortSyntaxChecker( String oid )
+    {
+        super( oid );
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.schema.SyntaxChecker#isValidSyntax(java.lang.Object)
+     */
+    public boolean isValidSyntax( Object value )
+    {
+        String strValue;
+
+        if ( value == null )
+        {
+            return false;
+        }
+
+        if ( value instanceof String )
+        {
+            strValue = ( String ) value;
+        }
+        else if ( value instanceof byte[] )
+        {
+            strValue = StringTools.utf8ToString( ( byte[] ) value );
+        }
+        else
+        {
+            strValue = value.toString();
+        }
+
+        if ( strValue.length() == 0 )
+        {
+            return false;
+        }
+
+        // The first char must be either a '-' or in [0..9].
+        // If it's a '0', then there should be any other char after
+        int pos = 0;
+        char c = strValue.charAt( pos );
+
+        if ( c == '-' )
+        {
+            pos = 1;
+        }
+        else if ( !StringTools.isDigit( c ) )
+        {
+            return false;
+        }
+        else if ( c == '0' )
+        {
+            if ( strValue.length() > 1 )
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        // We must have at least a digit which is not '0'
+        if ( !StringTools.isDigit( strValue, pos ) )
+        {
+            return false;
+        }
+        else if ( StringTools.isCharASCII( strValue, pos, '0' ) )
+        {
+            return false;
+        }
+        else
+        {
+            pos++;
+        }
+
+        while ( StringTools.isDigit( strValue, pos) )
+        {
+            pos++;
+        }
+
+        if ( pos != strValue.length() )
+        {
+            return false;
+        }
+
+        // Should get a NumberFormatException for Byte values out of range
+        try
+        {
+            Short.valueOf( strValue );
+            return true;
+        }
+        catch ( NumberFormatException e )
+        {
+            return false;
+        }
+    }
+}



Mime
View raw message