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

Merge pull request #470 from csmith/master

Fix logging plugin's handling of self query events
pull/471/head
Greg Holmes 8 роки тому
джерело
коміт
1d9228c5c2

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

116
     /** The manager to add history windows to. */
116
     /** The manager to add history windows to. */
117
     private final WindowManager windowManager;
117
     private final WindowManager windowManager;
118
     /** Map of open files. */
118
     /** Map of open files. */
119
-    private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(
120
-            new HashMap<>());
119
+    private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(new HashMap<>());
121
     private final DMDircMBassador eventBus;
120
     private final DMDircMBassador eventBus;
122
     private final Provider<String> directoryProvider;
121
     private final Provider<String> directoryProvider;
123
     private final BackBufferFactory backBufferFactory;
122
     private final BackBufferFactory backBufferFactory;
249
 
248
 
250
     @Handler
249
     @Handler
251
     public void handleQueryActions(final BaseQueryActionEvent event) {
250
     public void handleQueryActions(final BaseQueryActionEvent event) {
252
-        final User user = event.getUser();
251
+        final User user = event.getQuery().getUser();
253
         final String filename = locator.getLogFile(user);
252
         final String filename = locator.getLogFile(user);
254
         appendLine(filename, "* %s %s", user.getNickname(), event.getMessage());
253
         appendLine(filename, "* %s %s", user.getNickname(), event.getMessage());
255
     }
254
     }
256
 
255
 
257
     @Handler
256
     @Handler
258
     public void handleQueryMessages(final BaseQueryMessageEvent event) {
257
     public void handleQueryMessages(final BaseQueryMessageEvent event) {
259
-        final User user = event.getUser();
258
+        final User user = event.getQuery().getUser();
260
         final String filename = locator.getLogFile(user);
259
         final String filename = locator.getLogFile(user);
261
         appendLine(filename, "<%s> %s", user.getNickname(), event.getMessage());
260
         appendLine(filename, "<%s> %s", user.getNickname(), event.getMessage());
262
     }
261
     }

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