Przeglądaj źródła

Merge pull request #700 from csmith/master

Make link events use WindowModel.
pull/701/head
Greg Holmes 8 lat temu
rodzic
commit
fef31abb38

+ 6
- 0
src/main/java/com/dmdirc/events/LinkChannelClickedEvent.java Wyświetl plik

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

+ 4
- 4
src/main/java/com/dmdirc/events/LinkEvent.java Wyświetl plik

22
 
22
 
23
 package com.dmdirc.events;
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
  * Common properties of link events.
28
  * Common properties of link events.
29
  */
29
  */
30
 public abstract class LinkEvent extends DMDircEvent {
30
 public abstract class LinkEvent extends DMDircEvent {
31
 
31
 
32
-    private final Window window;
32
+    private final WindowModel window;
33
     private final String target;
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
         this.window = window;
36
         this.window = window;
37
         this.target = target;
37
         this.target = target;
38
     }
38
     }
39
 
39
 
40
-    public Window getWindow() {
40
+    public WindowModel getWindow() {
41
         return window;
41
         return window;
42
     }
42
     }
43
 
43
 

+ 6
- 0
src/main/java/com/dmdirc/events/LinkNicknameClickedEvent.java Wyświetl plik

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

+ 6
- 0
src/main/java/com/dmdirc/events/LinkUrlClickedEvent.java Wyświetl plik

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

Ładowanie…
Anuluj
Zapisz