Merge pull request #514 from csmith/master

Make some server events use the new formatter.

res/com/dmdirc/ui/messages/format.yml

@@ -8,6 +8,18 @@ ServerCtcpEvent:
 ServerCtcpReplyEvent:
   format: "-!- CTCP {{type}} reply from {{user.nickname}}: {{content}}."
   colour: 4
+ServerDisconnectedEvent:
+  format: "-!- You have been disconnected from the server."
+  colour: 2
+ServerConnectErrorEvent:
+  format: "Error connecting: {{message}}"
+  colour: 2
+ServerReconnectScheduledEvent:
+  format: "Reconnecting in {{seconds}} seconds..."
+  colour: 2
+ServerStonedEvent:
+  format: "-!- Disconnected from a non-responsive server."
+  colour: 2
 
 ################## Channel join/part/quit events ###################################################
 
@@ -142,8 +154,6 @@ CommandOutputEvent:
 #  selfCTCP=4->- [%1$s] %2$s
 #  selfNotice=5>%1$s> %2$s
 #  selfMessage=>[%1$s]> %2$s
-#  connectError=2Error connecting: %2$s
-#  connectRetry=2Reconnecting in %2$u...
 #  serverConnecting=Connecting to %1$s:%2$s...
 #  back=14You are no longer marked as away.
 #  serverDisconnectInProgress=A disconnection attempt is in progress, please wait...
@@ -152,8 +162,6 @@ CommandOutputEvent:
 #  away=14You are now marked as away (%1$s14).
 #  rawCommand=10>>> %1$s
 #  unknownCommand=14Unknown command %1$s.
-#  socketClosed=2-!- You have been disconnected from the server.
-#  stonedServer=2-!- Disconnected from a non-responsive server.
 #  motdStart=10%1$s
 #  motdLine=10%1$s
 #  motdEnd=10%1$s

src/com/dmdirc/Server.java

@@ -30,6 +30,7 @@ import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
+import com.dmdirc.events.ServerReconnectScheduledEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InviteManager;
@@ -439,7 +440,7 @@ public class Server extends FrameContainer implements Connection {
             final int delay = Math.max(1000,
                     getConfigManager().getOptionInt(DOMAIN_GENERAL, "reconnectdelay"));
 
-            handleNotification("connectRetry", getAddress(), delay / 1000);
+            getEventBus().publishAsync(new ServerReconnectScheduledEvent(this, delay / 1000));
 
             reconnectTimerFuture = executorService.schedule(() -> {
                 synchronized (myStateLock) {
@@ -850,8 +851,6 @@ public class Server extends FrameContainer implements Connection {
             return;
         }
 
-        handleNotification("socketClosed", getAddress());
-
         getEventBus().publish(new ServerDisconnectedEvent(this));
 
         eventHandler.unregisterCallbacks();
@@ -956,8 +955,6 @@ public class Server extends FrameContainer implements Connection {
 
             getEventBus().publish(new ServerConnectErrorEvent(this, description));
 
-            handleNotification("connectError", getAddress(), description);
-
             if (getConfigManager().getOptionBool(DOMAIN_GENERAL, "reconnectonconnectfailure")) {
                 doDelayedReconnect();
             }

src/com/dmdirc/ServerEventHandler.java

@@ -42,6 +42,7 @@ import com.dmdirc.events.ServerNoticeEvent;
 import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.events.ServerPingSentEvent;
 import com.dmdirc.events.ServerServerNoticeEvent;
+import com.dmdirc.events.ServerStonedEvent;
 import com.dmdirc.events.ServerUnknownActionEvent;
 import com.dmdirc.events.ServerUnknownMessageEvent;
 import com.dmdirc.events.ServerUnknownNoticeEvent;
@@ -331,7 +332,7 @@ public class ServerEventHandler extends EventHandler implements
         if (parser.getPingTime()
                 >= owner.getConfigManager().getOptionInt("server", "pingtimeout")) {
             LOG.warn("Server appears to be stoned, reconnecting");
-            owner.handleNotification("stonedServer", owner.getAddress());
+            eventBus.publishAsync(new ServerStonedEvent(owner));
             owner.reconnect();
         }
     }

src/com/dmdirc/events/ServerDisconnectedEvent.java

@@ -27,7 +27,7 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fire when a server disconnects.
  */
-public class ServerDisconnectedEvent extends ServerEvent {
+public class ServerDisconnectedEvent extends ServerDisplayableEvent {
 
     public ServerDisconnectedEvent(final Connection connection) {
         super(connection);

src/com/dmdirc/events/ServerReconnectScheduledEvent.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Event raised when a reconnection attempt has been scheduled.
+ */
+public class ServerReconnectScheduledEvent extends ServerDisplayableEvent {
+
+    private final int seconds;
+
+    public ServerReconnectScheduledEvent(final Connection connection, final int seconds) {
+        super(connection);
+        this.seconds = seconds;
+    }
+
+    public int getSeconds() {
+        return seconds;
+    }
+
+}

src/com/dmdirc/events/ServerStonedEvent.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Event raised when a server appears to be 'stoned' (i.e., non-responsive).
+ */
+public class ServerStonedEvent extends ServerDisplayableEvent {
+
+    public ServerStonedEvent(final Connection connection) {
+        super(connection);
+    }
+
+}