Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9EA8F18A06 for ; Thu, 6 Aug 2015 17:30:51 +0000 (UTC) Received: (qmail 1136 invoked by uid 500); 6 Aug 2015 17:30:45 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 1088 invoked by uid 500); 6 Aug 2015 17:30:45 -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 1079 invoked by uid 99); 6 Aug 2015 17:30:45 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Aug 2015 17:30:45 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 0C24AAC01A7 for ; Thu, 6 Aug 2015 17:30:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1694541 - in /directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model: AclAttribute.java AclAttributeWrapper.java Date: Thu, 06 Aug 2015 17:30:44 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150806173045.0C24AAC01A7@hades.apache.org> Author: elecharny Date: Thu Aug 6 17:30:44 2015 New Revision: 1694541 URL: http://svn.apache.org/r1694541 Log: Added the wrapper for the AclAttribute, and added a toString() method Added: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeWrapper.java Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttribute.java Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttribute.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttribute.java?rev=1694541&r1=1694540&r2=1694541&view=diff ============================================================================== --- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttribute.java (original) +++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttribute.java Thu Aug 6 17:30:44 2015 @@ -91,8 +91,9 @@ public class AclAttribute else { isAttributeType = true; - this.name = name; } + + this.name = name; } } @@ -194,4 +195,30 @@ public class AclAttribute { return isObjectClassNotAllowed; } + + + /** + * @See Object#toString() + */ + public String toString() + { + if ( isEntry || isChildren || isAttributeType ) + { + return name; + } + + StringBuilder buffer = new StringBuilder(); + + if ( isObjectClass ) + { + buffer.append( '@' ); + } + else + { + buffer.append( '!' ); + } + + buffer.append( name ); + return buffer.toString(); + } } Added: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeWrapper.java?rev=1694541&view=auto ============================================================================== --- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeWrapper.java (added) +++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeWrapper.java Thu Aug 6 17:30:44 2015 @@ -0,0 +1,117 @@ +package org.apache.directory.studio.openldap.config.acl.model; + +import org.apache.directory.api.util.Strings; + +public class AclAttributeWrapper implements Cloneable, Comparable +{ + /** The AclAttribute */ + private AclAttribute aclAttribute; + + /** + * Creates a new instance of AclAttributeWrapper. + * + * @param aclAttribute the aclAttribute + */ + public AclAttributeWrapper( AclAttribute aclAttribute ) + { + this.aclAttribute = aclAttribute; + } + + + /** + * @return the value + */ + public AclAttribute getAclAttribute() + { + return aclAttribute; + } + + + /** + * @param aclAttribute the aclAttribute to set + */ + public void setAclAttribute( AclAttribute aclAttribute ) + { + this.aclAttribute = aclAttribute; + } + + + /** + * Clone the current object + */ + public AclAttributeWrapper clone() + { + try + { + return (AclAttributeWrapper)super.clone(); + } + catch ( CloneNotSupportedException e ) + { + return null; + } + } + + + /** + * @see Object#equals(Object) + */ + public boolean equals( Object that ) + { + // Quick test + if ( this == that ) + { + return true; + } + + if ( that instanceof AclAttributeWrapper ) + { + AclAttributeWrapper thatInstance = (AclAttributeWrapper)that; + + return aclAttribute.getName().equalsIgnoreCase( thatInstance.aclAttribute.getName() ); + } + else + { + return false; + } + } + + + /** + * @see Object#hashCode() + */ + public int hashCode() + { + int h = 37; + + if ( aclAttribute != null ) + { + h += h*17 + aclAttribute.getName().hashCode(); + } + + return h; + } + + + /** + * @see Comparable#compareTo() + */ + public int compareTo( AclAttributeWrapper that ) + { + if ( that == null ) + { + return 1; + } + + // Check the AclAttribute + return aclAttribute.getName().compareToIgnoreCase( that.getAclAttribute().getName() ); + } + + + /** + * @see Object#toString() + */ + public String toString() + { + return aclAttribute.toString(); + } +}