Remove split user mode handling.

res/com/dmdirc/config/defaults/default/defaults

@@ -182,8 +182,6 @@ treeview:
   foregroundcolour=false:0
 
 channel:
-  splitusermodes=false
-  hideduplicatemodes=false
   showmodeprefix=true
   topichistorysize=10
   encoding=UTF-8

src/com/dmdirc/ChannelEventHandler.java

@@ -45,7 +45,6 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
-import com.dmdirc.events.ChannelUserModeChangeEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
@@ -64,12 +63,10 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelModeNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
 import com.dmdirc.util.EventUtils;
 
@@ -88,10 +85,8 @@ public class ChannelEventHandler extends EventHandler implements
         ChannelMessageListener, ChannelNamesListener, ChannelTopicListener,
         ChannelJoinListener, ChannelPartListener, ChannelKickListener,
         ChannelQuitListener, ChannelActionListener, ChannelNickChangeListener,
-        ChannelModeChangeListener, ChannelUserModeChangeListener,
-        ChannelCtcpListener, OtherAwayStateListener, ChannelNoticeListener,
-        ChannelNonUserModeChangeListener, ChannelModeNoticeListener,
-        ChannelListModeListener {
+        ChannelModeChangeListener, ChannelCtcpListener, OtherAwayStateListener,
+        ChannelNoticeListener, ChannelModeNoticeListener, ChannelListModeListener {
 
     /** The channel that owns this event handler. */
     private final Channel owner;
@@ -279,48 +274,23 @@ public class ChannelEventHandler extends EventHandler implements
             final String modes) {
         checkParser(parser);
 
-        if (!owner.getConfigManager().getOptionBool("channel", "splitusermodes")
-                || !owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
-            if (host.isEmpty()) {
-                final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
-                        date.getTime(), owner, modes.length() <= 1 ? "" : modes);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-                owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
-            } else if (isMyself(client)) {
-                eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            } else {
-                eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            }
+        if (host.isEmpty()) {
+            final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
+                    date.getTime(), owner, modes.length() <= 1 ? "" : modes);
+            final String format = EventUtils.postDisplayable(eventBus, event,
+                    modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
+            owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
+        } else if (isMyself(client)) {
+            eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
+                    groupChatUserManager.getUserFromClient(client, owner), modes));
+        } else {
+            eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
+                    groupChatUserManager.getUserFromClient(client, owner), modes));
         }
 
         owner.refreshClients();
     }
 
-    @Override
-    public void onChannelUserModeChanged(final Parser parser, final Date date,
-            final ChannelInfo channel, final ChannelClientInfo targetClient,
-            final ChannelClientInfo client, final String host, final String mode) {
-        checkParser(parser);
-
-        if (owner.getConfigManager().getOptionBool("channel", "splitusermodes")) {
-            String format = "channelSplitUserMode_" + mode;
-
-            if (!owner.getConfigManager().hasOptionString("formatter", format)) {
-                format = "channelSplitUserMode_default";
-            }
-
-            final ChannelUserModeChangeEvent event = new ChannelUserModeChangeEvent(date.getTime(),
-                    owner, groupChatUserManager.getUserFromClient(client, owner),
-                    groupChatUserManager.getUserFromClient(targetClient, owner), mode);
-            final String result = EventUtils.postDisplayable(eventBus, event, format);
-            owner.doNotification(date, result, groupChatUserManager.getUserFromClient(client, owner),
-                    groupChatUserManager.getUserFromClient(targetClient, owner), mode);
-        }
-    }
-
     @Override
     public void onChannelCTCP(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client,
@@ -359,32 +329,6 @@ public class ChannelEventHandler extends EventHandler implements
                 groupChatUserManager.getUserFromClient(client, owner), message));
     }
 
-    @Override
-    public void onChannelNonUserModeChanged(final Parser parser, final Date date,
-            final ChannelInfo channel, final ChannelClientInfo client,
-            final String host, final String modes) {
-        checkParser(parser);
-
-        if (owner.getConfigManager().getOptionBool("channel", "splitusermodes")
-                && owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
-            if (host.isEmpty()) {
-                final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
-                        date.getTime(), owner, modes.length() <= 1 ? "" : modes);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-                owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
-            } else if (isMyself(client)) {
-                eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            } else {
-                eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            }
-        }
-
-        owner.refreshClients();
-    }
-
     @Override
     public void onChannelModeNotice(final Parser parser, final Date date,
             final ChannelInfo channel, final char prefix,

src/com/dmdirc/config/prefs/PreferencesDialogModel.java

@@ -185,10 +185,6 @@ public class PreferencesDialogModel {
                 "ui", "confirmQuit", "Confirm quit",
                 "Show a confirmation message when you try to close the client",
                 configManager, identity));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "channel", "splitusermodes", "Split user modes",
-                "Show individual mode lines for each mode change that affects"
-                + " a user (e.g. op, devoice)", configManager, identity));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "channel", "showmodeprefix", "Show mode prefix",
                 "Prefix users' names with their mode (e.g. @) in channels",

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -143,11 +143,6 @@ public class PreferencesManager {
                 "These settings are specific to this channel on this network,"
                 + " any settings specified here will overwrite global settings");
 
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "channel", "splitusermodes", "Split user modes",
-                "Show individual mode lines for each mode change that affects"
-                + " a user (e.g. op, devoice)",
-                manager, identity));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "channel", "showmodeprefix", "Show mode prefix",
                 "Prefix users' names with their mode (e.g. @) in channels",