Author: sebb
Date: Fri May 4 17:29:26 2007
New Revision: 535423
URL: http://svn.apache.org/viewvc?view=rev&rev=535423
Log:
Remove deprecated method and add toShortString test method
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLOption.java?view=diff&rev=535423&r1=535422&r2=535423
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
Fri May 4 17:29:26 2007
@@ -68,19 +68,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 <code>getDescriptor().getId()</code> instead
- */
- public final int getId() {
- return m_descriptor == null ? TEXT_ARGUMENT :
m_descriptor.getId();
- }
-
public final CLOptionDescriptor getDescriptor() {
return m_descriptor;
}
@@ -147,7 +134,12 @@
public final String toString() {
final StringBuffer sb = new StringBuffer();
sb.append("[Option ");
- sb.append((char) m_descriptor.getId());
+ final char id = (char) m_descriptor.getId();
+ if (id == 0) {
+ sb.append("-");
+ } else {
+ sb.append(id);
+ }
if (null != m_arguments) {
sb.append(", ");
@@ -156,6 +148,28 @@
sb.append(" ]");
+ return sb.toString();
+ }
+
+ /*
+ * Convert to a shorter String for test purposes
+ *
+ * @return the string value
+ */
+ final String toShortString() {
+ final StringBuffer sb = new StringBuffer();
+ sb.append("-");
+ final char id = (char) m_descriptor.getId();
+ if (id == 0) {
+ sb.append("-");
+ } else {
+ sb.append(id);
+ }
+
+ if (null != m_arguments) {
+ sb.append("=");
+ sb.append(Arrays.asList(m_arguments));
+ }
return sb.toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
