Преглед на файлове

Add a source to displayable events.

Need this to figure out where to display them, for now.
pull/249/head
Chris Smith преди 9 години
родител
ревизия
f229cba704

+ 6
- 0
src/com/dmdirc/events/ChannelDisplayableEvent.java Целия файл

23
 package com.dmdirc.events;
23
 package com.dmdirc.events;
24
 
24
 
25
 import com.dmdirc.Channel;
25
 import com.dmdirc.Channel;
26
+import com.dmdirc.FrameContainer;
26
 
27
 
27
 import java.util.Optional;
28
 import java.util.Optional;
28
 import java.util.concurrent.atomic.AtomicReference;
29
 import java.util.concurrent.atomic.AtomicReference;
70
         return properties;
71
         return properties;
71
     }
72
     }
72
 
73
 
74
+    @Override
75
+    public FrameContainer getSource() {
76
+        return getChannel();
77
+    }
78
+
73
 }
79
 }

+ 8
- 0
src/com/dmdirc/events/DisplayableEvent.java Целия файл

22
 
22
 
23
 package com.dmdirc.events;
23
 package com.dmdirc.events;
24
 
24
 
25
+import com.dmdirc.FrameContainer;
26
+
25
 import java.util.Optional;
27
 import java.util.Optional;
26
 
28
 
27
 /**
29
 /**
74
      * @return The timestamp the event occurred at.
76
      * @return The timestamp the event occurred at.
75
      */
77
      */
76
     long getTimestamp();
78
     long getTimestamp();
79
+
80
+    /**
81
+     * Gets the source of the displayable event.
82
+     */
83
+    FrameContainer getSource();
84
+
77
 }
85
 }

+ 7
- 0
src/com/dmdirc/events/QueryDisplayableEvent.java Целия файл

22
 
22
 
23
 package com.dmdirc.events;
23
 package com.dmdirc.events;
24
 
24
 
25
+import com.dmdirc.FrameContainer;
25
 import com.dmdirc.Query;
26
 import com.dmdirc.Query;
26
 
27
 
27
 import java.util.Optional;
28
 import java.util.Optional;
70
     public DisplayPropertyMap getDisplayProperties() {
71
     public DisplayPropertyMap getDisplayProperties() {
71
         return properties;
72
         return properties;
72
     }
73
     }
74
+
75
+    @Override
76
+    public FrameContainer getSource() {
77
+        return getQuery();
78
+    }
79
+
73
 }
80
 }

+ 6
- 0
src/com/dmdirc/events/ServerDisplayableEvent.java Целия файл

22
 
22
 
23
 package com.dmdirc.events;
23
 package com.dmdirc.events;
24
 
24
 
25
+import com.dmdirc.FrameContainer;
25
 import com.dmdirc.interfaces.Connection;
26
 import com.dmdirc.interfaces.Connection;
26
 
27
 
27
 import java.util.Optional;
28
 import java.util.Optional;
71
         return properties;
72
         return properties;
72
     }
73
     }
73
 
74
 
75
+    @Override
76
+    public FrameContainer getSource() {
77
+        return getConnection().getWindowModel();
78
+    }
79
+
74
 }
80
 }

+ 7
- 7
src/com/dmdirc/events/ServerUnknownactionEvent.java Целия файл

29
  */
29
  */
