@@ -47,8 +47,8 @@ public class RunOrder {
47
47
/**
48
48
* Returns the specified RunOrder
49
49
*
50
- * @param values The runorder string value
51
- * @return An array of RunOrder objects, never null
50
+ * @param values the runorder string value
51
+ * @return an array of RunOrder objects, never null
52
52
*/
53
53
public static RunOrder [] valueOfMulti (String values ) {
54
54
List <RunOrder > result = new ArrayList <>();
@@ -78,14 +78,13 @@ public static RunOrder valueOf(String name) {
78
78
}
79
79
80
80
private static String createMessageForMissingRunOrder (String name ) {
81
- RunOrder [] runOrders = values ();
81
+ RunOrder [] runOrders = values (); // guaranteed non-empty
82
82
StringBuilder message = new StringBuilder ("There's no RunOrder with the name " );
83
83
message .append (name );
84
84
message .append (". Use one of the following RunOrders: " );
85
- for (int i = 0 ; i < runOrders .length ; i ++) {
86
- if (i != 0 ) {
87
- message .append (", " );
88
- }
85
+ message .append (runOrders [0 ]);
86
+ for (int i = 1 ; i < runOrders .length ; i ++) {
87
+ message .append (", " );
89
88
message .append (runOrders [i ]);
90
89
}
91
90
message .append ('.' );
@@ -98,12 +97,11 @@ private static RunOrder[] values() {
98
97
99
98
public static String asString (RunOrder [] runOrder ) {
100
99
StringBuilder stringBuffer = new StringBuilder ();
101
- for (int i = 0 ; i < runOrder .length ; i ++) {
100
+ for (int i = 0 ; i < runOrder .length - 1 ; i ++) {
102
101
stringBuffer .append (runOrder [i ].name );
103
- if (i < (runOrder .length - 1 )) {
104
- stringBuffer .append ("," );
105
- }
102
+ stringBuffer .append ("," );
106
103
}
104
+ stringBuffer .append (runOrder [runOrder .length - 1 ].name );
107
105
return stringBuffer .toString ();
108
106
}
109
107
0 commit comments