Skip to content

Commit 76ed96c

Browse files
committed
add parseOrExit methods
1 parent 1dc66ca commit 76ed96c

20 files changed

+332
-307
lines changed

core/src/main/java/net/jbock/compiler/Builder.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

core/src/main/java/net/jbock/compiler/Option.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ private static MethodSpec descriptionBlockMethod(
299299
}
300300

301301
private MethodSpec describeMethod() {
302-
ParameterSpec sb = ParameterSpec.builder(StringBuilder.class, "sb").build();
303302
ParameterSpec indent = ParameterSpec.builder(INT, "indent").build();
304303
MethodSpec.Builder builder = MethodSpec.methodBuilder("describe");
305304
ParameterSpec spaces = ParameterSpec.builder(STRING, "spaces").build();
@@ -309,12 +308,8 @@ private MethodSpec describeMethod() {
309308
.addStatement("return $N + $N()", spaces, describeNamesMethod)
310309
.endControlFlow();
311310

312-
builder.addStatement("$T $N = new $T()", StringBuilder.class, sb, StringBuilder.class)
313-
.addStatement("$N.append($N)", sb, spaces)
314-
.addStatement("$N.append($N())", sb, describeNamesMethod)
315-
.addStatement("$N.append($T.lineSeparator())", sb, System.class)
316-
.addStatement("$N.append($N($N))", sb, descriptionBlockMethod, indent)
317-
.addStatement("return $N.toString()", sb);
311+
builder.addStatement("return $N + $N() + $T.lineSeparator() + $N($N)",
312+
spaces, describeNamesMethod, System.class, descriptionBlockMethod, indent);
318313
return builder
319314
.returns(STRING)
320315
.addParameter(indent)
@@ -348,7 +343,6 @@ private static MethodSpec describeNamesMethod(
348343
private static MethodSpec describeParamMethod(
349344
FieldSpec longNameField,
350345
FieldSpec shortNameField) {
351-
ParameterSpec sb = ParameterSpec.builder(StringBuilder.class, "sb").build();
352346
CodeBlock.Builder builder = CodeBlock.builder();
353347

354348
builder.beginControlFlow("if ($N == null)", shortNameField)
@@ -359,13 +353,7 @@ private static MethodSpec describeParamMethod(
359353
.addStatement("return $S + $N", "-", shortNameField)
360354
.endControlFlow();
361355

362-
builder.addStatement("$T $N = new $T($N.length() + 6)",
363-
StringBuilder.class, sb, StringBuilder.class, longNameField);
364-
builder.addStatement("$N.append('-').append($N)", sb, shortNameField);
365-
builder.addStatement("$N.append(',').append(' ')", sb);
366-
builder.addStatement("$N.append('-').append('-').append($N)", sb, longNameField);
367-
368-
builder.addStatement("return $N.toString()", sb);
356+
builder.addStatement("return $S + $N + $S + $N", "-", shortNameField, ", --", longNameField);
369357

370358
return MethodSpec.methodBuilder("describeParam")
371359
.returns(STRING)

0 commit comments

Comments
 (0)