Browse Source

Add base class for channel events.

This allows clients to listen for ChannelEvents and filter on
channel names, rather than having to handle every single
individual event type.
pull/157/head
Chris Smith 6 years ago
parent
commit
3a87922cfa
Signed by: Chris Smith <chris@chameth.com> GPG Key ID: 3A2D4BBDC4A3C9A9
23 changed files with 95 additions and 196 deletions
  1. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelActionEvent.java
  2. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelCTCPEvent.java
  3. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelCTCPReplyEvent.java
  4. 47
    0
      common/src/main/java/com/dmdirc/parser/events/ChannelEvent.java
  5. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelJoinEvent.java
  6. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelKickEvent.java
  7. 2
    11
      common/src/main/java/com/dmdirc/parser/events/ChannelListModeEvent.java
  8. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelMessageEvent.java
  9. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelModeChangeEvent.java
  10. 3
    9
      common/src/main/java/com/dmdirc/parser/events/ChannelModeMessageEvent.java
  11. 3
    9
      common/src/main/java/com/dmdirc/parser/events/ChannelModeNoticeEvent.java
  12. 2
    11
      common/src/main/java/com/dmdirc/parser/events/ChannelNamesEvent.java
  13. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelNickChangeEvent.java
  14. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelNonUserModeChangeEvent.java
  15. 3
    9
      common/src/main/java/com/dmdirc/parser/events/ChannelNoticeEvent.java
  16. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelOtherAwayStateEvent.java
  17. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelPartEvent.java
  18. 3
    13
      common/src/main/java/com/dmdirc/parser/events/ChannelPasswordChangedEvent.java
  19. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelQuitEvent.java
  20. 2
    11
      common/src/main/java/com/dmdirc/parser/events/ChannelSelfJoinEvent.java
  21. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelSingleModeChangeEvent.java
  22. 2
    11
      common/src/main/java/com/dmdirc/parser/events/ChannelTopicEvent.java
  23. 2
    8
      common/src/main/java/com/dmdirc/parser/events/ChannelUserModeChangeEvent.java

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelActionEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person does an action in a channel.
35 35
  */
