Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 53725 invoked from network); 4 Jul 2005 06:40:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jul 2005 06:40:32 -0000 Received: (qmail 19222 invoked by uid 500); 4 Jul 2005 06:39:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 19062 invoked by uid 500); 4 Jul 2005 06:39:07 -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 19014 invoked by uid 99); 4 Jul 2005 06:39:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jul 2005 23:39:07 -0700 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 03 Jul 2005 23:39:07 -0700 Received: (qmail 52728 invoked by uid 65534); 4 Jul 2005 06:39:03 -0000 Message-ID: <20050704063903.52727.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r209020 - /directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Control.java Date: Mon, 04 Jul 2005 06:39:02 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Sun Jul 3 23:39:01 2005 New Revision: 209020 URL: http://svn.apache.org/viewcvs?rev=209020&view=rev Log: Renamed the Controls class to Control Added: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Control.java - copied, changed from r189643, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Controls.java Copied: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Control.java (from r189643, directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Controls.java) URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Control.java?p2=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Control.java&p1=directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Controls.java&r1=189643&r2=209020&rev=209020&view=diff ============================================================================== --- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Controls.java (original) +++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/pojo/Control.java Sun Jul 3 23:39:01 2005 @@ -17,24 +17,27 @@ package org.apache.asn1.ldap.pojo; import org.apache.asn1.Asn1Object; +import org.apache.asn1.primitives.OID; +import org.apache.asn1.primitives.OctetString; + /** - * A ldapObject to store Controls. + * A ldapObject to store Control. * * @author Apache Directory Project */ -public class Controls extends Asn1Object +public class Control extends Asn1Object { //~ Instance fields ---------------------------------------------------------------------------- /** The control type */ - private String controlType; + private OID controlType; /** The criticality (default value is false) */ private boolean criticality = false; /** Optionnal control value */ - private String controlValue; + private OctetString controlValue; //~ Methods ------------------------------------------------------------------------------------ @@ -45,16 +48,15 @@ */ public String getControlType() { - - return controlType; + return (controlType == null ? "" : controlType.toString() ); } /** * Set the control type * - * @param controlType A string to store + * @param controlType An OID to store */ - public void setControlType( String controlType ) + public void setControlType( OID controlType ) { this.controlType = controlType; } @@ -66,8 +68,7 @@ */ public String getControlValue() { - - return controlValue; + return (controlValue == null ? "" : controlValue.toString() ); } /** @@ -75,7 +76,7 @@ * * @param controlValue The control value to store */ - public void setControlValue( String controlValue ) + public void setControlValue( OctetString controlValue ) { this.controlValue = controlValue; } @@ -87,7 +88,6 @@ */ public boolean getCriticality() { - return criticality; } @@ -99,5 +99,25 @@ public void setCriticality( boolean criticality ) { this.criticality = criticality; + } + + /** + * Return a String representing a Control + */ + public String toString() + { + StringBuffer sb = new StringBuffer(); + + sb.append(" Control :\n"); + sb.append(" ").append(controlType.toString()).append('\n'); + sb.append(" ").append(criticality).append('\n'); + + if ( controlValue != null ) + { + sb.append(" ").append(controlValue.toString()).append('\n'); + } + + sb.append( "\n" ); + return sb.toString(); } }