Use Guava's Preconditions instead, which throw appropriate exceptions rather than AssertionErrors (whose idea was that?!) Also fix weirdness in CommandArguments where start was allowed to be 1 greater than end when getting words. Change-Id: Icce38e36da6507f645fb8b3b872dfe2c60c43ea7 Reviewed-on: http://gerrit.dmdirc.com/2961 Reviewed-by: Greg Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Build Managertags/0.8rc1
|
|
||
22 |
|
22 |
|
23 |
|
23 |
|
24 |
|
24 |
|
25 |
|
|
|
26 |
|
|
|
27 |
|
25 |
|
28 |
|
26 |
|
29 |
|
27 |
|
|
28 |
|
|
|
29 |
|
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
33 |
|
|
|
34 |
|
|
|
|
33 |
|
|
35 |
|
34 |
|
36 |
|
35 |
|
37 |
|
36 |
|
|
|
||
56 |
|
55 |
|
57 |
|
56 |
|
58 |
|
57 |
|
59 |
|
|
|
60 |
|
|
|
61 |
|
|
|
62 |
|
|
|
|
58 |
|
|
|
59 |
|
|
|
60 |
|
|
|
61 |
|
|
63 |
|
62 |
|
64 |
|
63 |
|
65 |
|
64 |
|
|
|
||
84 |
|
83 |
|
85 |
|
84 |
|
86 |
|
85 |
|
87 |
|
|
|
|
86 |
|
|
|
87 |
|
|
88 |
|
88 |
|
89 |
|
|
|
90 |
|
89 |
|
91 |
|
90 |
|
92 |
|
91 |
|
|
|
||
87 |
|
87 |
|
88 |
|
88 |
|
89 |
|
89 |
|
|
90 |
|
|
|
91 |
|
|
|
92 |
|
|
90 |
|
93 |
|
91 |
|
94 |
|
92 |
|
95 |
|
|
|
||
830 |
|
833 |
|
831 |
|
834 |
|
832 |
|
835 |
|
833 |
|
|
|
834 |
|
|
|
|
836 |
|
|
|
837 |
|
|
835 |
|
838 |
|
836 |
|
839 |
|
837 |
|
840 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
|
48 |
|
|
|
49 |
|
|
48 |
|
50 |
|
49 |
|
51 |
|
50 |
|
52 |
|
|
|
||
210 |
|
212 |
|
211 |
|
213 |
|
212 |
|
214 |
|
213 |
|
|
|
|
215 |
|
|
214 |
|
216 |
|
215 |
|
217 |
|
216 |
|
218 |
|
|
|
||
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
27 |
|
28 |
|
|
|
29 |
|
28 |
|
30 |
|
29 |
|
31 |
|
30 |
|
32 |
|
31 |
|
|
32 |
|
|
|
33 |
|
|
33 |
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
|
|
||
89 |
|
90 |
|
90 |
|
91 |
|
91 |
|
92 |
|
92 |
|
|
|
|
93 |
|
|
93 |
|
94 |
|
94 |
|
95 |
|
95 |
|
96 |
|
|
|
||
98 |
|
99 |
|
99 |
|
100 |
|
100 |
|
101 |
|
101 |
|
|
|
|
102 |
|
|
102 |
|
103 |
|
103 |
|
104 |
|
104 |
|
105 |
|
|
|
||
107 |
|
108 |
|
108 |
|
109 |
|
109 |
|
110 |
|
110 |
|
|
|
|
111 |
|
|
111 |
|
112 |
|
112 |
|
113 |
|
113 |
|
114 |
|
|
|
||
123 |
|
124 |
|
124 |
|
125 |
|
125 |
|
126 |
|
126 |
|
|
|
|
127 |
|
|
127 |
|
128 |
|
128 |
|
129 |
|
129 |
|
130 |
|
|
|
||
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
|
|
28 |
|
27 |
|
29 |
|
28 |
|
30 |
|
29 |
|
|
|
||
33 |
|
32 |
|
34 |
|
33 |
|
35 |
|
34 |
|
|
35 |
|
|
|
36 |
|
|
|
37 |
|
|
36 |
|
38 |
|
37 |
|
39 |
|
38 |
|
40 |
|
|
|
||
230 |
|
232 |
|
231 |
|
233 |
|
232 |
|
234 |
|
233 |
|
|
|
234 |
|
|
|
|
235 |
|
|
|
236 |
|
|
235 |
|
237 |
|
236 |
|
238 |
|
237 |
|
239 |
|
|
|
||
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
38 |
|
37 |
|
39 |
|
38 |
|
40 |
|
39 |
|
|
|
||
53 |
|
52 |
|
54 |
|
53 |
|
55 |
|
54 |
|
|
55 |
|
|
|
56 |
|
|
|
57 |
|
|
56 |
|
58 |
|
57 |
|
59 |
|
58 |
|
60 |
|
|
|
||
215 |
|
217 |
|
216 |
|
218 |
|
217 |
|
219 |
|
218 |
|
|
|
|
220 |
|
|
219 |
|
221 |
|
220 |
|
222 |
|
221 |
|
223 |
|
|
|
||
229 |
|
231 |
|
230 |
|
232 |
|
231 |
|
233 |
|
232 |
|
|
|
|
234 |
|
|
233 |
|
235 |
|
234 |
|
236 |
|
235 |
|
237 |
|
|
|
||
240 |
|
242 |
|
241 |
|
243 |
|
242 |
|
244 |
|
243 |
|
|
|
|
245 |
|
|
244 |
|
246 |
|
245 |
|
247 |
|
246 |
|
248 |
|
|
|
||
313 |
|
315 |
|
314 |
|
316 |
|
315 |
|
317 |
|
316 |
|
|
|
317 |
|
|
|
|
318 |
|
|
|
319 |
|
|
318 |
|
320 |
|
319 |
|
321 |
|
320 |
|
322 |
|
|
|
||
330 |
|
332 |
|
331 |
|
333 |
|
332 |
|
334 |
|
333 |
|
|
|
|
335 |
|
|
334 |
|
336 |
|
335 |
|
337 |
|
336 |
|
338 |
|
|
|
||
358 |
|
360 |
|
359 |
|
361 |
|
360 |
|
362 |
|
361 |
|
|
|
|
363 |
|
|
362 |
|
364 |
|
363 |
|
365 |
|
364 |
|
366 |
|
|
|
||
375 |
|
377 |
|
376 |
|
378 |
|
377 |
|
379 |
|
378 |
|
|
|
379 |
|
|
|
380 |
|
|
|
|
380 |
|
|
|
381 |
|
|
|
382 |
|
|
381 |
|
383 |
|
382 |
|
384 |
|
383 |
|
385 |
|
|
|
||
413 |
|
415 |
|
414 |
|
416 |
|
415 |
|
417 |
|
416 |
|
|
|
|
418 |
|
|
417 |
|
419 |
|
418 |
|
420 |
|
419 |
|
421 |
|
|
|
||
457 |
|
459 |
|
458 |
|
460 |
|
459 |
|
461 |
|
460 |
|
|
|
461 |
|
|
|
462 |
|
|
|
|
462 |
|
|
|
463 |
|
|
|
464 |
|
|
463 |
|
465 |
|
464 |
|
466 |
|
465 |
|
467 |
|
|
|
||
475 |
|
477 |
|
476 |
|
478 |
|
477 |
|
479 |
|
478 |
|
|
|
479 |
|
|
|
480 |
|
|
|
|
480 |
|
|
|
481 |
|
|
|
482 |
|
|
481 |
|
483 |
|
482 |
|
484 |
|
483 |
|
485 |
|
|
|
||
507 |
|
509 |
|
508 |
|
510 |
|
509 |
|
511 |
|
510 |
|
|
|
511 |
|
|
|
512 |
|
|
|
513 |
|
|
|
514 |
|
|
|
515 |
|
|
|
516 |
|
|
|
|
512 |
|
|
|
513 |
|
|
|
514 |
|
|
|
515 |
|
|
|
516 |
|
|
|
517 |
|
|
|
518 |
|
|
517 |
|
519 |
|
518 |
|
520 |
|
519 |
|
521 |
|
|
|
||
545 |
|
547 |
|
546 |
|
548 |
|
547 |
|
549 |
|
548 |
|
|
|
|
550 |
|
|
549 |
|
551 |
|
550 |
|
552 |
|
551 |
|
553 |
|
|
|
||
560 |
|
562 |
|
561 |
|
563 |
|
562 |
|
564 |
|
563 |
|
|
|
|
565 |
|
|
564 |
|
566 |
|
565 |
|
567 |
|
566 |
|
568 |
|
|
|
||
575 |
|
577 |
|
576 |
|
578 |
|
577 |
|
579 |
|
578 |
|
|
|
|
580 |
|
|
579 |
|
581 |
|
580 |
|
582 |
|
581 |
|
583 |
|
|
|
||
590 |
|
592 |
|
591 |
|
593 |
|
592 |
|
594 |
|
593 |
|
|
|
594 |
|
|
|
|
595 |
|
|
|
596 |
|
|
595 |
|
597 |
|
596 |
|
598 |
|
597 |
|
599 |
|
|
|
||
605 |
|
607 |
|
606 |
|
608 |
|
607 |
|
609 |
|
608 |
|
|
|
609 |
|
|
|
|
610 |
|
|
|
611 |
|
|
610 |
|
612 |
|
611 |
|
613 |
|
612 |
|
614 |
|
|
|
||
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
26 |
|
27 |
|
|
|
28 |
|
27 |
|
29 |
|
28 |
|
30 |
|
29 |
|
31 |
|
30 |
|
32 |
|
31 |
|
33 |
|
32 |
|
|
33 |
|
|
|
34 |
|
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
|
|
||
156 |
|
157 |
|
157 |
|
158 |
|
158 |
|
159 |
|
159 |
|
|
|
|
160 |
|
|
160 |
|
161 |
|
161 |
|
162 |
|
162 |
|
163 |
|
|
|
||
195 |
|
196 |
|
196 |
|
197 |
|
197 |
|
198 |
|
198 |
|
|
|
|
199 |
|
|
199 |
|
200 |
|
200 |
|
201 |
|
201 |
|
202 |
|
|
|
||
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
52 |
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
53 |
|
56 |
|
54 |
|
57 |
|
55 |
|
58 |
|
|
|
||
268 |
|
271 |
|
269 |
|
272 |
|
270 |
|
273 |
|
271 |
|
|
|
272 |
|
|
|
|
274 |
|
|
|
275 |
|
|
273 |
|
276 |
|
274 |
|
277 |
|
275 |
|
278 |
|
|
|
||
421 |
|
424 |
|
422 |
|
425 |
|
423 |
|
426 |
|
424 |
|
|
|
|
427 |
|
|
425 |
|
428 |
|
426 |
|
429 |
|
427 |
|
430 |
|
|
|
||
446 |
|
449 |
|
447 |
|
450 |
|
448 |
|
451 |
|
449 |
|
|
|
|
452 |
|
|
450 |
|
453 |
|
451 |
|
454 |
|
452 |
|
455 |
|
453 |
|
|
|
|
456 |
|
|
454 |
|
457 |
|
455 |
|
458 |
|
456 |
|
459 |
|
|
|
||
478 |
|
481 |
|
479 |
|
482 |
|
480 |
|
483 |
|
481 |
|
|
|
|
484 |
|
|
482 |
|
485 |
|
483 |
|
486 |
|
484 |
|
487 |
|
|
|
||
82 |
|
82 |
|
83 |
|
83 |
|
84 |
|
84 |
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
|
88 |
|
|
|
89 |
|
|
|
90 |
|
|
|
91 |
|
|
|
92 |
|
|
|
93 |
|
|
|
94 |
|
|
|
95 |
|
|
|
96 |
|
|
|
97 |
|
85 |
|
98 |
|
86 |
|
99 |
|
87 |
|
|
|
||
27 |
|
27 |
|
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
|
|
31 |
|
30 |
|
32 |
|
31 |
|
33 |
|
32 |
|
|
|
||
38 |
|
37 |
|
39 |
|
38 |
|
40 |
|
39 |
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
41 |
|
43 |
|
42 |
|
44 |
|
43 |
|
45 |
|
|
|
||
68 |
|
70 |
|
69 |
|
71 |
|
70 |
|
72 |
|
71 |
|
|
|
|
73 |
|
|
72 |
|
74 |
|
73 |
|
75 |
|
74 |
|
76 |
|
|
|
||
146 |
|
148 |
|
147 |
|
149 |
|
148 |
|
150 |
|
149 |
|
|
|
150 |
|
|
|
|
151 |
|
|
|
152 |
|
|
151 |
|
153 |
|
152 |
|
154 |
|
153 |
|
155 |
|
|
|
||
184 |
|
186 |
|
185 |
|
187 |
|
186 |
|
188 |
|
187 |
|
|
|
188 |
|
|
|
189 |
|
|
|
190 |
|
|
|
|
189 |
|
|
|
190 |
|
|
|
191 |
|
|
|
192 |
|
|
191 |
|
193 |
|
192 |
|
194 |
|
193 |
|
195 |
|
|
|
||
224 |
|
226 |
|
225 |
|
227 |
|
226 |
|
228 |
|
227 |
|
|
|
228 |
|
|
|
|
229 |
|
|
|
230 |
|
|
229 |
|
231 |
|
230 |
|
232 |
|
231 |
|
233 |
|
|
|
||
252 |
|
254 |
|
253 |
|
255 |
|
254 |
|
256 |
|
255 |
|
|
|
|
257 |
|
|
256 |
|
258 |
|
257 |
|
259 |
|
258 |
|
260 |
|
|
|
||
270 |
|
272 |
|
271 |
|
273 |
|
272 |
|
274 |
|
273 |
|
|
|
274 |
|
|
|
275 |
|
|
|
276 |
|
|
|
|
275 |
|
|
|
276 |
|
|
|
277 |
|
|
277 |
|
278 |
|
278 |
|
279 |
|
279 |
|
280 |
|