EventUtil tidying.

Move to util package. Add constants for standard priorities.

Change-Id: Id469276751d8a31f19690469540d2c5d07cbe3bc
Reviewed-on: http://gerrit.dmdirc.com/3827
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/Channel.java

@@ -28,7 +28,6 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
-import com.dmdirc.events.EventUtils;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
@@ -45,6 +44,7 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;

src/com/dmdirc/ChannelEventHandler.java

@@ -43,7 +43,6 @@ import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.ChannelUserEvent;
 import com.dmdirc.events.ChannelUsermodechangeEvent;
-import com.dmdirc.events.EventUtils;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
@@ -69,6 +68,7 @@ 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;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;

src/com/dmdirc/Query.java

@@ -25,7 +25,6 @@ package com.dmdirc;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.events.EventUtils;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryMessageEvent;
@@ -50,6 +49,7 @@ import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Toolkit;

src/com/dmdirc/Server.java

@@ -25,7 +25,6 @@ package com.dmdirc;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
-import com.dmdirc.events.EventUtils;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
@@ -65,6 +64,7 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 
 import java.net.NoRouteToHostException;

src/com/dmdirc/ServerEventHandler.java

@@ -23,7 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.events.EventUtils;
 import com.dmdirc.events.QuerySelfActionEvent;
 import com.dmdirc.events.QuerySelfMessageEvent;
 import com.dmdirc.events.ServerAuthnoticeEvent;
@@ -90,6 +89,7 @@ import com.dmdirc.parser.interfaces.callbacks.UserModeDiscoveryListener;
 import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
 import com.dmdirc.parser.interfaces.callbacks.WallopListener;
 import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
+import com.dmdirc.util.EventUtils;
 
 import java.util.Date;
 

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -34,11 +34,11 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.events.EventUtils;
 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.collections.RollingList;
 
 import java.io.Serializable;

src/com/dmdirc/util/ChildEventBusManager.java

@@ -87,7 +87,7 @@ public class ChildEventBusManager {
         }
 
         // Allow all other handlers on the child bus to process this first
-        @Handler(priority = Integer.MIN_VALUE)
+        @Handler(priority = EventUtils.PRIORITY_LOWEST)
         public void handleDisconnect(final ChildEventBusDisconnectingEvent event) {
             child.unsubscribe(propagator);
         }

src/com/dmdirc/events/EventUtils.java → src/com/dmdirc/util/EventUtils.java

@@ -20,15 +20,29 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.events;
+package com.dmdirc.util;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.DMDircEvent;
+import com.dmdirc.events.DisplayableEvent;
 
 /**
  * Utilities for interacting with events.
  */
 public final class EventUtils {
 
+    /** Default priority for normal listeners. */
+    public static final int PRIORITY_NORMAL = 0;
+
+    /** The lowest possible priority. */
+    public static final int PRIORITY_LOWEST = Integer.MIN_VALUE;
+
+    /**
+     * Priority for {@link DisplayableEvent} handlers. This is lower than standard listeners,
+     * to give them chance to modify the displayable event.
+     */
+    public static final int PRIORITY_DISPLAYABLE_EVENT_HANDLER = -1000;
+
     private EventUtils() {
     }