30
 public class ServerUnknownactionEvent extends ServerDisplayableEvent {
30
 public class ServerUnknownactionEvent extends ServerDisplayableEvent {
31
 
31
 
32
-    private final String source;
32
+    private final String sender;
33
     private final String target;
33
     private final String target;
34
     private final String message;
34
     private final String message;
35
 
35
 
36
     public ServerUnknownactionEvent(final long timestamp, final Connection connection,
36
     public ServerUnknownactionEvent(final long timestamp, final Connection connection,
37
-            final String source, final String target, final String message) {
37
+            final String sender, final String target, final String message) {
38
         super(timestamp, connection);
38
         super(timestamp, connection);
39
-        this.source = source;
39
+        this.sender = sender;
40
         this.target = target;
40
         this.target = target;
41
         this.message = message;
41
         this.message = message;
42
     }
42
     }
43
 
43
 
44
-    public ServerUnknownactionEvent(final Connection connection, final String source,
44
+    public ServerUnknownactionEvent(final Connection connection, final String sender,
45
             final String target, final String message) {
45
             final String target, final String message) {
46
         super(connection);
46
         super(connection);
47
-        this.source = source;
47
+        this.sender = sender;
48
         this.target = target;
48
         this.target = target;
49
         this.message = message;
49
         this.message = message;
50
     }
50
     }
51
 
51
 
52
-    public String getSource() {
53
-        return source;
52
+    public String getSender() {
53
+        return sender;
54
     }
54
     }
55
 
55
 
56
     public String getTarget() {
56
     public String getTarget() {

+ 7
- 7
src/com/dmdirc/events/ServerUnknownmessageEvent.java Целия файл

29
  */
29
  */
30
 public class ServerUnknownmessageEvent extends ServerDisplayableEvent {
30
 public class ServerUnknownmessageEvent extends ServerDisplayableEvent {
31
 
31
 
32
-    private final String source;
32
+    private final String sender;
33
     private final String target;
33
     private final String target;
34
     private final String message;
34
     private final String message;
35
 
35
 
36
     public ServerUnknownmessageEvent(final long timestamp, final Connection connection,
36
     public ServerUnknownmessageEvent(final long timestamp, final Connection connection,
37
-            final String source, final String target, final String message) {
37
+            final String sender, final String target, final String message) {
38
         super(timestamp, connection);
38
         super(timestamp, connection);
39
-        this.source = source;
39
+        this.sender = sender;
40
         this.target = target;
40
         this.target = target;
41
         this.message = message;
41
         this.message = message;
42
     }
42
     }
43
 
43
 
44
-    public ServerUnknownmessageEvent(final Connection connection, final String source,
44
+    public ServerUnknownmessageEvent(final Connection connection, final String sender,
45
             final String target, final String message) {
45
             final String target, final String message) {
46
         super(connection);
46
         super(connection);
47
-        this.source = source;
47
+        this.sender = sender;
48
         this.target = target;
48
         this.target = target;
49
         this.message = message;
49
         this.message = message;
50
     }
50
     }
51
 
51
 
52
-    public String getSource() {
53
-        return source;
52
+    public String getSender() {
53
+        return sender;
54
     }
54
     }
55
 
55
 
56
     public String getTarget() {
56
     public String getTarget() {

+ 7
- 7
src/com/dmdirc/events/ServerUnknownnoticeEvent.java Целия файл

29
  */
29
  */
30
 public class ServerUnknownnoticeEvent extends ServerDisplayableEvent {
30
 public class ServerUnknownnoticeEvent extends ServerDisplayableEvent {
31
 
31
 
32
-    private final String source;
32
+    private final String sender;
33
     private final String target;
33
     private final String target;
34
     private final String message;
34
     private final String message;
35
 
35
 
36
     public ServerUnknownnoticeEvent(final long timestamp, final Connection connection,
36
     public ServerUnknownnoticeEvent(final long timestamp, final Connection connection,
37
-            final String source, final String target, final String message) {
37
+            final String sender, final String target, final String message) {
38
         super(timestamp, connection);
38
         super(timestamp, connection);
39
-        this.source = source;
39
+        this.sender = sender;
40
         this.target = target;
40
         this.target = target;
41
         this.message = message;
41
         this.message = message;
42
     }
42
     }
43
 
43
 
44
-    public ServerUnknownnoticeEvent(final Connection connection, final String source,
44
+    public ServerUnknownnoticeEvent(final Connection connection, final String sender,
45
             final String target, final String message) {
45
             final String target, final String message) {
46
         super(connection);
46
         super(connection);
47
-        this.source = source;
47
+        this.sender = sender;
48
         this.target = target;
48
         this.target = target;
49
         this.message = message;
49
         this.message = message;
50
     }
50
     }
51
 
51
 
52
-    public String getSource() {
53
-        return source;
52
+    public String getSender() {
53
+        return sender;
54
     }
54
     }
55
 
55
 
56
     public String getTarget() {
56
     public String getTarget() {

Loading…
Отказ
Запис