Merge pull request #725 from csmith/master

Move some classes to API
DMDirc · Dec 29, 2016 · 2af37b9 · 2af37b9
2 parents d8ddc73 + 5a3c8b1
commit 2af37b9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 12 deletions.
diff --git a/src/main/java/com/dmdirc/ServerState.java → ...src/main/java/com/dmdirc/ServerState.java b/src/main/java/com/dmdirc/ServerState.java → ...src/main/java/com/dmdirc/ServerState.java
diff --git a/...va/com/dmdirc/ui/messages/BackBuffer.java → ...va/com/dmdirc/ui/messages/BackBuffer.java b/...va/com/dmdirc/ui/messages/BackBuffer.java → ...va/com/dmdirc/ui/messages/BackBuffer.java
@@ -29,7 +29,6 @@ public interface BackBuffer {
 
     Document getDocument();
 
-    Styliser getStyliser();
+    StyleApplier getStyliser();
 
 }
-
diff --git a/.../com/dmdirc/ui/messages/StyleApplier.java → .../com/dmdirc/ui/messages/StyleApplier.java b/.../com/dmdirc/ui/messages/StyleApplier.java → .../com/dmdirc/ui/messages/StyleApplier.java
diff --git a/src/main/java/com/dmdirc/Server.java b/src/main/java/com/dmdirc/Server.java
@@ -670,7 +670,6 @@ public ServerState getState() {
         return myState.getState();
     }
 
-    @Override
     public ServerStatus getStatus() {
         return myState;
     }

diff --git a/src/main/java/com/dmdirc/interfaces/Connection.java b/src/main/java/com/dmdirc/interfaces/Connection.java
@@ -203,15 +203,6 @@ public interface Connection {
      */
     ServerState getState();
 
-    /**
-     * Retrieves the status object for this server. Effecting state transitions on the object
-     * returned by this method will almost certainly cause problems.
-     *
-     * @since 0.6.3m1
-     * @return This server's status object.
-     */
-    ServerStatus getStatus();
-
     /**
      * Determines whether the server knows of the specified query.
      *