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 2010/07/01 18:37:05 UTC
svn commit: r959715 -
/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/
Author: elecharny
Date: Thu Jul 1 16:37:04 2010
New Revision: 959715
URL: http://svn.apache.org/viewvc?rev=959715&view=rev
Log:
Added some missing Javadoc
Minor refactoring
Modified:
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesAndValuesItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/EntryItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java Thu Jul 1 16:37:04 2010
@@ -39,6 +39,9 @@ public class AllAttributeValuesItem exte
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "allAttributeValues " + super.toString();
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesAndValuesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesAndValuesItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesAndValuesItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesAndValuesItem.java Thu Jul 1 16:37:04 2010
@@ -27,11 +27,17 @@ import org.apache.directory.shared.ldap.
*/
public class AllUserAttributeTypesAndValuesItem extends ProtectedItem
{
+ /**
+ * Creates a new instance of AllUserAttributeTypesAndValuesItem.
+ */
public AllUserAttributeTypesAndValuesItem()
{
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "allUserAttributeTypesAndValues";
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllUserAttributeTypesItem.java Thu Jul 1 16:37:04 2010
@@ -27,11 +27,17 @@ import org.apache.directory.shared.ldap.
*/
public class AllUserAttributeTypesItem extends ProtectedItem
{
+ /**
+ * Creates a new instance of AllUserAttributeTypesItem.
+ */
public AllUserAttributeTypesItem()
{
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "allUserAttributeTypes";
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java Thu Jul 1 16:37:04 2010
@@ -40,6 +40,9 @@ public class AttributeTypeItem extends A
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "attributeType " + super.toString();
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java Thu Jul 1 16:37:04 2010
@@ -96,24 +96,31 @@ public class AttributeValueItem extends
}
- // This will suppress PMD.EmptyCatchBlock warnings in this method
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
StringBuilder buf = new StringBuilder();
buf.append( "attributeValue {" );
+
+ boolean isFirst = true;
- for ( Iterator<EntryAttribute> it = attributes.iterator(); it.hasNext(); )
+ for ( EntryAttribute attribute : attributes )
{
- EntryAttribute attribute = it.next();
- buf.append( attribute.getId() );
- buf.append( '=' );
- buf.append( attribute.get( 0 ) );
-
- if ( it.hasNext() )
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
buf.append( ", " );
}
+
+ buf.append( attribute.getId() );
+ buf.append( '=' );
+ buf.append( attribute.get( 0 ) );
}
buf.append( " }" );
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/EntryItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/EntryItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/EntryItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/EntryItem.java Thu Jul 1 16:37:04 2010
@@ -31,11 +31,17 @@ import org.apache.directory.shared.ldap.
*/
public class EntryItem extends ProtectedItem
{
+ /**
+ * Creates a new instance of EntryItem.
+ */
public EntryItem()
{
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "entry";
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java Thu Jul 1 16:37:04 2010
@@ -73,6 +73,9 @@ public class MaxImmSubItem extends Prote
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "maxImmSub " + value;
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java Thu Jul 1 16:37:04 2010
@@ -64,6 +64,9 @@ public class MaxValueCountElem
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "{ type " + attributeType + ", maxCount " + maxCount + " }";
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java Thu Jul 1 16:37:04 2010
@@ -25,8 +25,7 @@ public class MaxValueCountItem extends P
/**
* Creates a new instance.
*
- * @param items
- * the collection of {@link MaxValueCountElem}s.
+ * @param items the collection of {@link MaxValueCountElem}s.
*/
public MaxValueCountItem( Set<MaxValueCountElem> items )
{
@@ -81,6 +80,9 @@ public class MaxValueCountItem extends P
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
StringBuilder buf = new StringBuilder();
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java Thu Jul 1 16:37:04 2010
@@ -34,8 +34,7 @@ public class RangeOfValuesItem extends P
/**
* Creates a new instance.
*
- * @param filter
- * the expression
+ * @param filter the expression
*/
public RangeOfValuesItem( ExprNode filter )
{
@@ -90,6 +89,9 @@ public class RangeOfValuesItem extends P
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
StringBuilder buf = new StringBuilder();
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java Thu Jul 1 16:37:04 2010
@@ -64,6 +64,9 @@ public class RestrictedByElem
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "{ type " + attributeType + ", valuesIn " + valuesIn + " }";
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java Thu Jul 1 16:37:04 2010
@@ -99,6 +99,9 @@ public class RestrictedByItem extends Pr
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
StringBuilder buf = new StringBuilder();
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java?rev=959715&r1=959714&r2=959715&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java Thu Jul 1 16:37:04 2010
@@ -44,6 +44,9 @@ public class SelfValueItem extends Abstr
}
+ /**
+ * @see Object#toString()
+ */
public String toString()
{
return "selfValue " + super.toString();