Kaynağa Gözat

Disable the old formatting path for some events.

Everything handled by the event formatter is now soley done
based on that.
pull/334/head
Chris Smith 9 yıl önce
ebeveyn
işleme
98af21f4b4

+ 3
- 18
src/com/dmdirc/Channel.java Dosyayı Görüntüle

@@ -49,7 +49,6 @@ import com.dmdirc.ui.input.TabCompletionType;
49 49
 import com.dmdirc.ui.messages.BackBufferFactory;
50 50
 import com.dmdirc.ui.messages.Styliser;
51 51
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
52
-import com.dmdirc.util.EventUtils;
53 52
 import com.dmdirc.util.URLBuilder;
54 53
 import com.dmdirc.util.collections.ListenerList;
55 54
 import com.dmdirc.util.collections.RollingList;
@@ -179,15 +178,8 @@ public class Channel extends MessageTarget implements GroupChat {
179 178
         }
180 179
 
181 180
         final GroupChatUser me = getUser(server.getLocalUser().get()).get();
182
-        final String[] details = getDetails(me);
183
-
184 181
         splitLine(line).stream().filter(part -> !part.isEmpty()).forEach(part -> {
185
-            final ChannelSelfMessageEvent event =
186
-                    new ChannelSelfMessageEvent(this, me, part);
187
-            final String format =
188
-                    EventUtils.postDisplayable(getEventBus(), event, "channelSelfMessage");
189
-            addLine(format, details[0], details[1], details[2], details[3], part, channelInfo);
190
-
182
+            getEventBus().publishAsync(new ChannelSelfMessageEvent(this, me, part));
191 183
             channelInfo.sendMessage(part);
192 184
         });
193 185
     }
@@ -207,19 +199,12 @@ public class Channel extends MessageTarget implements GroupChat {
207 199
             return;
208 200
         }
209 201
 
210
-
211
-        final GroupChatUser me = getUser(server.getLocalUser().get()).get();
212
-        final String[] details = getDetails(me);
213
-
214 202
         if (server.getParser().get().getMaxLength("PRIVMSG", getChannelInfo().getName())
215 203
                 <= action.length()) {
216 204
             addLine("actionTooLong", action.length());
217 205
         } else {
218
-            final ChannelSelfActionEvent event = new ChannelSelfActionEvent(this, me, action);
219
-            final String format = EventUtils.postDisplayable(getEventBus(), event,
220
-                    "channelSelfAction");
221
-            addLine(format, details[0], details[1], details[2], details[3], action, channelInfo);
222
-
206
+            final GroupChatUser me = getUser(server.getLocalUser().get()).get();
207
+            getEventBus().publishAsync(new ChannelSelfActionEvent(this, me, action));
223 208
             channelInfo.sendAction(action);
224 209
         }
225 210
     }

+ 8
- 19
src/com/dmdirc/ChannelEventHandler.java Dosyayı Görüntüle

@@ -142,12 +142,8 @@ public class ChannelEventHandler extends EventHandler implements
142 142
             final String message, final String host) {
143 143
         checkParser(parser);
144 144
 
145
-        final ChannelMessageEvent event = new ChannelMessageEvent(owner,
146
-                groupChatUserManager.getUserFromClient(client, owner), message);
147
-        final String format = EventUtils.postDisplayable(eventBus, event,
148
-                isMyself(client) ? "channelSelfExternalMessage" : "channelMessage");
149
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner),
150
-                message);
145
+        eventBus.publishAsync(new ChannelMessageEvent(owner,
146
+                groupChatUserManager.getUserFromClient(client, owner), message));
151 147
     }
152 148
 
153 149
     @Override
@@ -271,11 +267,8 @@ public class ChannelEventHandler extends EventHandler implements
271 267
             final String host) {
272 268
         checkParser(parser);
273 269
 
274
-        final ChannelActionEvent event = new ChannelActionEvent(owner,
275
-                groupChatUserManager.getUserFromClient(client, owner), message);
276
-        final String format = EventUtils.postDisplayable(eventBus, event,
277
-                isMyself(client) ? "channelSelfExternalAction" : "channelAction");
278
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), message);
270
+        eventBus.publishAsync(new ChannelActionEvent(owner,
271
+                groupChatUserManager.getUserFromClient(client, owner), message));
279 272
     }
280 273
 
281 274
     @Override
@@ -383,10 +376,8 @@ public class ChannelEventHandler extends EventHandler implements
383 376
             final String message, final String host) {
384 377
         checkParser(parser);
385 378
 
386
-        final ChannelNoticeEvent event = new ChannelNoticeEvent(owner,
387
-                groupChatUserManager.getUserFromClient(client, owner), message);
388
-        final String format = EventUtils.postDisplayable(eventBus, event, "channelNotice");
389
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), message);
379
+        eventBus.publishAsync(new ChannelNoticeEvent(owner,
380
+                groupChatUserManager.getUserFromClient(client, owner), message));
390 381
     }
391 382
 
392 383
     @Override
@@ -422,11 +413,9 @@ public class ChannelEventHandler extends EventHandler implements
422 413
             final String host) {
423 414
         checkParser(parser);
424 415
 
425
-        final ChannelModeNoticeEvent event = new ChannelModeNoticeEvent(owner,
416
+        eventBus.publishAsync(new ChannelModeNoticeEvent(owner,
426 417
                 groupChatUserManager.getUserFromClient(client, owner), String.valueOf(prefix),
427
-                message);
428
-        final String format = EventUtils.postDisplayable(eventBus, event, "channelModeNotice");
429
-        owner.doNotification(date, format, groupChatUserManager.getUserFromClient(client, owner), String.valueOf(prefix), message);
418
+                message));
430 419
     }
431 420
 
432 421
     @Override

Loading…
İptal
Kaydet