Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 97358 invoked from network); 7 Oct 2009 11:47:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Oct 2009 11:47:08 -0000 Received: (qmail 91282 invoked by uid 500); 7 Oct 2009 11:47:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 91223 invoked by uid 500); 7 Oct 2009 11:47:08 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 91214 invoked by uid 99); 7 Oct 2009 11:47:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2009 11:47:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2009 11:46:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 356F823888D6; Wed, 7 Oct 2009 11:46:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r822677 - in /directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model: ProtectedItemWrapper.java UserClassWrapper.java Date: Wed, 07 Oct 2009 11:46:37 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091007114637.356F823888D6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Wed Oct 7 11:46:36 2009 New Revision: 822677 URL: http://svn.apache.org/viewvc?rev=822677&view=rev Log: Usage of generics Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java?rev=822677&r1=822676&r2=822677&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java Wed Oct 7 11:46:36 2009 @@ -48,10 +48,10 @@ public class ProtectedItemWrapper { /** This map contains all possible protected item identifiers */ - public static final Map classToIdentifierMap; + public static final Map, String> classToIdentifierMap; static { - Map map = new HashMap(); + Map, String> map = new HashMap, String>(); map.put( ProtectedItem.Entry.class, "entry" ); //$NON-NLS-1$ map.put( ProtectedItem.AllUserAttributeTypes.class, "allUserAttributeTypes" ); //$NON-NLS-1$ map.put( ProtectedItem.AttributeType.class, "attributeType" ); //$NON-NLS-1$ @@ -68,10 +68,10 @@ } /** This map contains all protected item display values */ - public static final Map classToDisplayMap; + public static final Map, String> classToDisplayMap; static { - Map map = new HashMap(); + Map, String> map = new HashMap, String>(); map.put( ProtectedItem.Entry.class, Messages.getString( "ProtectedItemWrapper.protectedItem.entry.label" ) ); //$NON-NLS-1$ map.put( ProtectedItem.AllUserAttributeTypes.class, Messages .getString( "ProtectedItemWrapper.protectedItem.allUserAttributeTypes.label" ) ); //$NON-NLS-1$ @@ -103,7 +103,7 @@ + "itemPermissions { { userClasses { allUsers }, grantsAndDenials { grantRead } } } } }"; //$NON-NLS-1$ /** The class of the protected item, never null. */ - private final Class clazz; + private final Class clazz; /** The protected item values, may be empty. */ private List values; @@ -130,7 +130,7 @@ * @param valueSuffix the dislpay name * @param valueEditor the value editor */ - public ProtectedItemWrapper( Class clazz, boolean isMultivalued, String valuePrefix, String valueSuffix, + public ProtectedItemWrapper( Class clazz, boolean isMultivalued, String valuePrefix, String valueSuffix, AbstractDialogStringValueEditor valueEditor ) { this.clazz = clazz; @@ -172,7 +172,7 @@ Messages.getString( "ProtectedItemWrapper.error.message" ), new String[] { getIdentifier(), flatValue } ); //$NON-NLS-1$ throw new ParseException( msg, 0 ); } - ProtectedItem item = ( ProtectedItem ) aci.getProtectedItems().iterator().next(); + ProtectedItem item = aci.getProtectedItems().iterator().next(); return item; } @@ -194,25 +194,25 @@ if ( item.getClass() == ProtectedItem.AttributeType.class ) { ProtectedItem.AttributeType at = ( ProtectedItem.AttributeType ) item; - for ( Iterator it = at.iterator(); it.hasNext(); ) + for ( Iterator it = at.iterator(); it.hasNext(); ) { - values.add( it.next().toString() ); + values.add( it.next() ); } } else if ( item.getClass() == ProtectedItem.AllAttributeValues.class ) { ProtectedItem.AllAttributeValues aav = ( ProtectedItem.AllAttributeValues ) item; - for ( Iterator it = aav.iterator(); it.hasNext(); ) + for ( Iterator it = aav.iterator(); it.hasNext(); ) { - values.add( it.next().toString() ); + values.add( it.next() ); } } else if ( item.getClass() == ProtectedItem.AttributeValue.class ) { ProtectedItem.AttributeValue av = ( ProtectedItem.AttributeValue ) item; - for ( Iterator it = av.iterator(); it.hasNext(); ) + for ( Iterator it = av.iterator(); it.hasNext(); ) { - Attribute attribute = ( Attribute ) it.next(); + Attribute attribute = it.next(); try { values.add( attribute.getID() + "=" + attribute.get() ); //$NON-NLS-1$ @@ -225,9 +225,9 @@ else if ( item.getClass() == ProtectedItem.SelfValue.class ) { ProtectedItem.SelfValue sv = ( ProtectedItem.SelfValue ) item; - for ( Iterator it = sv.iterator(); it.hasNext(); ) + for ( Iterator it = sv.iterator(); it.hasNext(); ) { - values.add( it.next().toString() ); + values.add( it.next() ); } } else if ( item.getClass() == ProtectedItem.RangeOfValues.class ) @@ -238,9 +238,9 @@ else if ( item.getClass() == ProtectedItem.MaxValueCount.class ) { ProtectedItem.MaxValueCount mvc = ( ProtectedItem.MaxValueCount ) item; - for ( Iterator it = mvc.iterator(); it.hasNext(); ) + for ( Iterator it = mvc.iterator(); it.hasNext(); ) { - ProtectedItem.MaxValueCountItem mvci = ( ProtectedItem.MaxValueCountItem ) it.next(); + ProtectedItem.MaxValueCountItem mvci = it.next(); values.add( mvci.toString() ); } } @@ -252,9 +252,9 @@ else if ( item.getClass() == ProtectedItem.RestrictedBy.class ) { ProtectedItem.RestrictedBy rb = ( ProtectedItem.RestrictedBy ) item; - for ( Iterator it = rb.iterator(); it.hasNext(); ) + for ( Iterator it = rb.iterator(); it.hasNext(); ) { - ProtectedItem.RestrictedByItem rbi = ( ProtectedItem.RestrictedByItem ) it.next(); + ProtectedItem.RestrictedByItem rbi = it.next(); values.add( rbi.toString() ); } } @@ -367,7 +367,7 @@ * * @return the class of the user class. */ - public Class getClazz() + public Class getClazz() { return clazz; } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java?rev=822677&r1=822676&r2=822677&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java Wed Oct 7 11:46:36 2009 @@ -30,8 +30,6 @@ import java.util.Map; import java.util.Set; -import javax.naming.Name; - import org.apache.directory.shared.ldap.aci.ACIItemParser; import org.apache.directory.shared.ldap.aci.UserClass; import org.apache.directory.shared.ldap.aci.UserFirstACIItem; @@ -52,10 +50,10 @@ { /** This map contains all possible user class identifiers */ - public static final Map classToIdentifierMap; + public static final Map, String> classToIdentifierMap; static { - Map map = new HashMap(); + Map, String> map = new HashMap, String>(); map.put( UserClass.AllUsers.class, "allUsers" ); //$NON-NLS-1$ map.put( UserClass.ThisEntry.class, "thisEntry" ); //$NON-NLS-1$ map.put( UserClass.ParentOfEntry.class, "parentOfEntry" ); //$NON-NLS-1$ @@ -66,10 +64,10 @@ } /** This map contains all user class display values */ - public static final Map classToDisplayMap; + public static final Map, String> classToDisplayMap; static { - Map map = new HashMap(); + Map, String> map = new HashMap, String>(); map.put( UserClass.AllUsers.class, Messages.getString( "UserClassWrapper.userClass.allUsers.label" ) ); //$NON-NLS-1$ map.put( UserClass.ThisEntry.class, Messages.getString( "UserClassWrapper.userClass.thisEntry.label" ) ); //$NON-NLS-1$ map.put( UserClass.ParentOfEntry.class, Messages.getString( "UserClassWrapper.userClass.parentOfEntry.label" ) ); //$NON-NLS-1$ @@ -85,7 +83,7 @@ + "userPermissions { { protectedItems { entry }, grantsAndDenials { grantRead } } } } }"; //$NON-NLS-1$ /** The class of the user class, never null. */ - private final Class clazz; + private final Class clazz; /** The user class values, may be empty. */ private List values; @@ -108,7 +106,7 @@ * @param valueSuffix the dislpay name * @param valueEditor the value editor */ - public UserClassWrapper( Class clazz, String valuePrefix, String valueSuffix, + public UserClassWrapper( Class clazz, String valuePrefix, String valueSuffix, AbstractDialogStringValueEditor valueEditor ) { this.clazz = clazz; @@ -293,7 +291,7 @@ * * @return the class of the user class. */ - public Class getClazz() + public Class getClazz() { return clazz; }