Parcourir la source

Make link events use WindowModel.

pull/700/head
Chris Smith il y a 7 ans
Parent
révision
aaec27c42e

+ 6
- 0
src/main/java/com/dmdirc/events/LinkChannelClickedEvent.java Voir le fichier

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.events;
24 24
 
25
+import com.dmdirc.interfaces.WindowModel;
25 26
 import com.dmdirc.interfaces.ui.Window;
26 27
 
27 28
 /**
@@ -29,7 +30,12 @@ import com.dmdirc.interfaces.ui.Window;
29 30
  */
30 31
 public class LinkChannelClickedEvent extends LinkEvent {
31 32
 
33
+    @Deprecated
32 34
     public LinkChannelClickedEvent(final Window window, final String target) {
35
+        super(window.getContainer(), target);
36
+    }
37
+
38
+    public LinkChannelClickedEvent(final WindowModel window, final String target) {
33 39
         super(window, target);
34 40
     }
35 41
 

+ 4
- 4
src/main/java/com/dmdirc/events/LinkEvent.java Voir le fichier

@@ -22,22 +22,22 @@
22 22
 
23 23
 package com.dmdirc.events;
24 24
 
25
-import com.dmdirc.interfaces.ui.Window;
25
+import com.dmdirc.interfaces.WindowModel;
26 26
 
27 27
 /**
28 28
  * Common properties of link events.
29 29
  */
30 30
 public abstract class LinkEvent extends DMDircEvent {
31 31
 
32
-    private final Window window;
32
+    private final WindowModel window;
33 33
     private final String target;
34 34
 
35
-    public LinkEvent(final Window window, final String target) {
35
+    public LinkEvent(final WindowModel window, final String target) {
36 36
         this.window = window;
37 37
         this.target = target;
38 38
     }
39 39
 
40
-    public Window getWindow() {
40
+    public WindowModel getWindow() {
41 41
         return window;
42 42
     }
43 43
 

+ 6
- 0
src/main/java/com/dmdirc/events/LinkNicknameClickedEvent.java Voir le fichier

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.events;
24 24
 
25
+import com.dmdirc.interfaces.WindowModel;
25 26
 import com.dmdirc.interfaces.ui.Window;
26 27
 
27 28
 /**
@@ -29,7 +30,12 @@ import com.dmdirc.interfaces.ui.Window;
29 30
  */
30 31
 public class LinkNicknameClickedEvent extends LinkEvent {
31 32
 
33
+    @Deprecated
32 34
     public LinkNicknameClickedEvent(final Window window, final String target) {
35
+        super(window.getContainer(), target);
36
+    }
37
+
38
+    public LinkNicknameClickedEvent(final WindowModel window, final String target) {
33 39
         super(window, target);
34 40
     }
35 41
 

+ 6
- 0
src/main/java/com/dmdirc/events/LinkUrlClickedEvent.java Voir le fichier

@@ -22,6 +22,7 @@
22 22
 
23 23
 package com.dmdirc.events;
24 24
 
25
+import com.dmdirc.interfaces.WindowModel;
25 26
 import com.dmdirc.interfaces.ui.Window;
26 27
 
27 28
 /**
@@ -29,7 +30,12 @@ import com.dmdirc.interfaces.ui.Window;
29 30
  */
30 31
 public class LinkUrlClickedEvent extends LinkEvent {
31 32
 
33
+    @Deprecated
32 34
     public LinkUrlClickedEvent(final Window window, final String target) {
35
+        super(window.getContainer(), target);
36
+    }
37
+
38
+    public LinkUrlClickedEvent(final WindowModel window, final String target) {
33 39
         super(window, target);
34 40
     }
35 41
 

Chargement…
Annuler
Enregistrer