Conflicts: src/com/dmdirc/addons/ui_swing/components/TopicBar.java src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java src/com/dmdirc/addons/ui_swing/injection/DialogModule.java Change-Id: Iec6278e7aa84c74fa8a6fea1af2d021f3835b241 Depends-On: Ib0cbe91bec51db7e66d860d65840e784f880e53d Reviewed-on: http://gerrit.dmdirc.com/3391 Reviewed-by: Greg Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Build Managerchanges/91/3391/4
|
||
33 | 33 |
|
34 | 34 |
|
35 | 35 |
|
36 |
|
|
36 | 37 |
|
37 | 38 |
|
38 | 39 |
|
|
||
118 | 119 |
|
119 | 120 |
|
120 | 121 |
|
122 |
|
|
121 | 123 |
|
122 | 124 |
|
123 | 125 |
|
|
||
129 | 131 |
|
130 | 132 |
|
131 | 133 |
|
134 |
|
|
132 | 135 |
|
133 | 136 |
|
134 | 137 |
|
|
||
155 | 158 |
|
156 | 159 |
|
157 | 160 |
|
158 |
|
|
161 |
|
|
162 |
|
|
159 | 163 |
|
160 | 164 |
|
161 | 165 |
|
|
||
34 | 34 |
|
35 | 35 |
|
36 | 36 |
|
37 |
|
|
37 | 38 |
|
38 | 39 |
|
39 | 40 |
|
|
||
42 | 43 |
|
43 | 44 |
|
44 | 45 |
|
46 |
|
|
47 |
|
|
45 | 48 |
|
46 | 49 |
|
47 | 50 |
|
|
||
94 | 97 |
|
95 | 98 |
|
96 | 99 |
|
100 |
|
|
101 |
|
|
102 |
|
|
103 |
|
|
97 | 104 |
|
98 | 105 |
|
99 | 106 |
|
|
||
114 | 121 |
|
115 | 122 |
|
116 | 123 |
|
124 |
|
|
125 |
|
|
117 | 126 |
|
118 | 127 |
|
119 | 128 |
|
|
||
156 | 165 |
|
157 | 166 |
|
158 | 167 |
|
159 |
|
|
160 |
|
|
168 |
|
|
169 |
|
|
161 | 170 |
|
162 | 171 |
|
163 | 172 |
|
|
||
55 | 55 |
|
56 | 56 |
|
57 | 57 |
|
58 |
|
|
58 | 59 |
|
59 | 60 |
|
60 | 61 |
|
|
||
545 | 546 |
|
546 | 547 |
|
547 | 548 |
|
549 |
|
|
548 | 550 |
|
549 | 551 |
|
550 | 552 |
|
|
||
558 | 560 |
|
559 | 561 |
|
560 | 562 |
|
561 |
|
|
563 |
|
|
564 |
|
|
562 | 565 |
|
563 | 566 |
|
564 | 567 |
|
|
||
570 | 573 |
|
571 | 574 |
|
572 | 575 |
|
576 |
|
|
573 | 577 |
|
574 | 578 |
|
575 | 579 |
|
|
||
27 | 27 |
|
28 | 28 |
|
29 | 29 |
|
30 |
|
|
30 | 31 |
|
31 | 32 |
|
32 | 33 |
|
33 | 34 |
|
34 | 35 |
|
35 | 36 |
|
37 |
|
|
38 |
|
|
36 | 39 |
|
37 | 40 |
|
38 | 41 |
|
|
||
51 | 54 |
|
52 | 55 |
|
53 | 56 |
|
54 |
|
|
55 |
|
|
56 |
|
|
57 |
|
|
57 |
|
|
58 |
|
|
59 |
|
|
60 |
|
|
61 |
|
|
62 |
|
|
58 | 63 |
|
59 | 64 |
|
60 | 65 |
|
61 | 66 |
|
67 |
|
|
62 | 68 |
|
63 |
|
|
64 |
|
|
69 |
|
|
70 |
|
|
71 |
|
|
65 | 72 |
|
66 | 73 |
|
67 | 74 |
|
|
||
31 | 31 |
|
32 | 32 |
|
33 | 33 |
|
34 |
|
|
34 | 35 |
|
35 | 36 |
|
36 | 37 |
|
|
||
82 | 83 |
|
83 | 84 |
|
84 | 85 |
|
86 |
|
|
87 |
|
|
85 | 88 |
|
86 | 89 |
|
87 | 90 |
|
|
||
95 | 98 |
|
96 | 99 |
|
97 | 100 |
|
101 |
|
|
98 | 102 |
|
99 | 103 |
|
100 | 104 |
|
|
||
105 | 109 |
|
106 | 110 |
|
107 | 111 |
|
108 |
|
|
112 |
|
|
113 |
|
|
109 | 114 |
|
110 | 115 |
|
111 | 116 |
|
|
||
114 | 119 |
|
115 | 120 |
|
116 | 121 |
|
122 |
|
|
117 | 123 |
|
118 | 124 |
|
119 | 125 |
|
|
||
153 | 159 |
|
154 | 160 |
|
155 | 161 |
|
156 |
|
|
162 |
|
|
163 |
|
|
157 | 164 |
|
158 | 165 |
|
159 | 166 |
|
|
||
30 | 30 |
|
31 | 31 |
|
32 | 32 |
|
33 |
|
|
33 | 34 |
|
34 | 35 |
|
35 | 36 |
|
|
||
83 | 84 |
|
84 | 85 |
|
85 | 86 |
|
87 |
|
|
86 | 88 |
|
87 | 89 |
|
88 | 90 |
|
89 |
|
|
91 |
|
|
92 |
|
|
90 | 93 |
|
91 | 94 |
|
92 | 95 |
|
93 | 96 |
|
94 | 97 |
|
95 | 98 |
|
96 |
|
|
99 |
|
|
97 | 100 |
|
98 | 101 |
|
99 | 102 |
|
100 | 103 |
|
101 | 104 |
|
102 | 105 |
|
103 |
|
|
104 |
|
|
105 |
|
|
106 |
|
|
107 |
|
|
108 |
|
|
109 |
|
|
110 |
|
|
106 | 111 |
|
107 | 112 |
|
108 | 113 |
|
|
||
113 | 118 |
|
114 | 119 |
|
115 | 120 |
|
116 |
|
|
121 |
|
|
122 |
|
|
117 | 123 |
|
118 | 124 |
|
119 | 125 |
|
|
||
24 | 24 |
|
25 | 25 |
|
26 | 26 |
|
27 |
|
|
27 | 28 |
|
28 | 29 |
|
29 | 30 |
|
|
||
59 | 60 |
|
60 | 61 |
|
61 | 62 |
|
63 |
|
|
62 | 64 |
|
63 | 65 |
|
64 | 66 |
|
65 | 67 |
|
66 | 68 |
|
67 | 69 |
|
70 |
|
|
68 | 71 |
|
69 | 72 |
|
70 | 73 |
|
|
||
75 | 78 |
|
76 | 79 |
|
77 | 80 |
|
78 |
|
|
79 |
|
|
80 |
|
|
81 |
|
|
82 |
|
|
83 | 81 |
|
84 | 82 |
|
85 | 83 |
|
86 |
|
|
84 |
|
|
87 | 85 |
|
88 | 86 |
|
89 | 87 |
|
|
||
91 | 89 |
|
92 | 90 |
|
93 | 91 |
|
94 |
|
|
95 |
|
|
96 |
|
|
92 |
|
|
93 |
|
|
94 |
|
|
95 |
|
|
97 | 96 |
|
98 |
|
|
97 |
|
|
99 | 98 |
|
100 | 99 |
|
101 | 100 |
|
|
||
29 | 29 |
|
30 | 30 |
|
31 | 31 |
|
32 |
|
|
32 | 33 |
|
33 | 34 |
|
34 | 35 |
|
35 | 36 |
|
36 | 37 |
|
37 | 38 |
|
39 |
|
|
40 |
|
|
38 | 41 |
|
39 | 42 |
|
40 | 43 |
|
|
||
78 | 81 |
|
79 | 82 |
|
80 | 83 |
|
84 |
|
|
85 |
|
|
86 |
|
|
87 |
|
|
81 | 88 |
|
82 | 89 |
|
83 | 90 |
|
84 | 91 |
|
85 |
|
|
86 |
|
|
87 |
|
|
88 |
|
|
89 |
|
|
90 |
|
|
92 |
|
|
93 |
|
|
94 |
|
|
95 |
|
|
96 |
|
|
97 |
|
|
98 |
|
|
99 |
|
|
91 | 100 |
|
92 | 101 |
|
93 | 102 |
|
94 | 103 |
|
95 | 104 |
|
105 |
|
|
106 |
|
|
96 | 107 |
|
97 | 108 |
|
98 | 109 |
|
|
||
103 | 114 |
|
104 | 115 |
|
105 | 116 |
|
117 |
|
|
118 |
|
|
106 | 119 |
|
107 | 120 |
|
108 | 121 |
|
|
||
142 | 155 |
|
143 | 156 |
|
144 | 157 |
|
145 |
|
|
146 |
|
|
158 |
|
|
159 |
|
|
160 |
|
|
147 | 161 |
|
148 | 162 |
|
149 | 163 |
|
|
||
43 | 43 |
|
44 | 44 |
|
45 | 45 |
|
46 |
|
|
46 | 47 |
|
47 | 48 |
|
48 | 49 |
|
|
||
150 | 151 |
|
151 | 152 |
|
152 | 153 |
|
153 |
|
|
154 |
|
|
155 |
|
|
154 | 156 |
|
155 | 157 |
|
156 | 158 |
|
157 | 159 |
|
158 | 160 |
|
159 |
|
|
161 |
|
|
160 | 162 |
|
161 | 163 |
|
162 | 164 |
|
|
||
24 | 24 |
|
25 | 25 |
|
26 | 26 |
|
27 |
|
|
27 | 28 |
|
28 | 29 |
|
29 | 30 |
|
|
||
31 | 32 |
|
32 | 33 |
|
33 | 34 |
|
35 |
|
|
36 |
|
|
34 | 37 |
|
35 | 38 |
|
36 | 39 |
|
|
||
52 | 55 |
|
53 | 56 |
|
54 | 57 |
|
58 |
|
|
59 |
|
|
60 |
|
|
61 |
|
|
55 | 62 |
|
56 | 63 |
|
57 | 64 |
|
58 | 65 |
|
59 | 66 |
|
60 | 67 |
|
68 |
|
|
69 |
|
|
61 | 70 |
|
62 | 71 |
|
63 | 72 |
|
|
||
68 | 77 |
|
69 | 78 |
|
70 | 79 |
|
80 |
|
|
81 |
|
|
71 | 82 |
|
72 | 83 |
|
73 | 84 |
|
|
||
76 | 87 |
|
77 | 88 |
|
78 | 89 |
|
90 |
|
|
91 |
|
|
79 | 92 |
|
80 | 93 |
|
81 | 94 |
|
|
||
124 | 137 |
|
125 | 138 |
|
126 | 139 |
|
140 |
|
|
141 |
|
|
142 |
|
|
143 |
|
|
144 |
|
|
145 |
|
|
146 |
|
|
147 |
|
|
127 | 148 |
|
128 | 149 |
|
129 | 150 |
|
|
||
24 | 24 |
|
25 | 25 |
|
26 | 26 |
|
27 |
|
|
27 | 28 |
|
28 | 29 |
|
29 | 30 |
|
30 | 31 |
|
31 | 32 |
|
33 |
|
|
34 |
|
|
32 | 35 |
|
33 | 36 |
|
34 | 37 |
|
|
||
36 | 39 |
|
37 | 40 |
|
38 | 41 |
|
39 |
|
|
40 |
|
|
41 |
|
|
42 |
|
|
42 |
|
|
43 |
|
|
44 |
|
|
45 |
|
|
46 |
|
|
47 |
|
|
43 | 48 |
|
44 | 49 |
|
45 | 50 |
|
|
||
50 | 50 |
|
51 | 51 |
|
52 | 52 |
|
53 |
|
|
53 |
|
|
54 |
|
|
54 | 55 |
|
55 | 56 |
|
57 |
|
|
56 | 58 |
|
57 | 59 |
|
58 | 60 |
|
|
||
66 | 68 |
|
67 | 69 |
|
68 | 70 |
|
69 |
|
|
71 |
|
|
72 |
|
|
70 | 73 |
|
71 | 74 |
|
72 | 75 |
|