Merge pull request #703 from csmith/master

Use PrivateChat for events, not Query.

src/main/java/com/dmdirc/events/BaseQueryActionEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -32,12 +32,12 @@ import java.time.LocalDateTime;
  */
 public abstract class BaseQueryActionEvent extends BaseQueryTextEvent {
 
-    public BaseQueryActionEvent(final LocalDateTime timestamp, final Query query, final User user,
+    public BaseQueryActionEvent(final LocalDateTime timestamp, final PrivateChat query, final User user,
             final String message) {
         super(timestamp, query, user, message);
     }
 
-    public BaseQueryActionEvent(final Query query, final User user, final String message) {
+    public BaseQueryActionEvent(final PrivateChat query, final User user, final String message) {
         super(query, user, message);
     }
 

src/main/java/com/dmdirc/events/BaseQueryMessageEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -32,12 +32,12 @@ import java.time.LocalDateTime;
  */
 public abstract class BaseQueryMessageEvent extends BaseQueryTextEvent {
 
-    public BaseQueryMessageEvent(final LocalDateTime timestamp, final Query query, final User user,
+    public BaseQueryMessageEvent(final LocalDateTime timestamp, final PrivateChat query, final User user,
             final String message) {
         super(timestamp, query, user, message);
     }
 
-    public BaseQueryMessageEvent(final Query query, final User user, final String message) {
+    public BaseQueryMessageEvent(final PrivateChat query, final User user, final String message) {
         super(query, user, message);
     }
 

src/main/java/com/dmdirc/events/BaseQueryTextEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -35,14 +35,14 @@ public abstract class BaseQueryTextEvent extends QueryDisplayableEvent {
     private final User user;
     private final String message;
 
-    public BaseQueryTextEvent(final LocalDateTime timestamp, final Query query, final User user,
+    public BaseQueryTextEvent(final LocalDateTime timestamp, final PrivateChat query, final User user,
             final String message) {
         super(timestamp, query);
         this.user = user;
         this.message = message;
     }
 
-    public BaseQueryTextEvent(final Query query, final User user, final String message) {
+    public BaseQueryTextEvent(final PrivateChat query, final User user, final String message) {
         super(query);
         this.user = user;
         this.message = message;

src/main/java/com/dmdirc/events/QueryActionEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -32,12 +32,12 @@ import java.time.LocalDateTime;
  */
 public class QueryActionEvent extends BaseQueryActionEvent {
 
-    public QueryActionEvent(final LocalDateTime timestamp, final Query query, final User user,
+    public QueryActionEvent(final LocalDateTime timestamp, final PrivateChat query, final User user,
             final String message) {
         super(timestamp, query, user, message);
     }
 
-    public QueryActionEvent(final Query query, final User user, final String message) {
+    public QueryActionEvent(final PrivateChat query, final User user, final String message) {
         super(query, user, message);
     }
 

src/main/java/com/dmdirc/events/QueryActionHighlightEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -32,12 +32,12 @@ import java.time.LocalDateTime;
  */
 public class QueryActionHighlightEvent extends QueryActionEvent {
 
-    public QueryActionHighlightEvent(final LocalDateTime timestamp, final Query query,
+    public QueryActionHighlightEvent(final LocalDateTime timestamp, final PrivateChat query,
             final User user, final String message) {
         super(timestamp, query, user, message);
     }
 
-    public QueryActionHighlightEvent(final Query query, final User user, final String message) {
+    public QueryActionHighlightEvent(final PrivateChat query, final User user, final String message) {
         super(query, user, message);
     }
 

src/main/java/com/dmdirc/events/QueryDisplayableEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.time.LocalDateTime;
@@ -36,11 +36,11 @@ public abstract class QueryDisplayableEvent extends QueryEvent implements Displa
     /** The properties associated with this event. */
     private final DisplayPropertyMap properties = new DisplayPropertyMap();
 
-    public QueryDisplayableEvent(final LocalDateTime timestamp, final Query query) {
+    public QueryDisplayableEvent(final LocalDateTime timestamp, final PrivateChat query) {
         super(timestamp, query);
     }
 
-    public QueryDisplayableEvent(final Query query) {
+    public QueryDisplayableEvent(final PrivateChat query) {
         super(query);
     }
 
@@ -61,7 +61,7 @@ public abstract class QueryDisplayableEvent extends QueryEvent implements Displa
 
     @Override
     public WindowModel getSource() {
-        return getQuery();
+        return getQuery().getWindowModel();
     }
 
 }

src/main/java/com/dmdirc/events/QueryEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 
 import java.time.LocalDateTime;
 
@@ -34,18 +34,18 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public abstract class QueryEvent extends DMDircEvent {
 
     /** The query that this event occurred on. */
-    private final Query query;
+    private final PrivateChat query;
 
-    public QueryEvent(final LocalDateTime timestamp, final Query query) {
+    public QueryEvent(final LocalDateTime timestamp, final PrivateChat query) {
         super(timestamp);
         this.query = checkNotNull(query);
     }
 
-    public QueryEvent(final Query query) {
+    public QueryEvent(final PrivateChat query) {
         this.query = checkNotNull(query);
     }
 
-    public Query getQuery() {
+    public PrivateChat getQuery() {
         return query;
     }
 

src/main/java/com/dmdirc/events/QueryHighlightEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -32,12 +32,12 @@ import java.time.LocalDateTime;
  */
 public class QueryHighlightEvent extends QueryMessageEvent {
 
-    public QueryHighlightEvent(final LocalDateTime timestamp, final Query query, final User user,
+    public QueryHighlightEvent(final LocalDateTime timestamp, final PrivateChat query, final User user,
             final String message) {
         super(timestamp, query, user, message);
     }
 
-    public QueryHighlightEvent(final Query query, final User user, final String message) {
+    public QueryHighlightEvent(final PrivateChat query, final User user, final String message) {
         super(query, user, message);
     }
 

src/main/java/com/dmdirc/events/QueryMessageEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Query;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 
 import java.time.LocalDateTime;
@@ -32,12 +32,12 @@ import java.time.LocalDateTime;
  */
 public class QueryMessageEvent extends BaseQueryMessageEvent {
 
-    public QueryMessageEvent(final LocalDateTime timestamp, final Query query, final User user,
+    public QueryMessageEvent(final LocalDateTime timestamp, final PrivateChat query, final User user,
             final String message) {
         super(timestamp, query, user, message);
     }
 
-    public QueryMessageEvent(final Query query, final User user, final String message) {
+    public QueryMessageEvent(final PrivateChat query, final User user, final String message) {
         super(query, user, message);
     }
 

src/main/java/com/dmdirc/ui/messages/HighlightManager.java

@@ -89,7 +89,7 @@ public class HighlightManager {
         if (event.getUser().getConnection().getWindowModel().equals(serverWindow)
                 && patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
             event.setDisplayProperty(DisplayProperty.DO_NOT_DISPLAY, true);
-            event.getQuery().getEventBus().publish(
+            event.getQuery().getWindowModel().getEventBus().publish(
                     new QueryHighlightEvent(
                             event.getTimestamp(), event.getQuery(), event.getUser(),
                             event.getMessage()));
@@ -101,7 +101,7 @@ public class HighlightManager {
         if (event.getUser().getConnection().getWindowModel().equals(serverWindow)
                 && patterns.stream().anyMatch(p -> p.matcher(event.getMessage()).matches())) {
             event.setDisplayProperty(DisplayProperty.DO_NOT_DISPLAY, true);
-            event.getQuery().getEventBus().publish(
+            event.getQuery().getWindowModel().getEventBus().publish(
                     new QueryActionHighlightEvent(
                             event.getTimestamp(), event.getQuery(), event.getUser(),
                             event.getMessage()));