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 2008/05/14 18:54:19 UTC
svn commit: r656333 [1/2] - in /directory:
apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/
apacheds/trunk/mitosis/src/main/java/org/apache/dire...
Author: elecharny
Date: Wed May 14 09:54:17 2008
New Revision: 656333
URL: http://svn.apache.org/viewvc?rev=656333&view=rev
Log:
o Removed some warnings
o Used for() instead of while()
o Added some javadoc
Modified:
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/DnsMessage.java
directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/QuestionRecord.java
directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/ChangeType.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifAttributesReader.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/SearchScope.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureLanguageSchemeOption.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/MultiMap.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/SequencedHashMap.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java Wed May 14 09:54:17 2008
@@ -1052,7 +1052,7 @@
*
* @see Object#hashCode()
*
- * @return the instance's hashcode
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Wed May 14 09:54:17 2008
@@ -2288,6 +2288,7 @@
* Gets the hashCode of this ServerEntry.
*
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Wed May 14 09:54:17 2008
@@ -469,8 +469,7 @@
// -----------------------------------------------------------------------
/**
* @see Object#hashCode()
- * @throws IllegalStateException on failures to extract the comparator, or the
- * normalizers needed to perform the required comparisons based on the schema
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java Wed May 14 09:54:17 2008
@@ -121,6 +121,7 @@
/**
* Compute the modification @see Object#hashCode
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java Wed May 14 09:54:17 2008
@@ -513,6 +513,7 @@
* @see Object#hashCode()
* @throws IllegalStateException on failures to extract the comparator, or the
* normalizers needed to perform the required comparisons based on the schema
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java Wed May 14 09:54:17 2008
@@ -22,11 +22,10 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.referral.ReferralLut;
-import org.apache.directory.shared.ldap.name.LdapDN;
-
import junit.framework.TestCase;
+import org.apache.directory.shared.ldap.name.LdapDN;
+
/**
* Unit tests for ReferralLut.
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java Wed May 14 09:54:17 2008
@@ -150,6 +150,7 @@
/**
* Returns the hash code of this vector, calculated from each {@link CSN}
* element.
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java Wed May 14 09:54:17 2008
@@ -59,6 +59,10 @@
}
+ /**
+ *Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return uuid.hashCode();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java Wed May 14 09:54:17 2008
@@ -148,6 +148,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return id.hashCode();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java Wed May 14 09:54:17 2008
@@ -58,6 +58,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( -1364566505, -1158072471 ).append( this.sequence ).toHashCode();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java Wed May 14 09:54:17 2008
@@ -94,6 +94,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java Wed May 14 09:54:17 2008
@@ -51,6 +51,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( -1480829129, 951761287 ).appendSuper( super.hashCode() ).toHashCode();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java Wed May 14 09:54:17 2008
@@ -51,6 +51,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( 247639103, -470023671 ).appendSuper( super.hashCode() ).toHashCode();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java Wed May 14 09:54:17 2008
@@ -51,6 +51,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( 1892305163, -1367551105 ).appendSuper( super.hashCode() ).toHashCode();
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java Wed May 14 09:54:17 2008
@@ -60,6 +60,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java Wed May 14 09:54:17 2008
@@ -74,6 +74,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java Wed May 14 09:54:17 2008
@@ -74,6 +74,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java Wed May 14 09:54:17 2008
@@ -70,6 +70,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java Wed May 14 09:54:17 2008
@@ -67,6 +67,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java Wed May 14 09:54:17 2008
@@ -82,8 +82,9 @@
}
- /*
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/DnsMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/DnsMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/DnsMessage.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/DnsMessage.java Wed May 14 09:54:17 2008
@@ -267,6 +267,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/QuestionRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/QuestionRecord.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/QuestionRecord.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/QuestionRecord.java Wed May 14 09:54:17 2008
@@ -142,6 +142,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java Wed May 14 09:54:17 2008
@@ -176,6 +176,10 @@
}
+ /**
+ * Compute the instance hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
return domainName.hashCode() + recordType.hashCode() + recordClass.hashCode();
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java Wed May 14 09:54:17 2008
@@ -48,6 +48,10 @@
}
+ /**
+ * Compute the instance hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return 0;
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java Wed May 14 09:54:17 2008
@@ -689,6 +689,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java Wed May 14 09:54:17 2008
@@ -1444,6 +1444,10 @@
return string;
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode()
{
return this.toString().hashCode();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java Wed May 14 09:54:17 2008
@@ -247,8 +247,7 @@
/**
* @see Object#hashCode()
- * @throws IllegalStateException on failures to extract the comparator, or the
- * normalizers needed to perform the required comparisons based on the schema
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java Wed May 14 09:54:17 2008
@@ -247,8 +247,7 @@
// -----------------------------------------------------------------------
/**
* @see Object#hashCode()
- * @throws IllegalStateException on failures to extract the comparator, or the
- * normalizers needed to perform the required comparisons based on the schema
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java Wed May 14 09:54:17 2008
@@ -1216,6 +1216,7 @@
* on the internal values.
*
* @see Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java Wed May 14 09:54:17 2008
@@ -1042,9 +1042,10 @@
/**
- * Get the hashcode of this ClientEntry.
- *
- * @see java.lang.Object#hashCode()
+ * Get the hash code of this ClientEntry.
+ *
+ * @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java Wed May 14 09:54:17 2008
@@ -58,6 +58,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java Wed May 14 09:54:17 2008
@@ -148,6 +148,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java Wed May 14 09:54:17 2008
@@ -43,6 +43,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java Wed May 14 09:54:17 2008
@@ -113,6 +113,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java Wed May 14 09:54:17 2008
@@ -180,6 +180,7 @@
* (non-Javadoc)
*
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java Wed May 14 09:54:17 2008
@@ -56,6 +56,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java Wed May 14 09:54:17 2008
@@ -172,6 +172,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java Wed May 14 09:54:17 2008
@@ -45,6 +45,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java Wed May 14 09:54:17 2008
@@ -80,6 +80,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java Wed May 14 09:54:17 2008
@@ -45,6 +45,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java Wed May 14 09:54:17 2008
@@ -198,6 +198,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java Wed May 14 09:54:17 2008
@@ -150,6 +150,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java Wed May 14 09:54:17 2008
@@ -135,6 +135,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java Wed May 14 09:54:17 2008
@@ -112,6 +112,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java Wed May 14 09:54:17 2008
@@ -232,6 +232,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/ChangeType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/ChangeType.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/ChangeType.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/ChangeType.java Wed May 14 09:54:17 2008
@@ -34,10 +34,19 @@
ModRdn( 3 ),
Delete( 4 );
+ /** Add ordinal value */
public static final int ADD_ORDINAL = 0;
+
+ /** Modify ordinal value */
public static final int MODIFY_ORDINAL = 1;
+
+ /** ModDN ordinal value */
public static final int MODDN_ORDINAL = 2;
+
+ /** ModRDN ordinal value */
public static final int MODRDN_ORDINAL = 3;
+
+ /** Delete ordinal value */
public static final int DELETE_ORDINAL = 4;
/* the ordinal value for a change type */
@@ -60,7 +69,7 @@
*
* @return the changeType
*/
- public final int getChangeType()
+ public int getChangeType()
{
return changeType;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifAttributesReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifAttributesReader.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifAttributesReader.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifAttributesReader.java Wed May 14 09:54:17 2008
@@ -22,7 +22,6 @@
import java.io.BufferedReader;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.Iterator;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
@@ -35,12 +34,16 @@
/**
* <pre>
- * <ldif-file> ::= "version:" <fill> <number> <seps> <dn-spec> <sep> <ldif-content-change>
+ * <ldif-file> ::= "version:" <fill> <number> <seps> <dn-spec> <sep>
+ * <ldif-content-change>
*
* <ldif-content-change> ::=
- * <number> <oid> <options-e> <value-spec> <sep> <attrval-specs-e> <ldif-attrval-record-e> |
- * <alpha> <chars-e> <options-e> <value-spec> <sep> <attrval-specs-e> <ldif-attrval-record-e> |
- * "control:" <fill> <number> <oid> <spaces-e> <criticality> <value-spec-e> <sep> <controls-e>
+ * <number> <oid> <options-e> <value-spec> <sep> <attrval-specs-e>
+ * <ldif-attrval-record-e> |
+ * <alpha> <chars-e> <options-e> <value-spec> <sep> <attrval-specs-e>
+ * <ldif-attrval-record-e> |
+ * "control:" <fill> <number> <oid> <spaces-e> <criticality>
+ * <value-spec-e> <sep> <controls-e>
* "changetype:" <fill> <changerecord-type> <ldif-change-record-e> |
* "changetype:" <fill> <changerecord-type> <ldif-change-record-e>
*
@@ -60,7 +63,8 @@
*
* <oid> ::= '.' <number> <oid> | e
*
- * <attrval-specs-e> ::= <number> <oid> <options-e> <value-spec> <sep> <attrval-specs-e> |
+ * <attrval-specs-e> ::= <number> <oid> <options-e> <value-spec> <sep>
+ * <attrval-specs-e> |
* <alpha> <chars-e> <options-e> <value-spec> <sep> <attrval-specs-e> | e
*
* <value-spec-e> ::= <value-spec> | e
@@ -75,11 +79,15 @@
*
* <chars-e> ::= <char> <chars-e> | e
*
- * <changerecord-type> ::= "add" <sep> <attributeType> <options-e> <value-spec> <sep> <attrval-specs-e> |
+ * <changerecord-type> ::= "add" <sep> <attributeType> <options-e> <value-spec>
+ * <sep> <attrval-specs-e> |
* "delete" <sep> |
- * "modify" <sep> <mod-type> <fill> <attributeType> <options-e> <sep> <attrval-specs-e> <sep> '-' <sep> <mod-specs-e> |
- * "moddn" <sep> <newrdn> <sep> "deleteoldrdn:" <fill> <0-1> <sep> <newsuperior-e> <sep> |
- * "modrdn" <sep> <newrdn> <sep> "deleteoldrdn:" <fill> <0-1> <sep> <newsuperior-e> <sep>
+ * "modify" <sep> <mod-type> <fill> <attributeType> <options-e> <sep>
+ * <attrval-specs-e> <sep> '-' <sep> <mod-specs-e> |
+ * "moddn" <sep> <newrdn> <sep> "deleteoldrdn:" <fill> <0-1> <sep>
+ * <newsuperior-e> <sep> |
+ * "modrdn" <sep> <newrdn> <sep> "deleteoldrdn:" <fill> <0-1> <sep>
+ * <newsuperior-e> <sep>
*
* <newrdn> ::= ':' <fill> <safe-string> | "::" <fill> <base64-chars>
*
@@ -129,6 +137,7 @@
* </pre>
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class LdifAttributesReader extends LdifReader
{
@@ -149,11 +158,10 @@
/**
* Parse an AttributeType/AttributeValue
*
- * @param entry The entry where to store the value
+ * @param attributes The entry where to store the value
* @param line The line to parse
* @param lowerLine The same line, lowercased
- * @throws NamingException
- * If anything goes wrong
+ * @throws NamingException If anything goes wrong
*/
private void parseAttribute( Attributes attributes, String line, String lowerLine ) throws NamingException
{
@@ -192,6 +200,9 @@
* <dn-spec> <sep> <controls-e> <changerecord> <dn-spec> ::= "dn:" <fill>
* <distinguishedName> | "dn::" <fill> <base64-distinguishedName>
* <changerecord> ::= "changetype:" <fill> <change-op>
+ *
+ * @return The read entry
+ * @throws NamingException If the entry can't be read or is invalid
*/
private Attributes parseAttributes() throws NamingException
{
@@ -201,21 +212,14 @@
return null;
}
- String line = lines.get( 0 );
-
Attributes attributes = new BasicAttributes( true );
// Now, let's iterate through the other lines
- Iterator<String> iter = lines.iterator();
-
- String lowerLine = null;
-
- while ( iter.hasNext() )
+ for ( String line:lines )
{
// Each line could start either with an OID, an attribute type, with
// "control:" or with "changetype:"
- line = iter.next();
- lowerLine = line.toLowerCase();
+ String lowerLine = line.toLowerCase();
// We have three cases :
// 1) The first line after the DN is a "control:" -> this is an error
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposer.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposer.java Wed May 14 09:54:17 2008
@@ -42,5 +42,5 @@
* the entry to export to ldif
* @return the ldif of an entry
*/
- String compose( MultiMap an_entry );
+ String compose( MultiMap<String,?> an_entry );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java Wed May 14 09:54:17 2008
@@ -24,7 +24,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.MultiMap;
@@ -33,7 +32,109 @@
/**
* An LDAP Data Interchange Format (LDIF) composer.
*
- * TODO Get the RFC for LDIF syntax in this javadoc.
+ * <pre>
+ * <ldif-file> ::= "version:" <fill> <number> <seps> <dn-spec> <sep>
+ * <ldif-content-change>
+ *
+ * <ldif-content-change> ::=
+ * <number> <oid> <options-e> <value-spec> <sep> <attrval-specs-e>
+ * <ldif-attrval-record-e> |
+ * <alpha> <chars-e> <options-e> <value-spec> <sep> <attrval-specs-e>
+ * <ldif-attrval-record-e> |
+ * "control:" <fill> <number> <oid> <spaces-e> <criticality>
+ * <value-spec-e> <sep> <controls-e>
+ * "changetype:" <fill> <changerecord-type> <ldif-change-record-e> |
+ * "changetype:" <fill> <changerecord-type> <ldif-change-record-e>
+ *
+ * <ldif-attrval-record-e> ::= <seps> <dn-spec> <sep> <attributeType>
+ * <options-e> <value-spec> <sep> <attrval-specs-e>
+ * <ldif-attrval-record-e> | e
+ *
+ * <ldif-change-record-e> ::= <seps> <dn-spec> <sep> <controls-e>
+ * "changetype:" <fill> <changerecord-type> <ldif-change-record-e> | e
+ *
+ * <dn-spec> ::= "dn:" <fill> <safe-string> | "dn::" <fill> <base64-string>
+ *
+ * <controls-e> ::= "control:" <fill> <number> <oid> <spaces-e> <criticality>
+ * <value-spec-e> <sep> <controls-e> | e
+ *
+ * <criticality> ::= "true" | "false" | e
+ *
+ * <oid> ::= '.' <number> <oid> | e
+ *
+ * <attrval-specs-e> ::= <number> <oid> <options-e> <value-spec> <sep>
+ * <attrval-specs-e> |
+ * <alpha> <chars-e> <options-e> <value-spec> <sep> <attrval-specs-e> | e
+ *
+ * <value-spec-e> ::= <value-spec> | e
+ *
+ * <value-spec> ::= ':' <fill> <safe-string-e> |
+ * "::" <fill> <base64-chars> |
+ * ":<" <fill> <url>
+ *
+ * <attributeType> ::= <number> <oid> | <alpha> <chars-e>
+ *
+ * <options-e> ::= ';' <char> <chars-e> <options-e> |e
+ *
+ * <chars-e> ::= <char> <chars-e> | e
+ *
+ * <changerecord-type> ::= "add" <sep> <attributeType>
+ * <options-e> <value-spec> <sep> <attrval-specs-e> |
+ * "delete" <sep> |
+ * "modify" <sep> <mod-type> <fill> <attributeType> <options-e>
+ * <sep> <attrval-specs-e> <sep> '-' <sep> <mod-specs-e> |
+ * "moddn" <sep> <newrdn> <sep> "deleteoldrdn:" <fill>
+ * <0-1> <sep> <newsuperior-e> <sep> |
+ * "modrdn" <sep> <newrdn> <sep> "deleteoldrdn:" <fill>
+ * <0-1> <sep> <newsuperior-e> <sep>
+ *
+ * <newrdn> ::= ':' <fill> <safe-string> | "::" <fill> <base64-chars>
+ *
+ * <newsuperior-e> ::= "newsuperior" <newrdn> | e
+ *
+ * <mod-specs-e> ::= <mod-type> <fill> <attributeType> <options-e>
+ * <sep> <attrval-specs-e> <sep> '-' <sep> <mod-specs-e> | e
+ *
+ * <mod-type> ::= "add:" | "delete:" | "replace:"
+ *
+ * <url> ::= <a Uniform Resource Locator, as defined in [6]>
+ *
+ *
+ *
+ * LEXICAL
+ * -------
+ *
+ * <fill> ::= ' ' <fill> | e
+ * <char> ::= <alpha> | <digit> | '-'
+ * <number> ::= <digit> <digits>
+ * <0-1> ::= '0' | '1'
+ * <digits> ::= <digit> <digits> | e
+ * <digit> ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'
+ * <seps> ::= <sep> <seps-e>
+ * <seps-e> ::= <sep> <seps-e> | e
+ * <sep> ::= 0x0D 0x0A | 0x0A
+ * <spaces> ::= ' ' <spaces-e>
+ * <spaces-e> ::= ' ' <spaces-e> | e
+ * <safe-string-e> ::= <safe-string> | e
+ * <safe-string> ::= <safe-init-char> <safe-chars>
+ * <safe-init-char> ::= [0x01-0x09] | 0x0B | 0x0C | [0x0E-0x1F] | [0x21-0x39] | 0x3B | [0x3D-0x7F]
+ * <safe-chars> ::= <safe-char> <safe-chars> | e
+ * <safe-char> ::= [0x01-0x09] | 0x0B | 0x0C | [0x0E-0x7F]
+ * <base64-string> ::= <base64-char> <base64-chars>
+ * <base64-chars> ::= <base64-char> <base64-chars> | e
+ * <base64-char> ::= 0x2B | 0x2F | [0x30-0x39] | 0x3D | [0x41-9x5A] | [0x61-0x7A]
+ * <alpha> ::= [0x41-0x5A] | [0x61-0x7A]
+ *
+ * COMMENTS
+ * --------
+ * - The ldap-oid VN is not correct in the RFC-2849. It has been changed from 1*DIGIT 0*1("." 1*DIGIT) to
+ * DIGIT+ ("." DIGIT+)*
+ * - The mod-spec lacks a sep between *attrval-spec and "-".
+ * - The BASE64-UTF8-STRING should be BASE64-CHAR BASE64-STRING
+ * - The ValueSpec rule must accept multilines values. In this case, we have a LF followed by a
+ * single space before the continued value.
+ * </pre>
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Revision$
*/
@@ -42,25 +143,17 @@
/**
* Generates an LDIF from a multi map.
*
- * @param attrHash
- * the multi map of single and multivalued attributes.
+ * @param attrHash the multi map of single and multivalued attributes.
* @return the LDIF as a String.
*/
- public String compose( MultiMap attrHash )
+ public String compose( MultiMap<String,?> attrHash )
{
- Object val = null;
- String key = null;
- Iterator<String> keys = attrHash.keySet().iterator();
- Iterator values = null;
- Collection valueCol = null;
StringWriter sw = new StringWriter();
PrintWriter out = new PrintWriter( sw );
- while ( keys.hasNext() )
+ for ( String key:attrHash.keySet() )
{
- key = keys.next();
- valueCol = ( Collection ) attrHash.get( key );
- values = valueCol.iterator();
+ Collection<?> valueCol = ( Collection<?> ) attrHash.get( key );
if ( valueCol.isEmpty() )
{
@@ -70,7 +163,7 @@
{
out.print( key );
out.print( ':' );
- val = values.next();
+ Object val = valueCol.iterator().next();
if ( val.getClass().isArray() )
{
@@ -85,11 +178,10 @@
continue;
}
- while ( values.hasNext() )
+ for ( Object val:valueCol )
{
out.print( key );
out.print( ':' );
- val = values.next();
if ( val.getClass().isArray() )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifControl.java Wed May 14 09:54:17 2008
@@ -30,10 +30,11 @@
* file.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class LdifControl implements Control
{
- static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/** The control OID */
private OID oid;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java Wed May 14 09:54:17 2008
@@ -20,12 +20,11 @@
package org.apache.directory.shared.ldap.ldif;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
-import org.apache.directory.shared.ldap.util.StringTools;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import javax.naming.InvalidNameException;
import javax.naming.NamingEnumeration;
@@ -34,11 +33,13 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.ldap.Control;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.ModificationItemImpl;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -55,6 +56,8 @@
*/
public class LdifEntry implements Cloneable, Serializable
{
+ private static final long serialVersionUID = 2L;
+
/** Used in toArray() */
public static final ModificationItemImpl[] EMPTY_MODS = new ModificationItemImpl[0];
@@ -192,10 +195,10 @@
* The operation. One of : DirContext.ADD_ATTRIBUTE
* DirContext.REMOVE_ATTRIBUTE DirContext.REPLACE_ATTRIBUTE
*
- * @param id
- * The attribute's ID
- * @param value
- * The attribute's value
+ * @param modOp The modification operation value
+ * @param id The attribute's ID
+ * @param value The attribute's value
+ * @throws NamingException if the modification can't be added
*/
public void addModificationItem( int modOp, String id, Object value ) throws NamingException
{
@@ -446,6 +449,11 @@
return changeType == ChangeType.Modify;
}
+ /**
+ * Tells if the current entry is a added one
+ *
+ * @return <code>true</code> if the entry is added
+ */
public boolean isEntry()
{
return changeType == ChangeType.Add;
@@ -481,8 +489,8 @@
{
for ( ModificationItemImpl modif:modificationList )
{
- ModificationItemImpl modifClone = new ModificationItemImpl( modif.getModificationOp(), (Attribute) modif.getAttribute()
- .clone() );
+ ModificationItemImpl modifClone = new ModificationItemImpl( modif.getModificationOp(),
+ (Attribute) modif.getAttribute().clone() );
clone.modificationList.add( modifClone );
}
}
@@ -492,8 +500,8 @@
for ( String key:modificationItems.keySet() )
{
ModificationItemImpl modif = modificationItems.get( key );
- ModificationItemImpl modifClone = new ModificationItemImpl( modif.getModificationOp(), (Attribute) modif.getAttribute()
- .clone() );
+ ModificationItemImpl modifClone = new ModificationItemImpl( modif.getModificationOp(),
+ (Attribute) modif.getAttribute().clone() );
clone.modificationItems.put( key, modifClone );
}
@@ -641,7 +649,7 @@
sb.append( " Delete old RDN : " ).append( deleteOldRdn ? "true\n" : "false\n" );
sb.append( " New RDN : " ).append( newRdn ).append( '\n' );
- if ( StringTools.isEmpty( newSuperior ) == false )
+ if ( !StringTools.isEmpty( newSuperior ) )
{
sb.append( " New superior : " ).append( newSuperior ).append( '\n' );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java Wed May 14 09:54:17 2008
@@ -107,6 +107,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java Wed May 14 09:54:17 2008
@@ -229,6 +229,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java Wed May 14 09:54:17 2008
@@ -65,6 +65,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java Wed May 14 09:54:17 2008
@@ -218,6 +218,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java Wed May 14 09:54:17 2008
@@ -689,10 +689,11 @@
/**
- * Compute the hashcode for this attribute. It's a combinaison
- * of the ID and all the values' hashcodes.
+ * Compute the hash code for this attribute. It's a combinaison
+ * of the ID and all the values' hash codes.
*
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java Wed May 14 09:54:17 2008
@@ -20,9 +20,9 @@
package org.apache.directory.shared.ldap.message;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -43,10 +43,11 @@
*/
public class AttributesImpl implements Attributes
{
- static transient final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* An iterator which returns Attributes.
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AttributeIterator<T> implements Iterator<Attribute>
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java Wed May 14 09:54:17 2008
@@ -368,6 +368,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java Wed May 14 09:54:17 2008
@@ -181,6 +181,7 @@
/**
* @see Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java Wed May 14 09:54:17 2008
@@ -202,10 +202,13 @@
* Note that the upValue should <b>not</b> be null or empty, or resolved
* to an empty string after having trimmed it.
*
- * @param upType The Usrr Provided type
+ * @param upType The User Provided type
* @param normType The normalized type
* @param upValue The User Provided value
* @param normValue The normalized value
+ * @param start Start of this ATAV in the RDN
+ * @param length Length of this ATAV
+ * @param upName The user provided name
*/
/**No protection*/ AttributeTypeAndValue(
String upType,
@@ -345,8 +348,8 @@
/**
* Store the value of a AttributeTypeAndValue.
*
- * @param value
- * The value of the AttributeTypeAndValue
+ * @param value The user provided value of the AttributeTypeAndValue
+ * @param normValue The normalized value
*/
public void setValue( Object upValue, Object normValue )
{
@@ -539,11 +542,11 @@
/**
* Compare two values
*
- * @param val1
- * First String
- * @param val2
- * Second String
- * @return true if both strings are equals or null.
+ * @param val1 First value
+ * @param val2 Second value
+ * @param sensitivity A flag to define the case sensitivity
+ * @return -1 if the first value is inferior to the second one, +1 if
+ * its superior, 0 if both values are equal
*/
private int compareValue( Object val1, Object val2, boolean sensitivity )
{
@@ -724,6 +727,7 @@
* Gets the hashcode of this object.
*
* @see java.lang.Object#hashCode()
+ * @return The instance hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java Wed May 14 09:54:17 2008
@@ -1323,10 +1323,11 @@
}
/**
- * Gets the hashcode of this rdn.
- *
- * @see java.lang.Object#hashCode()
- */
+ * Gets the hashcode of this rdn.
+ *
+ * @see java.lang.Object#hashCode()
+ * @return the instance's hash code
+ */
public int hashCode()
{
int result = 37;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/AttributeTypeLiteral.java Wed May 14 09:54:17 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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parser/ObjectClassLiteral.java Wed May 14 09:54:17 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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java Wed May 14 09:54:17 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/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/ActionTime.java Wed May 14 09:54:17 2008
@@ -64,8 +64,9 @@
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/LdapOperation.java Wed May 14 09:54:17 2008
@@ -68,8 +68,9 @@
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/SearchScope.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/SearchScope.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/SearchScope.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/SearchScope.java Wed May 14 09:54:17 2008
@@ -59,8 +59,9 @@
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureLanguageSchemeOption.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureLanguageSchemeOption.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureLanguageSchemeOption.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureLanguageSchemeOption.java Wed May 14 09:54:17 2008
@@ -50,8 +50,9 @@
return "language " + "\"" + language + "\"";
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java Wed May 14 09:54:17 2008
@@ -97,8 +97,9 @@
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java Wed May 14 09:54:17 2008
@@ -62,8 +62,9 @@
return "searchContext { scope " + searchScope + " } \"" + baseObject + "\"";
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java?rev=656333&r1=656332&r2=656333&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java Wed May 14 09:54:17 2008
@@ -100,6 +100,10 @@
}
@Override
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hash code
+ */
public int hashCode() {
int h = 37;