Add some more events, remove some unused methods.

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

@@ -8,6 +8,8 @@ ServerCtcpEvent:
 ServerCtcpReplyEvent:
   format: "-!- CTCP {{type}} reply from {{user.nickname}}: {{content}}."
   colour: 4
+ServerConnectingEvent:
+  format: "Connecting to {{uri.host}}:{{uri.port}}..."
 ServerDisconnectedEvent:
   format: "-!- You have been disconnected from the server."
   colour: 2
@@ -50,6 +52,9 @@ ServerNickChangeEvent:
 ServerErrorEvent:
   format: "ERROR: {{reason}}"
   colour: 4
+ServerUnknownProtocolEvent:
+  format: "Unknown protocol '{{protocol}}'. Unable to connect."
+  colour: 4
 
 ################## Server messaging events #########################################################
 
@@ -205,7 +210,6 @@ CommandOutputEvent:
 #  selfCTCP=4->- [%1$s] %2$s
 #  selfNotice=5>%1$s> %2$s
 #  selfMessage=>[%1$s]> %2$s
-#  serverConnecting=Connecting to %1$s:%2$s...
 #  serverDisconnectInProgress=A disconnection attempt is in progress, please wait...
 #  serverConnectInProgress=A connection attempt is in progress, please wait...
 #  rawCommand=10>>> %1$s
@@ -213,7 +217,6 @@ CommandOutputEvent:
 #  commandOutput=%1$s
 #  actionTooLong=Warning: action too long to be sent
 #  tabCompletion=14Multiple possibilities: %1$s
-#  serverUnknownProtocol=4Unknown protocol '%1$s'. Unable to connect.
 #  commandUsage=7Usage: %1$s%2$s %3$s
 #  numeric_006=%4$s
 #  numeric_007=%4$s

src/com/dmdirc/FrameContainer.java

@@ -319,24 +319,6 @@ public abstract class FrameContainer implements WindowModel {
         addLine(type, new Date(), args);
     }
 
-    @Override
-    public void addLine(final StringBuffer type, final Date timestamp, final Object... args) {
-        if (type != null) {
-            addLine(type.toString(), timestamp, args);
-        }
-    }
-
-    @Override
-    public void addLine(final StringBuffer type, final Object... args) {
-        addLine(type, new Date(), args);
-    }
-
-    @Override
-    @Deprecated
-    public void addLine(final String line, final boolean timestamp) {
-        addLine(line, new Date());
-    }
-
     @Override
     public void addLine(final String line, final Date timestamp) {
         for (final String myLine : line.split("\n")) {

src/com/dmdirc/Server.java

@@ -29,6 +29,7 @@ import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerReconnectScheduledEvent;
+import com.dmdirc.events.ServerUnknownProtocolEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InviteManager;
@@ -69,7 +70,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -322,7 +322,8 @@ public class Server extends FrameContainer implements Connection {
                 parser = Optional.ofNullable(buildParser());
 
                 if (!parser.isPresent()) {
-                    addLine("serverUnknownProtocol", address.getScheme());
+                    getEventBus().publishAsync(
+                            new ServerUnknownProtocolEvent(this, address.getScheme()));
                     return;
                 }
 
@@ -332,8 +333,6 @@ public class Server extends FrameContainer implements Connection {
                 parserLock.writeLock().unlock();
             }
 
-            addLine("serverConnecting", connectAddress.getHost(), connectAddress.getPort());
-
             myState.transition(ServerState.CONNECTING);
 
             doCallbacks();
@@ -348,7 +347,7 @@ public class Server extends FrameContainer implements Connection {
             }
         }
 
-        getEventBus().publish(new ServerConnectingEvent(this));
+        getEventBus().publish(new ServerConnectingEvent(this, address));
     }
 
     @Override

src/com/dmdirc/events/ServerConnectingEvent.java

@@ -24,17 +24,27 @@ package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
 
+import java.net.URI;
+
 /**
  * Fire when a server is connecting.
  */
-public class ServerConnectingEvent extends ServerEvent {
+public class ServerConnectingEvent extends ServerDisplayableEvent {
+
+    private final URI uri;
 
-    public ServerConnectingEvent(final Connection connection) {
+    public ServerConnectingEvent(final Connection connection, final URI uri) {
         super(connection);
+        this.uri = uri;
     }
 
-    public ServerConnectingEvent(final long timestamp, final Connection connection) {
+    public ServerConnectingEvent(final long timestamp, final Connection connection, final URI uri) {
         super(timestamp, connection);
+        this.uri = uri;
+    }
+
+    public URI getUri() {
+        return uri;
     }
 
 }

src/com/dmdirc/events/ServerUnknownProtocolEvent.java

@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+/**
+ * Raised when a server attempts to connect to an unknown protocol.
+ */
+public class ServerUnknownProtocolEvent extends ServerDisplayableEvent {
+
+    private final String protocol;
+
+    public ServerUnknownProtocolEvent(final long timestamp, final Connection connection, final String protocol) {
+        super(timestamp, connection);
+        this.protocol = protocol;
+    }
+
+    public ServerUnknownProtocolEvent(final Connection connection, final String protocol) {
+        super(connection);
+        this.protocol = protocol;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+}

src/com/dmdirc/interfaces/WindowModel.java

@@ -161,37 +161,6 @@ public interface WindowModel {
      */
     void addLine(String type, Object... args);
 
-    /**
-     * Adds a line to this container's window. If the window is null for some reason, the line is
-     * silently discarded.
-     *
-     * @param type      The message type to use
-     * @param timestamp The timestamp to use for this line
-     * @param args      The message's arguments
-     *
-     * @since 0.6.4
-     */
-    void addLine(StringBuffer type, Date timestamp, Object... args);
-
-    /**
-     * Adds a line to this container's window. If the window is null for some reason, the line is
-     * silently discarded.
-     *
-     * @param type The message type to use
-     * @param args The message's arguments
-     */
-    void addLine(StringBuffer type, Object... args);
-
-    /**
-     * Adds the specified raw line to the window, without using a formatter.
-     *
-     * @param line      The line to be added
-     * @param timestamp Whether or not to display the timestamp for this line
-     * @deprecated Timestamps are always displayed.
-     */
-    @Deprecated
-    void addLine(String line, boolean timestamp);
-
     /**
      * Adds the specified raw line to the window, without using a formatter, and using the specified
      * timestamp. If the timestamp is <code>null</code>, no timestamp is added.