Переглянути джерело

Remove use of ChannelInfo.

pull/338/head
Chris Smith 9 роки тому
джерело
коміт
c226437737

+ 6
- 5
logging/src/com/dmdirc/addons/logging/LogFileLocator.java Переглянути файл

27
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
27
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
28
 import com.dmdirc.config.ConfigBinding;
28
 import com.dmdirc.config.ConfigBinding;
29
 import com.dmdirc.events.UserErrorEvent;
29
 import com.dmdirc.events.UserErrorEvent;
30
+import com.dmdirc.interfaces.Connection;
31
+import com.dmdirc.interfaces.GroupChat;
30
 import com.dmdirc.interfaces.User;
32
 import com.dmdirc.interfaces.User;
31
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
32
 import com.dmdirc.logger.ErrorLevel;
34
 import com.dmdirc.logger.ErrorLevel;
33
-import com.dmdirc.parser.interfaces.ChannelInfo;
34
 import com.dmdirc.plugins.PluginDomain;
35
 import com.dmdirc.plugins.PluginDomain;
35
 
36
 
36
 import java.io.File;
37
 import java.io.File;
39
 import java.security.NoSuchAlgorithmException;
40
 import java.security.NoSuchAlgorithmException;
40
 import java.text.SimpleDateFormat;
41
 import java.text.SimpleDateFormat;
41
 import java.util.Date;
42
 import java.util.Date;
43
+import java.util.Optional;
42
 
44
 
43
 import javax.annotation.Nullable;
45
 import javax.annotation.Nullable;
44
 import javax.inject.Inject;
46
 import javax.inject.Inject;
103
      *
105
      *
104
      * @return the name of the log file to use for this object.
106
      * @return the name of the log file to use for this object.
105
      */
107
      */
106
-    public String getLogFile(final ChannelInfo channel) {
108
+    public String getLogFile(final GroupChat channel) {
107
         final StringBuffer directory = getLogDirectory();
109
         final StringBuffer directory = getLogDirectory();
108
         final StringBuffer file = new StringBuffer();
110
         final StringBuffer file = new StringBuffer();
109
-        if (channel.getParser() != null) {
110
-            addNetworkDir(directory, file, channel.getParser().getNetworkName());
111
-        }
111
+        final Optional<String> network = channel.getConnection().map(Connection::getNetwork);
112
+        network.ifPresent(n -> addNetworkDir(directory, file, n));
112
         file.append(sanitise(channel.getName().toLowerCase()));
113
         file.append(sanitise(channel.getName().toLowerCase()));
113
         return getPath(directory, file, channel.getName());
114
         return getPath(directory, file, channel.getName());
114
     }
115
     }

+ 11
- 11
logging/src/com/dmdirc/addons/logging/LoggingManager.java Переглянути файл

260
 
260
 
261
     @Handler
261
     @Handler
262
     public void handleChannelMessage(final BaseChannelMessageEvent event) {
262
     public void handleChannelMessage(final BaseChannelMessageEvent event) {
263
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
263
+        final String filename = locator.getLogFile(event.getChannel());
264
         appendLine(filename, "<%s> %s", getDisplayName(event.getClient()), event.getMessage());
264
         appendLine(filename, "<%s> %s", getDisplayName(event.getClient()), event.getMessage());
265
     }
265
     }
266
 
266
 
267
     @Handler
267
     @Handler
268
     public void handleChannelAction(final BaseChannelActionEvent event) {
268
     public void handleChannelAction(final BaseChannelActionEvent event) {
269
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
269
+        final String filename = locator.getLogFile(event.getChannel());
270
         appendLine(filename, "* %s %s", getDisplayName(event.getClient()), event.getMessage());
270
         appendLine(filename, "* %s %s", getDisplayName(event.getClient()), event.getMessage());
271
     }
271
     }
272
 
272
 
273
     @Handler
273
     @Handler
