|
@@ -53,6 +53,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
|
53
|
53
|
import com.dmdirc.interfaces.FrameInfoListener;
|
54
|
54
|
import com.dmdirc.logger.ErrorLevel;
|
55
|
55
|
import com.dmdirc.logger.Logger;
|
|
56
|
+import com.dmdirc.parser.common.ChannelJoinRequest;
|
56
|
57
|
import com.dmdirc.ui.IconManager;
|
57
|
58
|
import com.dmdirc.ui.WindowManager;
|
58
|
59
|
import com.dmdirc.ui.interfaces.InputWindow;
|
|
@@ -905,24 +906,21 @@ public abstract class TextFrame extends JInternalFrame implements Window,
|
905
|
906
|
if (type == MouseClickType.CLICKED) {
|
906
|
907
|
switch (clickType) {
|
907
|
908
|
case CHANNEL:
|
908
|
|
- ActionManager.processEvent(CoreActionType.LINK_CHANNEL_CLICKED, null, attribute);
|
909
|
|
- frameParent.getServer().join(attribute);
|
|
909
|
+ ActionManager.processEvent(CoreActionType.
|
|
910
|
+ LINK_CHANNEL_CLICKED, null, attribute);
|
|
911
|
+ frameParent.getServer().join(
|
|
912
|
+ new ChannelJoinRequest(attribute));
|
910
|
913
|
break;
|
911
|
914
|
case HYPERLINK:
|
912
|
|
- ActionManager.processEvent(CoreActionType.LINK_URL_CLICKED, null, attribute);
|
|
915
|
+ ActionManager.processEvent(CoreActionType.
|
|
916
|
+ LINK_URL_CLICKED, null, attribute);
|
913
|
917
|
URLHandler.getURLHander().launchApp(attribute);
|
914
|
918
|
break;
|
915
|
919
|
case NICKNAME:
|
916
|
|
- ActionManager.processEvent(CoreActionType.LINK_NICKNAME_CLICKED, null, attribute);
|
917
|
|
- if (getContainer().getServer().hasQuery(attribute)) {
|
918
|
|
- getContainer().getServer().getQuery(attribute).
|
919
|
|
- activateFrame();
|
920
|
|
- } else {
|
921
|
|
- getContainer().getServer().addQuery(attribute);
|
922
|
|
- getContainer().getServer().getQuery(attribute).
|
923
|
|
- show();
|
924
|
|
- }
|
925
|
|
-
|
|
920
|
+ ActionManager.processEvent(CoreActionType.
|
|
921
|
+ LINK_NICKNAME_CLICKED, null, attribute);
|
|
922
|
+ getContainer().getServer().addQuery(attribute).
|
|
923
|
+ activateFrame();
|
926
|
924
|
break;
|
927
|
925
|
default:
|
928
|
926
|
break;
|