You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/05 17:32:59 UTC
svn commit: r592070 - in /incubator/cxf/branches/2.0.x-fixes: ./
tools/common/src/main/java/org/apache/cxf/tools/common/
tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/
tools/common/src/test/java/org/apache/cxf/tools/common/tool...
Author: dkulp
Date: Mon Nov 5 08:32:58 2007
New Revision: 592070
URL: http://svn.apache.org/viewvc?rev=592070&view=rev
Log:
Merged revisions 591805 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r591805 | ema | 2007-11-04 12:26:05 -0500 (Sun, 04 Nov 2007) | 1 line
To fix typo. Thanks Glen!
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
incubator/cxf/branches/2.0.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java?rev=592070&r1=592069&r2=592070&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java Mon Nov 5 08:32:58 2007
@@ -88,13 +88,13 @@
System.out.println();
System.out.println("Options: ");
System.out.println();
- System.out.println(parser.getFromatedDetailedUsage());
+ System.out.println(parser.getFormattedDetailedUsage());
String toolUsage = parser.getToolUsage();
if (toolUsage != null) {
System.out.println(toolUsage);
}
} catch (Exception ex) {
- System.err.println("Error : Could not output detailed usage");
+ System.err.println("Error: Could not output detailed usage");
System.err.println();
}
}
Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java?rev=592070&r1=592069&r2=592070&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java Mon Nov 5 08:32:58 2007
@@ -193,7 +193,7 @@
return baos.toString();
}
- public String getFromatedDetailedUsage() throws TransformerException {
+ public String getFormattedDetailedUsage() throws TransformerException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
String usage = baos.toString();
@@ -201,7 +201,7 @@
// |-------|-options|------|description-----------------|
// before option white space size is 7
int beforeOptSpan = 3;
- // option lenght is 8
+ // option length is 8
int optSize = 12;
// after option white space size is 6
int afterOptLen = 6;
@@ -212,33 +212,33 @@
StringTokenizer st1 = new StringTokenizer(usage, lineSeparator);
int i = 0;
int length = st1.countTokens();
- String[] orginalStrs = new String[length];
+ String[] orignalStrs = new String[length];
while (st1.hasMoreTokens()) {
String str = st1.nextToken();
- orginalStrs[i] = str;
+ orignalStrs[i] = str;
i++;
}
StringBuffer strbuffer = new StringBuffer();
for (int j = 0; j < length - 1; j = j + 2) {
- int optionLen = orginalStrs[j].length();
+ int optionLen = orignalStrs[j].length();
addWhiteNamespace(strbuffer, beforeOptSpan);
if (optionLen <= optSpan) {
// && beforeOptSpan + optionLen + optSpan + desLen <= totalLen -
// 1) {
- strbuffer.append(orginalStrs[j]);
- addWhiteNamespace(strbuffer, optSpan - orginalStrs[j].length());
+ strbuffer.append(orignalStrs[j]);
+ addWhiteNamespace(strbuffer, optSpan - orignalStrs[j].length());
strbuffer.append(" ");
- if (orginalStrs[j + 1].length() > totalLen - beforeDesSpan) {
- String tmp = orginalStrs[j + 1].substring(0, totalLen - beforeDesSpan);
+ if (orignalStrs[j + 1].length() > totalLen - beforeDesSpan) {
+ String tmp = orignalStrs[j + 1].substring(0, totalLen - beforeDesSpan);
strbuffer.append(tmp);
- orginalStrs[j + 1] = orginalStrs[j + 1].substring(totalLen - beforeDesSpan,
- orginalStrs[j + 1].length());
+ orignalStrs[j + 1] = orignalStrs[j + 1].substring(totalLen - beforeDesSpan,
+ orignalStrs[j + 1].length());
strbuffer.append(lineSeparator);
} else {
- strbuffer.append(orginalStrs[j + 1]);
+ strbuffer.append(orignalStrs[j + 1]);
strbuffer.append(lineSeparator);
- orginalStrs[j + 1] = "";
+ orignalStrs[j + 1] = "";
}
// strbuffer.append(orginalStrs[j + 1]);
@@ -246,10 +246,10 @@
// strbuffer.append(lineSeparator);
} else {
// addWhiteNamespace(strbuffer, beforeOptSpan);
- strbuffer.append(orginalStrs[j]);
+ strbuffer.append(orignalStrs[j]);
strbuffer.append(lineSeparator);
}
- String tmpStr = orginalStrs[j + 1];
+ String tmpStr = orignalStrs[j + 1];
for (i = 0; i < tmpStr.length(); i = i + (totalLen - beforeDesSpan)) {
if (i + totalLen - beforeDesSpan < tmpStr.length()) {
Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java?rev=592070&r1=592069&r2=592070&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java Mon Nov 5 08:32:58 2007
@@ -306,8 +306,8 @@
@Test
- public void testFormatedDetailedUsage() throws Exception {
- String usage = parser.getFromatedDetailedUsage();
+ public void testFormattedDetailedUsage() throws Exception {
+ String usage = parser.getFormattedDetailedUsage();
assertNotNull(usage);
StringTokenizer st1 = new StringTokenizer(usage, System.getProperty("line.separator"));
assertEquals(13, st1.countTokens());