Remove pointless super() calls. Remove redundant interface decs. Remove unnecessary enum annotations. Change .length == 0 to .isEmpty. Change-Id: Idadc982cc8f37aec4404ec8ec26d0a5b1f0515ad Reviewed-on: http://gerrit.dmdirc.com/3842 Automatic-Compile: DMDirc Build Manager Reviewed-by: Greg Holmes <greg@dmdirc.com>changes/42/3842/3
|
|
||
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
|
|
|
40 |
|
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
43 |
|
|
|
||
90 |
|
90 |
|
91 |
|
91 |
|
92 |
|
92 |
|
93 |
|
|
|
94 |
|
93 |
|
95 |
|
94 |
|
96 |
|
95 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
153 |
|
153 |
|
154 |
|
154 |
|
155 |
|
155 |
|
156 |
|
|
|
|
156 |
|
|
157 |
|
157 |
|
158 |
|
158 |
|
159 |
|
159 |
|
|
|
||
180 |
|
180 |
|
181 |
|
181 |
|
182 |
|
182 |
|
183 |
|
|
|
|
183 |
|
|
184 |
|
184 |
|
185 |
|
185 |
|
186 |
|
186 |
|
|
|
||
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
|
|
53 |
|
52 |
|
54 |
|
53 |
|
55 |
|
54 |
|
|
|
||
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
52 |
|
53 |
|
|
|
54 |
|
53 |
|
55 |
|
54 |
|
56 |
|
55 |
|
|
|
||
66 |
|
66 |
|
67 |
|
67 |
|
68 |
|
68 |
|
69 |
|
|
|
70 |
|
69 |
|
71 |
|
70 |
|
72 |
|
71 |
|
|
|
||
95 |
|
95 |
|
96 |
|
96 |
|
97 |
|
97 |
|
98 |
|
|
|
99 |
|
98 |
|
100 |
|
99 |
|
101 |
|
100 |
|
|
|
||
198 |
|
198 |
|
199 |
|
199 |
|
200 |
|
200 |
|
201 |
|
|
|
|
201 |
|
|
202 |
|
202 |
|
203 |
|
203 |
|
204 |
|
204 |
|
|
|
||
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
|
|
47 |
|
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
|
|
||
64 |
|
64 |
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
|
|
68 |
|
67 |
|
69 |
|
68 |
|
70 |
|
69 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
65 |
|
66 |
|
|
|
67 |
|
66 |
|
68 |
|
67 |
|
69 |
|
68 |
|
|
|
||
89 |
|
89 |
|
90 |
|
90 |
|
91 |
|
91 |
|
92 |
|
|
|
|
92 |
|
|
93 |
|
93 |
|
94 |
|
94 |
|
95 |
|
95 |
|
|
|
||
78 |
|
78 |
|
79 |
|
79 |
|
80 |
|
80 |
|
81 |
|
|
|
82 |
|
81 |
|
83 |
|
82 |
|
84 |
|
83 |
|
|
|
||
79 |
|
79 |
|
80 |
|
80 |
|
81 |
|
81 |
|
82 |
|
|
|
|
82 |
|
|
83 |
|
83 |
|
84 |
|
84 |
|
85 |
|
85 |
|
|
|
||
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
65 |
|
66 |
|
|
|
67 |
|
66 |
|
68 |
|
67 |
|
69 |
|
68 |
|
|
|
||
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
|
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
||
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
|
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
||
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
|
50 |
|
49 |
|
51 |
|
50 |
|
52 |
|
51 |
|
|
|
||
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
|
|
44 |
|
43 |
|
45 |
|
44 |
|
46 |
|
45 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
|
|
49 |
|
48 |
|
50 |
|
49 |
|
51 |
|
50 |
|
|
|
||
56 |
|
55 |
|
57 |
|
56 |
|
58 |
|
57 |
|
59 |
|
|
|
60 |
|
58 |
|
61 |
|
59 |
|
62 |
|
60 |
|
|
|
||
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
75 |
|
76 |
|
|
|
77 |
|
76 |
|
78 |
|
77 |
|
79 |
|
78 |
|
|
|
||
69 |
|
69 |
|
70 |
|
70 |
|
71 |
|
71 |
|
72 |
|
|
|
73 |
|
72 |
|
74 |
|
73 |
|
75 |
|
74 |
|
|
|
||
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
|
50 |
|
49 |
|
51 |
|
50 |
|
52 |
|
51 |
|
|
|
||
120 |
|
120 |
|
121 |
|
121 |
|
122 |
|
122 |
|
123 |
|
|
|
124 |
|
123 |
|
125 |
|
124 |
|
126 |
|
125 |
|
|
|
||
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
75 |
|
76 |
|
|
|
77 |
|
76 |
|
78 |
|
77 |
|
79 |
|
78 |
|
|
|
||
66 |
|
66 |
|
67 |
|
67 |
|
68 |
|
68 |
|
69 |
|
|
|
70 |
|
69 |
|
71 |
|
70 |
|
72 |
|
71 |
|
|
|
||
84 |
|
84 |
|
85 |
|
85 |
|
86 |
|
86 |
|
87 |
|
|
|
88 |
|
87 |
|
89 |
|
88 |
|
90 |
|
89 |
|
|
|
||
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
|
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
||
95 |
|
95 |
|
96 |
|
96 |
|
97 |
|
97 |
|
98 |
|
|
|
99 |
|
98 |
|
100 |
|
99 |
|
101 |
|
100 |
|
|
|
||
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
40 |
|
41 |
|
|
|
42 |
|
41 |
|
43 |
|
42 |
|
44 |
|
43 |
|
|
|
||
58 |
|
58 |
|
59 |
|
59 |
|
60 |
|
60 |
|
61 |
|
|
|
62 |
|
61 |
|
63 |
|
62 |
|
64 |
|
63 |
|
|
|
||
61 |
|
61 |
|
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
|
|
65 |
|
64 |
|
66 |
|
65 |
|
67 |
|
66 |
|
|
|
||
86 |
|
86 |
|
87 |
|
87 |
|
88 |
|
88 |
|
89 |
|
|
|
90 |
|
89 |
|
91 |
|
90 |
|
92 |
|
91 |
|
|
|
||
88 |
|
88 |
|
89 |
|
89 |
|
90 |
|
90 |
|
91 |
|
|
|
|
91 |
|
|
92 |
|
92 |
|
93 |
|
93 |
|
94 |
|
94 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
59 |
|
59 |
|
60 |
|
60 |
|
61 |
|
61 |
|
62 |
|
|
|
63 |
|
62 |
|
64 |
|
63 |
|
65 |
|
64 |
|
|
|
||
84 |
|
84 |
|
85 |
|
85 |
|
86 |
|
86 |
|
87 |
|
|
|
88 |
|
87 |
|
89 |
|
88 |
|
90 |
|
89 |
|
|
|
||
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
|
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
||
93 |
|
93 |
|
94 |
|
94 |
|
95 |
|
95 |
|
96 |
|
|
|
97 |
|
96 |
|
98 |
|
97 |
|
99 |
|
98 |
|
|
|
||
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
75 |
|
76 |
|
|
|
77 |
|
76 |
|
78 |
|
77 |
|
79 |
|
78 |
|
|
|
||
66 |
|
66 |
|
67 |
|
67 |
|
68 |
|
68 |
|
69 |
|
|
|
70 |
|
69 |
|
71 |
|
70 |
|
72 |
|
71 |
|
|
|
||
69 |
|
69 |
|
70 |
|
70 |
|
71 |
|
71 |
|
72 |
|
|
|
73 |
|
72 |
|
74 |
|
73 |
|
75 |
|
74 |
|
|
|
||
92 |
|
92 |
|
93 |
|
93 |
|
94 |
|
94 |
|
95 |
|
|
|
96 |
|
95 |
|
97 |
|
96 |
|
98 |
|
97 |
|
|
|
||
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
|
|
53 |
|
52 |
|
54 |
|
53 |
|
55 |
|
54 |
|
|
|
||
35 |
|
35 |
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
|
|
39 |
|
38 |
|
40 |
|
39 |
|
41 |
|
40 |
|
|
|
||
56 |
|
55 |
|
57 |
|
56 |
|
58 |
|
57 |
|
59 |
|
|
|
60 |
|
|
|
|
58 |
|
|
61 |
|
59 |
|
62 |
|
60 |
|
63 |
|
61 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
77 |
|
77 |
|
78 |
|
78 |
|
79 |
|
79 |
|
80 |
|
|
|
81 |
|
80 |
|
82 |
|
81 |
|
83 |
|
82 |
|
|
|
||
28 |
|
28 |
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
|
|
32 |
|
31 |
|
33 |
|
32 |
|
34 |
|
33 |
|
|
|
||
45 |
|
44 |
|
46 |
|
45 |
|
47 |
|
46 |
|
48 |
|
|
|
49 |
|
|
|
|
47 |
|
|
50 |
|
48 |
|
51 |
|
49 |
|
52 |
|
50 |
|
|
|
||
64 |
|
64 |
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
|
|
68 |
|
67 |
|
69 |
|
68 |
|
70 |
|
69 |
|
|
|
||
100 |
|
100 |
|
101 |
|
101 |
|
102 |
|
102 |
|
103 |
|
|
|
104 |
|
103 |
|
105 |
|
104 |
|
106 |
|
105 |
|
|
|
||
80 |
|
80 |
|
81 |
|
81 |
|
82 |
|
82 |
|
83 |
|
|
|
84 |
|
83 |
|
85 |
|
84 |
|
86 |
|
85 |
|
|
|
||
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
|
50 |
|
49 |
|
51 |
|
50 |
|
52 |
|
51 |
|
|
|
||
72 |
|
72 |
|
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
|
|
76 |
|
75 |
|
77 |
|
76 |
|
78 |
|
77 |
|
|
|
||
75 |
|
75 |
|
76 |
|
76 |
|
77 |
|
77 |
|
78 |
|
|
|
79 |
|
78 |
|
80 |
|
79 |
|
81 |
|
80 |
|
|
|
||
98 |
|
98 |
|
99 |
|
99 |
|
100 |
|
100 |
|
101 |
|
|
|
102 |
|
101 |
|
103 |
|
102 |
|
104 |
|
103 |
|
|
|
||
81 |
|
81 |
|
82 |
|
82 |
|
83 |
|
83 |
|
84 |
|
|
|
85 |
|
84 |
|
86 |
|
85 |
|
87 |
|
86 |
|
|
|
||
78 |
|
78 |
|
79 |
|
79 |
|
80 |
|
80 |
|
81 |
|
|
|
82 |
|
81 |
|
83 |
|
82 |
|
84 |
|
83 |
|
|
|
||
75 |
|
75 |
|
76 |
|
76 |
|
77 |
|
77 |
|
78 |
|
|
|
79 |
|
78 |
|
80 |
|
79 |
|
81 |
|
80 |
|
|
|
||
61 |
|
61 |
|
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
|
|
|
64 |
|
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
67 |
|
|
|
||
70 |
|
70 |
|
71 |
|
71 |
|
72 |
|
72 |
|
73 |
|
|
|
74 |
|
73 |
|
75 |
|
74 |
|
76 |
|
75 |
|
|
|
||
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
75 |
|
76 |
|
|
|
77 |
|
76 |
|
78 |
|
77 |
|
79 |
|
78 |
|
|
|
||
54 |
|
54 |
|
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
|
|
58 |
|
57 |
|
59 |
|
58 |
|
60 |
|
59 |
|
|
|
||
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
58 |
|
59 |
|
|
|
60 |
|
59 |
|
61 |
|
60 |
|
62 |
|
61 |
|
|
|
||
82 |
|
82 |
|
83 |
|
83 |
|
84 |
|
84 |
|
85 |
|
|
|
86 |
|
85 |
|
87 |
|
86 |
|
88 |
|
87 |
|
|
|
||
87 |
|
87 |
|
88 |
|
88 |
|
89 |
|
89 |
|
90 |
|
|
|
91 |
|
90 |
|
92 |
|
91 |
|
93 |
|
92 |
|
|
|
||
119 |
|
119 |
|
120 |
|
120 |
|
121 |
|
121 |
|
122 |
|
|
|
123 |
|
122 |
|
124 |
|
123 |
|
125 |
|
124 |
|
|
|
||
64 |
|
64 |
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
|
|
68 |
|
67 |
|
69 |
|
68 |
|
70 |
|
69 |
|
|
|
||
67 |
|
67 |
|
68 |
|
68 |
|
69 |
|
69 |
|
70 |
|
|
|
71 |
|
70 |
|
72 |
|
71 |
|
73 |
|
72 |
|
|
|
||
70 |
|
70 |
|
71 |
|
71 |
|
72 |
|
72 |
|
73 |
|
|
|
74 |
|
73 |
|
75 |
|
74 |
|
76 |
|
75 |
|
|
|
||
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
|
|
53 |
|
52 |
|
54 |
|
53 |
|
55 |
|
54 |
|
|
|
||
105 |
|
105 |
|
106 |
|
106 |
|
107 |
|
107 |
|
108 |
|
|
|
109 |
|
108 |
|
110 |
|
109 |
|
111 |
|
110 |
|
|
|
||
64 |
|
64 |
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
|
|
68 |
|
67 |
|
69 |
|
68 |
|
70 |
|
69 |
|
|
|
||
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
|
|
59 |
|
58 |
|
60 |
|
59 |
|
61 |
|
60 |
|
|
|
||
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
|
|
48 |
|
47 |
|
49 |
|
48 |
|
50 |
|
49 |
|
|
|
||
87 |
|
87 |
|
88 |
|
88 |
|
89 |
|
89 |
|
90 |
|
|
|
91 |
|
90 |
|
92 |
|
91 |
|
93 |
|
92 |
|
|
|
||
72 |
|
72 |
|
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
|
|
76 |
|
75 |
|
77 |
|
76 |
|
78 |
|
77 |
|
|
|
||
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
64 |
|
65 |
|
|
|
66 |
|
65 |
|
67 |
|
66 |
|
68 |
|
67 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
|
|
49 |
|
48 |
|
50 |
|
49 |
|
51 |
|
50 |
|
|
|
||
100 |
|
100 |
|
101 |
|
101 |
|
102 |
|
102 |
|
103 |
|
|
|
104 |
|
103 |
|
105 |
|
104 |
|
106 |
|
105 |
|
|
|
||
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
|
|
47 |
|
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
|
|
||
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
|
|
47 |
|
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
46 |
|
45 |
|
47 |
|
46 |
|
48 |
|
47 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
46 |
|
45 |
|
47 |
|
46 |
|
48 |
|
47 |
|
|
|
||
45 |
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
|
|
49 |
|
48 |
|
50 |
|
49 |
|
51 |
|
50 |
|
|
|
||
79 |
|
79 |
|
80 |
|
80 |
|
81 |
|
81 |
|
82 |
|
|
|
83 |
|
82 |
|
84 |
|
83 |
|
85 |
|
84 |
|
|
|
||
49 |
|
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
|
|
53 |
|
52 |
|
54 |
|
53 |
|
55 |
|
54 |
|
|
|
||
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
|
|
44 |
|
43 |
|
45 |
|
44 |
|
46 |
|
45 |
|
|
|
||
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
45 |
|
46 |
|
|
|
47 |
|
46 |
|
48 |
|
47 |
|
49 |
|
48 |
|
|
|
||
40 |
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
|
|
44 |
|
43 |
|
45 |
|
44 |
|
46 |
|
45 |
|