274
     public void handleChannelGotTopic(final ChannelGotTopicEvent event) {
274
     public void handleChannelGotTopic(final ChannelGotTopicEvent event) {
275
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
275
+        final String filename = locator.getLogFile(event.getChannel());
276
         final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
276
         final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
277
         final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
277
         final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
278
 
278
 
286
 
286
 
287
     @Handler
287
     @Handler
288
     public void handleChannelTopicChange(final ChannelTopicChangeEvent event) {
288
     public void handleChannelTopicChange(final ChannelTopicChangeEvent event) {
289
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
289
+        final String filename = locator.getLogFile(event.getChannel());
290
         appendLine(filename, "*** %s Changed the topic to: %s",
290
         appendLine(filename, "*** %s Changed the topic to: %s",
291
                 event.getTopic().getClient().map(this::getDisplayName).orElse(""), event.getTopic());
291
                 event.getTopic().getClient().map(this::getDisplayName).orElse(""), event.getTopic());
292
     }
292
     }
293
 
293
 
294
     @Handler
294
     @Handler
295
     public void handleChannelJoin(final ChannelJoinEvent event) {
295
     public void handleChannelJoin(final ChannelJoinEvent event) {
296
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
296
+        final String filename = locator.getLogFile(event.getChannel());
297
         final GroupChatUser channelClient = event.getClient();
297
         final GroupChatUser channelClient = event.getClient();
298
         appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient),
298
         appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient),
299
                 channelClient.getNickname());
299
                 channelClient.getNickname());
301
 
301
 
302
     @Handler
302
     @Handler
303
     public void handleChannelPart(final ChannelPartEvent event) {
303
     public void handleChannelPart(final ChannelPartEvent event) {
304
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
304
+        final String filename = locator.getLogFile(event.getChannel());
305
         final String message = event.getMessage();
305
         final String message = event.getMessage();
306
         final GroupChatUser channelClient = event.getClient();
306
         final GroupChatUser channelClient = event.getClient();
307
         if (message.isEmpty()) {
307
         if (message.isEmpty()) {
315
 
315
 
316
     @Handler
316
     @Handler
317
     public void handleChannelQuit(final ChannelQuitEvent event) {
317
     public void handleChannelQuit(final ChannelQuitEvent event) {
318
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
318
+        final String filename = locator.getLogFile(event.getChannel());
319
         final String reason = event.getMessage();
319
         final String reason = event.getMessage();
320
         final GroupChatUser channelClient = event.getClient();
320
         final GroupChatUser channelClient = event.getClient();
321
         if (reason.isEmpty()) {
321
         if (reason.isEmpty()) {
332
         final GroupChatUser victim = event.getVictim();
332
         final GroupChatUser victim = event.getVictim();
333
         final GroupChatUser perpetrator = event.getClient();
333
         final GroupChatUser perpetrator = event.getClient();
334
         final String reason = event.getReason();
334
         final String reason = event.getReason();
335
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
335
+        final String filename = locator.getLogFile(event.getChannel());
336
 
336
 
337
         if (reason.isEmpty()) {
337
         if (reason.isEmpty()) {
338
             appendLine(filename, "*** %s was kicked by %s",
338
             appendLine(filename, "*** %s was kicked by %s",
345
 
345
 
346
     @Handler
346
     @Handler
347
     public void handleNickChange(final ChannelNickChangeEvent event) {
347
     public void handleNickChange(final ChannelNickChangeEvent event) {
348
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
348
+        final String filename = locator.getLogFile(event.getChannel());
349
         appendLine(filename, "*** %s is now %s", getDisplayName(event.getClient(),
349
         appendLine(filename, "*** %s is now %s", getDisplayName(event.getClient(),
350
                 event.getOldNick()), getDisplayName(event.getClient()));
350
                 event.getOldNick()), getDisplayName(event.getClient()));
351
     }
351
     }
352
 
352
 
353
     @Handler
353
     @Handler
354
     public void handleModeChange(final ChannelModeChangeEvent event) {
354
     public void handleModeChange(final ChannelModeChangeEvent event) {
355
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
355
+        final String filename = locator.getLogFile(event.getChannel());
356
         if (event.getClient().getNickname().isEmpty()) {
356
         if (event.getClient().getNickname().isEmpty()) {
357
             appendLine(filename, "*** Channel modes are: %s", event.getModes());
357
             appendLine(filename, "*** Channel modes are: %s", event.getModes());
358
         } else {
358
         } else {
371
         final String filename = locator.getLogFile(event.getChannel().getName());
371
         final String filename = locator.getLogFile(event.getChannel().getName());
372
 
372
 
373
         if (autobackbuffer) {
373
         if (autobackbuffer) {
374
-            showBackBuffer(event.getChannel(), filename);
374
+            showBackBuffer(event.getChannel().getWindowModel(), filename);
375
         }
375
         }
376
 
376
 
377
         synchronized (FORMAT_LOCK) {
377
         synchronized (FORMAT_LOCK) {

Завантаження…
Відмінити
Зберегти