You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/11/12 06:58:00 UTC
svn commit: r1201200 - in /directory/shared/trunk:
asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/
dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/repons...
Author: elecharny
Date: Sat Nov 12 05:58:00 2011
New Revision: 1201200
URL: http://svn.apache.org/viewvc?rev=1201200&view=rev
Log:
Replaced tabs by spaces
Modified:
directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java Sat Nov 12 05:58:00 2011
@@ -152,7 +152,7 @@ public class Value
* @return Returns the data.
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EI_EXPOSE_REP",
- justification="The return of the direct value (without cloning) was intended. Even if we modify the interned value, it won't have any impact")
+ justification="The return of the direct value (without cloning) was intended. Even if we modify the interned value, it won't have any impact")
public byte[] getData()
{
return data;
Modified: directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.dsmlv2.engine;
@@ -152,7 +152,7 @@ public class Dsmlv2Engine
*
* Creates a new instance of Dsmlv2Engine.
*
- * @param connection an unbound active connection
+ * @param connection an unbound active connection
* @param user the user name to be used to bind this connection to the server
* @param password user's credentials
*/
@@ -168,7 +168,7 @@ public class Dsmlv2Engine
/**
* Processes the file given and return the result of the operations
*
- * @param dsmlInput
+ * @param dsmlInput
* the DSMLv2 formatted request input
* @return
* the XML response in DSMLv2 Format
@@ -187,9 +187,9 @@ public class Dsmlv2Engine
/**
* Processes the file given and return the result of the operations
*
- * @param fileName
+ * @param fileName
* the path to the file
- * @return
+ * @return
* the XML response in DSMLv2 Format
* @throws XmlPullParserException
* if an error occurs in the parser
@@ -225,7 +225,7 @@ public class Dsmlv2Engine
/**
* uses the default UTF-8 encoding for processing the DSML
*
- * @see #processDSML(InputStream, String, OutputStream)
+ * @see #processDSML(InputStream, String, OutputStream)
*/
public void processDSML( InputStream inputStream, OutputStream out ) throws Exception
{
@@ -234,7 +234,7 @@ public class Dsmlv2Engine
/**
- * process the DSML request(s) from the given input stream with the specified encoding
+ * process the DSML request(s) from the given input stream with the specified encoding
* and writes the response to the output stream
*
* @param inputStream the input stream for DSML batch request
@@ -641,7 +641,7 @@ public class Dsmlv2Engine
{
SearchResultEntry searchResultEntry = ( SearchResultEntry ) searchResponse;
- SearchResultEntryDsml searchResultEntryDsml = new SearchResultEntryDsml(
+ SearchResultEntryDsml searchResultEntryDsml = new SearchResultEntryDsml(
connection.getCodecService(), searchResultEntry );
searchResponseDsml = new SearchResponseDsml( connection.getCodecService(), searchResultEntryDsml );
@@ -719,7 +719,7 @@ public class Dsmlv2Engine
* <li>Parsing and Getting BatchRequest</li>
* <li>Getting and registering options from BatchRequest</li>
* </ul>
- *
+ *
* @throws XmlPullParserException
* if an error occurs in the parser
*/
@@ -767,7 +767,7 @@ public class Dsmlv2Engine
if ( connection == null )
{
- throw new IOException( I18n.err( I18n.ERR_03101_MISSING_CONNECTION_TO ) );
+ throw new IOException( I18n.err( I18n.ERR_03101_MISSING_CONNECTION_TO ) );
}
BindRequest bindRequest = new BindRequestImpl();
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.dsmlv2.reponse;
@@ -33,7 +33,7 @@ import org.dom4j.tree.DefaultElement;
* Class representing Error Response.
* <br/>
* An Error Response has a requestID, a message, and a type which can be :
- * <ul>
+ * <ul>
* <li>NOT_ATTEMPTED,</li>
* <li>COULD_NOT_CONNECT,</li>
* <li>CONNECTION_CLOSED,</li>
@@ -44,7 +44,7 @@ import org.dom4j.tree.DefaultElement;
* <li>OTHER</li>
* </ul>
*
- * @TODO review this class - maybe it should not be decorated and if it is
+ * @TODO review this class - maybe it should not be decorated and if it is
* it should extend AbstractResultResponseDsml - by Alex
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -106,7 +106,7 @@ public class ErrorResponse extends Abstr
*
* @param requestID
* the requestID of the response
- * @param type
+ * @param type
* the type of the response
* @param message
* the associated message
@@ -160,9 +160,9 @@ public class ErrorResponse extends Abstr
/**
* Returns the String associated to the error response type
*
- * @param type
+ * @param type
* the error response type
- * @return
+ * @return
* the corresponding String
*/
public String getTypeDescr( ErrorResponseType type )
@@ -279,8 +279,8 @@ public class ErrorResponse extends Abstr
public LdapApiService getCodecService()
{
throw new IllegalArgumentException( "This should not be a decorator " +
- "but seems it was made into one. We need to do something about" +
- "this if this exception is being raise." );
+ "but seems it was made into one. We need to do something about" +
+ "this if this exception is being raise." );
}
Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java (original)
+++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.extras.extended;
@@ -131,8 +131,8 @@ public class StoredProcedureRequestImpl
{
this.procedure = new byte[ procedure.length ];
System.arraycopy( procedure, 0, this.procedure, 0, procedure.length );
- }
- else
+ }
+ else
{
this.procedure = null;
}
@@ -196,7 +196,7 @@ public class StoredProcedureRequestImpl
* {@inheritDoc}
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings( value = "BC_IMPOSSIBLE_INSTANCEOF",
- justification = "False positive")
+ justification = "False positive")
public Object getParameterTypeString( int index )
{
if ( ! language.equals( "java" ) )
@@ -239,7 +239,7 @@ public class StoredProcedureRequestImpl
* {@inheritDoc}
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings( value = "BC_IMPOSSIBLE_INSTANCEOF",
- justification = "False positive")
+ justification = "False positive")
public Object getParameterValueString( int index )
{
if ( ! language.equals( "java" ) )
@@ -258,11 +258,11 @@ public class StoredProcedureRequestImpl
}
catch ( IntegerDecoderException e )
{
- throw new RuntimeException( "Failed to decode INTEGER: " +
+ throw new RuntimeException( "Failed to decode INTEGER: " +
Strings.dumpBytes( ( byte[] ) obj ), e );
}
}
- else
+ else
{
return str;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.message.controls;
@@ -26,7 +26,7 @@ import org.apache.directory.shared.util.
/**
* A final {@link Control} implementation intended specifically for handling
- * controls who's values cannot be encoded or decoded by the codec service.
+ * controls who's values cannot be encoded or decoded by the codec service.
* This situation results when no Control factory is found to be
* registered for this control's OID. Hence additional opaque value handling
* methods are included to manage the opaque control value.
@@ -35,9 +35,9 @@ import org.apache.directory.shared.util.
*/
public final class OpaqueControl extends AbstractControl implements Control
{
- /** The opaque encoded value */
- private byte[] value;
-
+ /** The opaque encoded value */
+ private byte[] value;
+
/**
* Creates a Control with a specific OID.
*
@@ -53,7 +53,7 @@ public final class OpaqueControl extends
* Creates a Control with a specific OID, and criticality set.
*
* @param oid The OID of this Control.
- * @param criticality true if this Control is critical, false otherwise.
+ * @param criticality true if this Control is critical, false otherwise.
*/
public OpaqueControl( String oid, boolean criticality )
{
@@ -66,7 +66,7 @@ public final class OpaqueControl extends
*/
public byte[] getEncodedValue()
{
- return value;
+ return value;
}
@@ -77,18 +77,18 @@ public final class OpaqueControl extends
*/
public void setEncodedValue( byte[] value )
{
- this.value = Strings.copy( value );
+ this.value = Strings.copy( value );
}
/**
- * Tells if the control has a stored value. Note that if the
+ * Tells if the control has a stored value. Note that if the
* control has an empty value, this method will return true.
*
* @return true if the control has a value
*/
public boolean hasEncodedValue()
{
- return value != null;
+ return value != null;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java Sat Nov 12 05:58:00 2011
@@ -331,7 +331,7 @@ public class Dn implements Iterable<Rdn>
* Creates a Dn concatenating a Rdn and a Dn.
*
* @param rdn the Rdn to add to the Dn
- * @param dn the Dn
+ * @param dn the Dn
* @throws LdapInvalidDnException If the resulting Dn is invalid
*/
public Dn( Rdn rdn, Dn dn ) throws LdapInvalidDnException
@@ -547,7 +547,7 @@ public class Dn implements Iterable<Rdn>
/**
* Tells if the current Dn is a parent of another Dn.<br>
- * For instance, <b>dc=com</b> is a ancestor
+ * For instance, <b>dc=com</b> is a ancestor
* of <b>dc=example, dc=com</b>
*
* @param dn The child
@@ -713,7 +713,7 @@ public class Dn implements Iterable<Rdn>
* Dn descendant = dn.getDescendantOf( "dc=apache, dc=org" );
*
* // At this point, the descendant contains cn=test, dc=server, dc=directory"
- * </pre>
+ * </pre>
*/
public Dn getDescendantOf( String ancestor ) throws LdapInvalidDnException
{
@@ -734,7 +734,7 @@ public class Dn implements Iterable<Rdn>
* Dn descendant = dn.getDescendantOf( "dc=apache, dc=org" );
*
* // At this point, the descendant contains cn=test, dc=server, dc=directory"
- * </pre>
+ * </pre>
*/
public Dn getDescendantOf( Dn ancestor ) throws LdapInvalidDnException
{
@@ -795,7 +795,7 @@ public class Dn implements Iterable<Rdn>
* Dn ancestor = dn.getAncestorOf( "cn=test, dc=server, dc=directory" );
*
* // At this point, the ancestor contains "dc=apache, dc=org"
- * </pre>
+ * </pre>
*/
public Dn getAncestorOf( String descendant ) throws LdapInvalidDnException
{
@@ -815,7 +815,7 @@ public class Dn implements Iterable<Rdn>
* Dn ancestor = dn.getAncestorOf( new Dn( "cn=test, dc=server, dc=directory" ) );
*
* // At this point, the ancestor contains "dc=apache, dc=org"
- * </pre>
+ * </pre>
*/
public Dn getAncestorOf( Dn descendant ) throws LdapInvalidDnException
{
@@ -1008,7 +1008,7 @@ public class Dn implements Iterable<Rdn>
* @return <code>true</code> if the two instances are equals
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS",
- justification = "String is a special case")
+ justification = "String is a special case")
@Override
public boolean equals( Object obj )
{
@@ -1241,7 +1241,7 @@ public class Dn implements Iterable<Rdn>
/**
- * Iterate over the inner Rdn. The Rdn are returned from
+ * Iterate over the inner Rdn. The Rdn are returned from
* the rightmost to the leftmost. For instance, the following code :<br/>
* <pre>
* Dn dn = new Dn( "sn=test, dc=apache, dc=org );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -52,7 +52,7 @@ public class BitStringComparator extends
* Implementation of the Compare method
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
public int compare( String bs1, String bs2 )
{
LOG.debug( "comparing BitString objects '{}' with '{}'", bs1, bs2 );
@@ -66,7 +66,7 @@ public class BitStringComparator extends
}
// Then, deal with one of bs1 or bs2 being null
- // Both can't be null, because then they would
+ // Both can't be null, because then they would
// have been caught by the previous test
if ( ( bs1 == null ) || ( bs2 == null ) )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -45,7 +45,7 @@ public class GeneralizedTimeComparator e
private static final Logger LOG = LoggerFactory.getLogger( GeneralizedTimeComparator.class );
/**
- * The GeneralizedTimeComparator constructor. Its OID is the
+ * The GeneralizedTimeComparator constructor. Its OID is the
* generalizedTimeOrderingMatch matching rule OID.
*/
public GeneralizedTimeComparator( String oid )
@@ -58,7 +58,7 @@ public class GeneralizedTimeComparator e
* Implementation of the Compare method
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
public int compare( String backendValue, String assertValue )
{
LOG.debug( "comparing generalizedTimeOrdering objects '{}' with '{}'", backendValue, assertValue );
@@ -72,7 +72,7 @@ public class GeneralizedTimeComparator e
}
// Then, deal with one of o1 or o2 being null
- // Both can't be null, because then they would
+ // Both can't be null, because then they would
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -74,7 +74,7 @@ public class IntegerComparator extends L
* Implementation of the Compare method
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RC_REF_COMPARISON",
- justification ="false positive")
+ justification ="false positive")
private int compare( Long backendValue, Long assertValue )
{
LOG.debug( "comparing Integer objects '{}' with '{}'", backendValue, assertValue );
@@ -88,7 +88,7 @@ public class IntegerComparator extends L
}
// Then, deal with one of o1 or o2 being null
- // Both can't be null, because then they would
+ // Both can't be null, because then they would
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
@@ -103,7 +103,7 @@ public class IntegerComparator extends L
* Implementation of the Compare method
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
private int compare( String backendValue, String assertValue )
{
LOG.debug( "comparing Integer objects '{}' with '{}'", backendValue, assertValue );
@@ -117,7 +117,7 @@ public class IntegerComparator extends L
}
// Then, deal with one of o1 or o2 being null
- // Both can't be null, because then they would
+ // Both can't be null, because then they would
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
@@ -143,8 +143,8 @@ public class IntegerComparator extends L
throw new IllegalArgumentException( I18n.err( I18n.ERR_04224, assertValue ) );
}
- BigInteger b1 = new BigInteger( ( String ) backendValue );
- BigInteger b2 = new BigInteger( ( String ) assertValue );
+ BigInteger b1 = new BigInteger( backendValue );
+ BigInteger b2 = new BigInteger( assertValue );
return b1.compareTo( b2 );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -54,7 +54,7 @@ public class LongComparator extends Ldap
* @return 1 if obj1 > obj2, 0 if obj1 == obj2, -1 if obj1 < obj2
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RC_REF_COMPARISON",
- justification ="false positive")
+ justification ="false positive")
public int compare( Long obj1, Long obj2 )
{
if ( obj1 == obj2 )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -56,7 +56,7 @@ public class NumericStringComparator ext
* Implementation of the Compare method
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
public int compare( String backendValue, String assertValue )
{
LOG.debug( "comparing numericStringOrdering objects '{}' with '{}'", backendValue, assertValue );
@@ -70,7 +70,7 @@ public class NumericStringComparator ext
}
// Then, deal with one of o1 or o2 being null
- // Both can't be null, because then they would
+ // Both can't be null, because then they would
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -56,7 +56,7 @@ public class StringComparator extends Ld
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
public int compare( String s1, String s2 )
{
LOG.debug( "comparing String objects '{}' with '{}'", s1, s2 );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java?rev=1201200&r1=1201199&r2=1201200&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java Sat Nov 12 05:58:00 2011
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -30,16 +30,16 @@ import org.slf4j.LoggerFactory;
* <p>
* A comparator for Words/KeyWords. RFC 4517 par. 4.2.21 (KeywordMatch) and par.
* 4.2.32 is pretty vague about the definition of what is a word or a keyword
- * ("...The precise definition of a word is implementation specific...)
+ * ("...The precise definition of a word is implementation specific...)
* ("...The identification of keywords in the attribute value and the exactness
* of the match are both implementation specific...).
* <p>
- * We will simply check that the assertion is present in the value at some place,
+ * We will simply check that the assertion is present in the value at some place,
* after having deep trimmed the word.
* <p>
* For instance, the word " World " will be found in the value "Hello world!".
* <p>
- * A word is defined by the following regexp : "(^|[^A-Za-z0-9])([A-Za-z0-9])*([^A-Za-z0-9]|$)".
+ * A word is defined by the following regexp : "(^|[^A-Za-z0-9])([A-Za-z0-9])*([^A-Za-z0-9]|$)".
* Anything that is not matched by this regexp will not be considered as a word.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -66,7 +66,7 @@ public class WordComparator extends Ldap
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
public int compare( String value, String assertion )
{
LOG.debug( "comparing String objects '{}' with '{}'", value, assertion );