36
-public class ChannelActionEvent extends ParserEvent {
36
+public class ChannelActionEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String message;
41 40
     private final String host;
@@ -43,17 +42,12 @@ public class ChannelActionEvent extends ParserEvent {
43 42
     public ChannelActionEvent(final Parser parser, final LocalDateTime date,
44 43
             final ChannelInfo channel, final ChannelClientInfo client, final String message,
45 44
             final String host) {
46
-        super(parser, date);
47
-        this.channel = checkNotNull(channel);
45
+        super(parser, date, channel);
48 46
         this.client = checkNotNull(client);
49 47
         this.message = checkNotNull(message);
50 48
         this.host = checkNotNull(host);
51 49
     }
52 50
 
53
-    public ChannelInfo getChannel() {
54
-        return channel;
55
-    }
56
-
57 51
     public ChannelClientInfo getClient() {
58 52
         return client;
59 53
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelCTCPEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person sends a CTCP to a channel.
35 35
  */
36
-public class ChannelCTCPEvent extends ParserEvent {
36
+public class ChannelCTCPEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String type;
41 40
     private final String message;
@@ -44,18 +43,13 @@ public class ChannelCTCPEvent extends ParserEvent {
44 43
     public ChannelCTCPEvent(final Parser parser, final LocalDateTime date,
45 44
             final ChannelInfo channel, final ChannelClientInfo client, final String type,
46 45
             final String message, final String host) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
46
+        super(parser, date, channel);
49 47
         this.client = checkNotNull(client);
50 48
         this.type = checkNotNull(type);
51 49
         this.message = checkNotNull(message);
52 50
         this.host = checkNotNull(host);
53 51
     }
54 52
 
55
-    public ChannelInfo getChannel() {
56
-        return channel;
57
-    }
58
-
59 53
     public ChannelClientInfo getClient() {
60 54
         return client;
61 55
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelCTCPReplyEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person sends a CTCPRReply to a channel.
35 35
  */
36
-public class ChannelCTCPReplyEvent extends ParserEvent {
36
+public class ChannelCTCPReplyEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String type;
41 40
     private final String message;
@@ -44,18 +43,13 @@ public class ChannelCTCPReplyEvent extends ParserEvent {
44 43
     public ChannelCTCPReplyEvent(final Parser parser, final LocalDateTime date,
45 44
             final ChannelInfo channel, final ChannelClientInfo client, final String type,
46 45
             final String message, final String host) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
46
+        super(parser, date, channel);
49 47
         this.client = checkNotNull(client);
50 48
         this.type = checkNotNull(type);
51 49
         this.message = checkNotNull(message);
52 50
         this.host = checkNotNull(host);
53 51
     }
54 52
 
55
-    public ChannelInfo getChannel() {
56
-        return channel;
57
-    }
58
-
59 53
     public ChannelClientInfo getClient() {
60 54
         return client;
61 55
     }

+ 47
- 0
common/src/main/java/com/dmdirc/parser/events/ChannelEvent.java View File

@@ -0,0 +1,47 @@
1
+/*
2
+ * Copyright (c) 2006-2017 DMDirc Developers
3
+ *
4
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
5
+ * of this software and associated documentation files (the "Software"), to deal
6
+ * in the Software without restriction, including without limitation the rights
7
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
+ * copies of the Software, and to permit persons to whom the Software is
9
+ * furnished to do so, subject to the following conditions:
10
+ *
11
+ * The above copyright notice and this permission notice shall be included in
12
+ * all copies or substantial portions of the Software.
13
+ *
14
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20
+ * SOFTWARE.
21
+ */
22
+
23
+package com.dmdirc.parser.events;
24
+
25
+import com.dmdirc.parser.interfaces.ChannelInfo;
26
+import com.dmdirc.parser.interfaces.Parser;
27
+import java.time.LocalDateTime;
28
+
29
+import static com.google.common.base.Preconditions.checkNotNull;
30
+
31
+/**
32
+ * Base class for events that are tied to a {@link ChannelInfo}.
33
+ */
34
+public abstract class ChannelEvent extends ParserEvent {
35
+
36
+    private final ChannelInfo channel;
37
+
38
+    public ChannelEvent(final Parser parser, final LocalDateTime date, final ChannelInfo channel) {
39
+        super(parser, date);
40
+        this.channel = checkNotNull(channel);
41
+    }
42
+
43
+    public ChannelInfo getChannel() {
44
+        return channel;
45
+    }
46
+
47
+}

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelJoinEvent.java View File

@@ -33,22 +33,16 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called When we, or another client joins a channel.
35 35
  */
36
-public class ChannelJoinEvent extends ParserEvent {
36
+public class ChannelJoinEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
 
41 40
     public ChannelJoinEvent(final Parser parser, final LocalDateTime date,
42 41
             final ChannelInfo channel, final ChannelClientInfo client) {
43
-        super(parser, date);
44
-        this.channel = checkNotNull(channel);
42
+        super(parser, date, channel);
45 43
         this.client = checkNotNull(client);
46 44
     }
47 45
 
48
-    public ChannelInfo getChannel() {
49
-        return channel;
50
-    }
51
-
52 46
     public ChannelClientInfo getClient() {
53 47
         return client;
54 48
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelKickEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person is kicked.
35 35
  */
36
-public class ChannelKickEvent extends ParserEvent {
36
+public class ChannelKickEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo kickedClient;
40 39
     private final ChannelClientInfo client;
41 40
     private final String reason;
@@ -44,18 +43,13 @@ public class ChannelKickEvent extends ParserEvent {
44 43
     public ChannelKickEvent(final Parser parser, final LocalDateTime date, final ChannelInfo channel,
45 44
             final ChannelClientInfo kickedClient, final ChannelClientInfo client,
46 45
             final String reason, final String host) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
46
+        super(parser, date, channel);
49 47
         this.kickedClient = checkNotNull(kickedClient);
50 48
         this.client = checkNotNull(client);
51 49
         this.reason = checkNotNull(reason);
52 50
         this.host = checkNotNull(host);
53 51
     }
54 52
 
55
-    public ChannelInfo getChannel() {
56
-        return channel;
57
-    }
58
-
59 53
     public ChannelClientInfo getKickedClient() {
60 54
         return kickedClient;
61 55
     }

+ 2
- 11
common/src/main/java/com/dmdirc/parser/events/ChannelListModeEvent.java View File

@@ -24,30 +24,21 @@ package com.dmdirc.parser.events;
24 24
 
25 25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26 26
 import com.dmdirc.parser.interfaces.Parser;
27
-
28 27
 import java.time.LocalDateTime;
29 28
 
30
-import static com.google.common.base.Preconditions.checkNotNull;
31
-
32 29
 /**
33 30
  * Called when all requested ListModes have been sent.
34 31
  */
35
-public class ChannelListModeEvent extends ParserEvent {
32
+public class ChannelListModeEvent extends ChannelEvent {
36 33
 
37
-    private final ChannelInfo channel;
38 34
     private final char mode;
39 35
 
40 36
     public ChannelListModeEvent(final Parser parser, final LocalDateTime date,
41 37
             final ChannelInfo channel, final char mode) {
42
-        super(parser, date);
43
-        this.channel = checkNotNull(channel);
38
+        super(parser, date, channel);
44 39
         this.mode = mode;
45 40
     }
46 41
 
47
-    public ChannelInfo getChannel() {
48
-        return channel;
49
-    }
50
-
51 42
     public char getMode() {
52 43
         return mode;
53 44
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelMessageEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person sends a message to a channel.
35 35
  */
36
-public class ChannelMessageEvent extends ParserEvent {
36
+public class ChannelMessageEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String message;
41 40
     private final String host;
@@ -43,17 +42,12 @@ public class ChannelMessageEvent extends ParserEvent {
43 42
     public ChannelMessageEvent(final Parser parser, final LocalDateTime date,
44 43
             final ChannelInfo channel, final ChannelClientInfo client, final String message,
45 44
             final String host) {
46
-        super(parser, date);
47
-        this.channel = checkNotNull(channel);
45
+        super(parser, date, channel);
48 46
         this.client = checkNotNull(client);
49 47
         this.message = checkNotNull(message);
50 48
         this.host = checkNotNull(host);
51 49
     }
52 50
 
53
-    public ChannelInfo getChannel() {
54
-        return channel;
55
-    }
56
-
57 51
     public ChannelClientInfo getClient() {
58 52
         return client;
59 53
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelModeChangeEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when the channel modes are changed or discovered.
35 35
  */
36
-public class ChannelModeChangeEvent extends ParserEvent {
36
+public class ChannelModeChangeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String host;
41 40
     private final String modes;
@@ -43,17 +42,12 @@ public class ChannelModeChangeEvent extends ParserEvent {
43 42
     public ChannelModeChangeEvent(final Parser parser, final LocalDateTime date,
44 43
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
45 44
             final String modes) {
46
-        super(parser, date);
47
-        this.channel = checkNotNull(channel);
45
+        super(parser, date, channel);
48 46
         this.client = checkNotNull(client);
49 47
         this.host = checkNotNull(host);
50 48
         this.modes = checkNotNull(modes);
51 49
     }
52 50
 
53
-    public ChannelInfo getChannel() {
54
-        return channel;
55
-    }
56
-
57 51
     public ChannelClientInfo getClient() {
58 52
         return client;
59 53
     }

+ 3
- 9
common/src/main/java/com/dmdirc/parser/events/ChannelModeMessageEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person sends a Message to a channel with a mode prefix.
35 35
  */
36
-public class ChannelModeMessageEvent extends ParserEvent {
36
+public class ChannelModeMessageEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final char prefix;
40 39
     private final ChannelClientInfo client;
41 40
     private final String message;
@@ -44,18 +43,13 @@ public class ChannelModeMessageEvent extends ParserEvent {
44 43
     public ChannelModeMessageEvent(final Parser parser, final LocalDateTime date,
45 44
             final ChannelInfo channel, final char prefix, final ChannelClientInfo client,
46 45
             final String message, final String host) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
49
-        this.prefix = checkNotNull(prefix);
46
+        super(parser, date, channel);
47
+        this.prefix = prefix;
50 48
         this.client = checkNotNull(client);
51 49
         this.message = checkNotNull(message);
52 50
         this.host = checkNotNull(host);
53 51
     }
54 52
 
55
-    public ChannelInfo getChannel() {
56
-        return channel;
57
-    }
58
-
59 53
     public char getPrefix() {
60 54
         return prefix;
61 55
     }

+ 3
- 9
common/src/main/java/com/dmdirc/parser/events/ChannelModeNoticeEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person sends a notice to a channel with a mode prefix.
35 35
  */
36
-public class ChannelModeNoticeEvent extends ParserEvent {
36
+public class ChannelModeNoticeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final char prefix;
40 39
     private final ChannelClientInfo client;
41 40
     private final String message;
@@ -44,18 +43,13 @@ public class ChannelModeNoticeEvent extends ParserEvent {
44 43
     public ChannelModeNoticeEvent(final Parser parser, final LocalDateTime date,
45 44
             final ChannelInfo channel, final char prefix, final ChannelClientInfo client,
46 45
             final String message, final String host) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
49
-        this.prefix = checkNotNull(prefix);
46
+        super(parser, date, channel);
47
+        this.prefix = prefix;
50 48
         this.client = checkNotNull(client);
51 49
         this.message = checkNotNull(message);
52 50
         this.host = checkNotNull(host);
53 51
     }
54 52
 
55
-    public ChannelInfo getChannel() {
56
-        return channel;
57
-    }
58
-
59 53
     public char getPrefix() {
60 54
         return prefix;
61 55
     }

+ 2
- 11
common/src/main/java/com/dmdirc/parser/events/ChannelNamesEvent.java View File

@@ -24,25 +24,16 @@ package com.dmdirc.parser.events;
24 24
 
25 25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26 26
 import com.dmdirc.parser.interfaces.Parser;
27
-
28 27
 import java.time.LocalDateTime;
29 28
 
30
-import static com.google.common.base.Preconditions.checkNotNull;
31
-
32 29
 /**
33 30
  * Called when a names reply is parsed.
34 31
  */
35
-public class ChannelNamesEvent extends ParserEvent {
36
-
37
-    private final ChannelInfo channel;
32
+public class ChannelNamesEvent extends ChannelEvent {
38 33
 
39 34
     public ChannelNamesEvent(final Parser parser, final LocalDateTime date,
40 35
             final ChannelInfo channel) {
41
-        super(parser, date);
42
-        this.channel = checkNotNull(channel);
36
+        super(parser, date, channel);
43 37
     }
44 38
 
45
-    public ChannelInfo getChannel() {
46
-        return channel;
47
-    }
48 39
 }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelNickChangeEvent.java View File

@@ -33,24 +33,18 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when we or another user change nickname (Called once per channel the user is on).
35 35
  */
36
-public class ChannelNickChangeEvent extends ParserEvent {
36
+public class ChannelNickChangeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String oldNick;
41 40
 
42 41
     public ChannelNickChangeEvent(final Parser parser, final LocalDateTime date,
43 42
             final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
44
-        super(parser, date);
45
-        this.channel = checkNotNull(channel);
43
+        super(parser, date, channel);
46 44
         this.client = checkNotNull(client);
47 45
         this.oldNick = checkNotNull(oldNick);
48 46
     }
49 47
 
50
-    public ChannelInfo getChannel() {
51
-        return channel;
52
-    }
53
-
54 48
     public ChannelClientInfo getClient() {
55 49
         return client;
56 50
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelNonUserModeChangeEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when the channel modes are changed or discovered.
35 35
  */
36
-public class ChannelNonUserModeChangeEvent extends ParserEvent {
36
+public class ChannelNonUserModeChangeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String host;
41 40
     private final String modes;
@@ -43,17 +42,12 @@ public class ChannelNonUserModeChangeEvent extends ParserEvent {
43 42
     public ChannelNonUserModeChangeEvent(final Parser parser, final LocalDateTime date,
44 43
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
45 44
             final String modes) {
46
-        super(parser, date);
47
-        this.channel = checkNotNull(channel);
45
+        super(parser, date, channel);
48 46
         this.client = checkNotNull(client);
49 47
         this.host = checkNotNull(host);
50 48
         this.modes = checkNotNull(modes);
51 49
     }
52 50
 
53
-    public ChannelInfo getChannel() {
54
-        return channel;
55
-    }
56
-
57 51
     public ChannelClientInfo getClient() {
58 52
         return client;
59 53
     }

+ 3
- 9
common/src/main/java/com/dmdirc/parser/events/ChannelNoticeEvent.java View File

@@ -33,27 +33,21 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when a person sends a notice to a channel.
35 35
  */
36
-public class ChannelNoticeEvent extends ParserEvent {
36
+public class ChannelNoticeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39
-    private final ChannelClientInfo client;
38
+        private final ChannelClientInfo client;
40 39
     private final String message;
41 40
     private final String host;
42 41
 
43 42
     public ChannelNoticeEvent(final Parser parser, final LocalDateTime date,
44 43
             final ChannelInfo channel, final ChannelClientInfo client, final String message,
45 44
             final String host) {
46
-        super(parser, date);
47
-        this.channel = checkNotNull(channel);
45
+        super(parser, date, channel);
48 46
         this.client = checkNotNull(client);
49 47
         this.message = checkNotNull(message);
50 48
         this.host = checkNotNull(host);
51 49
     }
52 50
 
53
-    public ChannelInfo getChannel() {
54
-        return channel;
55
-    }
56
-
57 51
     public ChannelClientInfo getClient() {
58 52
         return client;
59 53
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelOtherAwayStateEvent.java View File

@@ -34,9 +34,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
34 34
 /**
35 35
  * Called when we go away, or come back.
36 36
  */
37
-public class ChannelOtherAwayStateEvent extends ParserEvent {
37
+public class ChannelOtherAwayStateEvent extends ChannelEvent {
38 38
 
39
-    private final ChannelInfo channel;
40 39
     private final ChannelClientInfo client;
41 40
     private final AwayState oldState;
42 41
     private final AwayState newState;
@@ -44,17 +43,12 @@ public class ChannelOtherAwayStateEvent extends ParserEvent {
44 43
     public ChannelOtherAwayStateEvent(final Parser parser, final LocalDateTime date,
45 44
             final ChannelInfo channel, final ChannelClientInfo client, final AwayState oldState,
46 45
             final AwayState newState) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
46
+        super(parser, date, channel);
49 47
         this.client = checkNotNull(client);
50 48
         this.oldState = checkNotNull(oldState);
51 49
         this.newState = checkNotNull(newState);
52 50
     }
53 51
 
54
-    public ChannelInfo getChannel() {
55
-        return channel;
56
-    }
57
-
58 52
     public ChannelClientInfo getClient() {
59 53
         return client;
60 54
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelPartEvent.java View File

@@ -33,24 +33,18 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called When we, or another client parts a channel.
35 35
  */
36
-public class ChannelPartEvent extends ParserEvent {
36
+public class ChannelPartEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String reason;
41 40
 
42 41
     public ChannelPartEvent(final Parser parser, final LocalDateTime date,
43 42
             final ChannelInfo channel, final ChannelClientInfo client, final String reason) {
44
-        super(parser, date);
45
-        this.channel = checkNotNull(channel);
43
+        super(parser, date, channel);
46 44
         this.client = checkNotNull(client);
47 45
         this.reason = checkNotNull(reason);
48 46
     }
49 47
 
50
-    public ChannelInfo getChannel() {
51
-        return channel;
52
-    }
53
-
54 48
     public ChannelClientInfo getClient() {
55 49
         return client;
56 50
     }

+ 3
- 13
common/src/main/java/com/dmdirc/parser/events/ChannelPasswordChangedEvent.java View File

@@ -24,25 +24,15 @@ package com.dmdirc.parser.events;
24 24
 
25 25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26 26
 import com.dmdirc.parser.interfaces.Parser;
27
-
28 27
 import java.time.LocalDateTime;
29 28
 
30
-import static com.google.common.base.Preconditions.checkNotNull;
31
-
32 29
 /**
33 30
  * Called when a channel password changes.
34 31
  */
35
-public class ChannelPasswordChangedEvent extends ParserEvent {
32
+public class ChannelPasswordChangedEvent extends ChannelEvent {
36 33
 
37
-    private final ChannelInfo channel;
38
-
39
-    public ChannelPasswordChangedEvent(final Parser parser, final LocalDateTime date,
40
-                                  final ChannelInfo channel) {
41
-        super(parser, date);
42
-        this.channel = checkNotNull(channel);
34
+    public ChannelPasswordChangedEvent(final Parser parser, final LocalDateTime date, final ChannelInfo channel) {
35
+        super(parser, date, channel);
43 36
     }
44 37
 
45
-    public ChannelInfo getChannel() {
46
-        return channel;
47
-    }
48 38
 }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelQuitEvent.java View File

@@ -33,24 +33,18 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called When we, or another client quits IRC (Called once per channel the user was on).
35 35
  */
36
-public class ChannelQuitEvent extends ParserEvent {
36
+public class ChannelQuitEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String reason;
41 40
 
42 41
     public ChannelQuitEvent(final Parser parser, final LocalDateTime date,
43 42
             final ChannelInfo channel, final ChannelClientInfo client, final String reason) {
44
-        super(parser, date);
45
-        this.channel = checkNotNull(channel);
43
+        super(parser, date, channel);
46 44
         this.client = checkNotNull(client);
47 45
         this.reason = checkNotNull(reason);
48 46
     }
49 47
 
50
-    public ChannelInfo getChannel() {
51
-        return channel;
52
-    }
53
-
54 48
     public ChannelClientInfo getClient() {
55 49
         return client;
56 50
     }

+ 2
- 11
common/src/main/java/com/dmdirc/parser/events/ChannelSelfJoinEvent.java View File

@@ -24,25 +24,16 @@ package com.dmdirc.parser.events;
24 24
 
25 25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26 26
 import com.dmdirc.parser.interfaces.Parser;
27
-
28 27
 import java.time.LocalDateTime;
29 28
 
30
-import static com.google.common.base.Preconditions.checkNotNull;
31
-
32 29
 /**
33 30
  * Called when we join a channel.
34 31
  */
35
-public class ChannelSelfJoinEvent extends ParserEvent {
36
-
37
-    private final ChannelInfo channel;
32
+public class ChannelSelfJoinEvent extends ChannelEvent {
38 33
 
39 34
     public ChannelSelfJoinEvent(final Parser parser, final LocalDateTime date,
40 35
             final ChannelInfo channel) {
41
-        super(parser, date);
42
-        this.channel = checkNotNull(channel);
36
+        super(parser, date, channel);
43 37
     }
44 38
 
45
-    public ChannelInfo getChannel() {
46
-        return channel;
47
-    }
48 39
 }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelSingleModeChangeEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  * Called when the channel modes are changed or discovered.
35 35
  */
36
-public class ChannelSingleModeChangeEvent extends ParserEvent {
36
+public class ChannelSingleModeChangeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo client;
40 39
     private final String host;
41 40
     private final String modes;
@@ -43,17 +42,12 @@ public class ChannelSingleModeChangeEvent extends ParserEvent {
43 42
     public ChannelSingleModeChangeEvent(final Parser parser, final LocalDateTime date,
44 43
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
45 44
             final String modes) {
46
-        super(parser, date);
47
-        this.channel = checkNotNull(channel);
45
+        super(parser, date, channel);
48 46
         this.client = checkNotNull(client);
49 47
         this.host = checkNotNull(host);
50 48
         this.modes = checkNotNull(modes);
51 49
     }
52 50
 
53
-    public ChannelInfo getChannel() {
54
-        return channel;
55
-    }
56
-
57 51
     public ChannelClientInfo getClient() {
58 52
         return client;
59 53
     }

+ 2
- 11
common/src/main/java/com/dmdirc/parser/events/ChannelTopicEvent.java View File

@@ -24,30 +24,21 @@ package com.dmdirc.parser.events;
24 24
 
25 25
 import com.dmdirc.parser.interfaces.ChannelInfo;
26 26
 import com.dmdirc.parser.interfaces.Parser;
27
-
28 27
 import java.time.LocalDateTime;
29 28
 
30
-import static com.google.common.base.Preconditions.checkNotNull;
31
-
32 29
 /**
33 30
  * Called when the topic is changed or discovered for the first time.
34 31
  */
35
-public class ChannelTopicEvent extends ParserEvent {
32
+public class ChannelTopicEvent extends ChannelEvent {
36 33
 
37
-    private final ChannelInfo channel;
38 34
     private final boolean isJoinTopic;
39 35
 
40 36
     public ChannelTopicEvent(final Parser parser, final LocalDateTime date,
41 37
             final ChannelInfo channel, final boolean isJoinTopic) {
42
-        super(parser, date);
43
-        this.channel = checkNotNull(channel);
38
+        super(parser, date, channel);
44 39
         this.isJoinTopic = isJoinTopic;
45 40
     }
46 41
 
47
-    public ChannelInfo getChannel() {
48
-        return channel;
49
-    }
50
-
51 42
     public boolean isJoinTopic() {
52 43
         return isJoinTopic;
53 44
     }

+ 2
- 8
common/src/main/java/com/dmdirc/parser/events/ChannelUserModeChangeEvent.java View File

@@ -33,9 +33,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
33 33
 /**
34 34
  *  Called when a users channel mode is changed.
35 35
  */
36
-public class ChannelUserModeChangeEvent extends ParserEvent {
36
+public class ChannelUserModeChangeEvent extends ChannelEvent {
37 37
 
38
-    private final ChannelInfo channel;
39 38
     private final ChannelClientInfo targetClient;
40 39
     private final ChannelClientInfo client;
41 40
     private final String host;
@@ -44,18 +43,13 @@ public class ChannelUserModeChangeEvent extends ParserEvent {
44 43
     public ChannelUserModeChangeEvent(final Parser parser, final LocalDateTime date,
45 44
             final ChannelInfo channel, final ChannelClientInfo targetClient,
46 45
             final ChannelClientInfo client, final String host, final String mode) {
47
-        super(parser, date);
48
-        this.channel = checkNotNull(channel);
46
+        super(parser, date, channel);
49 47
         this.targetClient = checkNotNull(targetClient);
50 48
         this.client = checkNotNull(client);
51 49
         this.host = checkNotNull(host);
52 50
         this.mode = checkNotNull(mode);
53 51
     }
54 52
 
55
-    public ChannelInfo getChannel() {
56
-        return channel;
57
-    }
58
-
59 53
     public ChannelClientInfo getTargetClient() {
60 54
         return targetClient;
61 55
     }

Loading…
Cancel
Save