Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 83776 invoked from network); 20 May 2007 19:55:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 May 2007 19:55:18 -0000 Received: (qmail 21595 invoked by uid 500); 20 May 2007 19:55:23 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 21104 invoked by uid 500); 20 May 2007 19:55:22 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 21093 invoked by uid 500); 20 May 2007 19:55:22 -0000 Received: (qmail 21090 invoked by uid 99); 20 May 2007 19:55:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 May 2007 12:55:22 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 May 2007 12:55:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A484A1A981A; Sun, 20 May 2007 12:54:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r539927 - /jakarta/commons/proper/cli/branches/avalon-implementation/src/java/org/apache/commons/cli/avalon/CLOption.java Date: Sun, 20 May 2007 19:54:55 -0000 To: commons-cvs@jakarta.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070520195455.A484A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Sun May 20 12:54:54 2007 New Revision: 539927 URL: http://svn.apache.org/viewvc?view=rev&rev=539927 Log: Remove deprecated method (OK as code has not been released) Improve toString() output Add toShortString() method for testing Modified: jakarta/commons/proper/cli/branches/avalon-implementation/src/java/org/apache/commons/cli/avalon/CLOption.java Modified: jakarta/commons/proper/cli/branches/avalon-implementation/src/java/org/apache/commons/cli/avalon/CLOption.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/cli/branches/avalon-implementation/src/java/org/apache/commons/cli/avalon/CLOption.java?view=diff&rev=539927&r1=539926&r2=539927 ============================================================================== --- jakarta/commons/proper/cli/branches/avalon-implementation/src/java/org/apache/commons/cli/avalon/CLOption.java (original) +++ jakarta/commons/proper/cli/branches/avalon-implementation/src/java/org/apache/commons/cli/avalon/CLOption.java Sun May 20 12:54:54 2007 @@ -71,19 +71,6 @@ } } - /** - * Retrieve id of option. - * - * The id is eqivalent to character code if it can be a single letter option. - * - * @return the id - * @deprecated use getDescriptor().getId() instead - */ - public final int getId() - { - return m_descriptor == null ? TEXT_ARGUMENT : m_descriptor.getId(); - } - public final CLOptionDescriptor getDescriptor() { return m_descriptor; @@ -158,8 +145,14 @@ public final String toString() { final StringBuffer sb = new StringBuffer(); - sb.append( "[Option " ); - sb.append( (char)m_descriptor.getId() ); + sb.append("["); + final char id = (char) m_descriptor.getId(); + if (id == TEXT_ARGUMENT) { + sb.append("Text "); + } else { + sb.append("Option "); + sb.append(id); + } if( null != m_arguments ) { @@ -169,6 +162,28 @@ sb.append( " ]" ); // $NON-NLS-1$ + return sb.toString(); + } + + /* + * Convert to a shorter String for test purposes + * + * @return the string value + */ + final String toShortString() { + final StringBuffer sb = new StringBuffer(); + final char id = (char) m_descriptor.getId(); + if (id != TEXT_ARGUMENT) { + sb.append("-"); + sb.append(id); + } + + if (null != m_arguments) { + if (id != TEXT_ARGUMENT) { + sb.append("="); + } + sb.append(Arrays.asList(m_arguments)); + } return sb.toString(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org