fixes igniterealtime#139: Removing unused code

Removing code that is not referenced / used anywhere. This reduces complexity, and improves maintainability.

Author: guusdk

src/java/com/reucon/openfire/plugin/archive/impl/PaginatedMucMessageDatabaseQuery.java

@@ -211,7 +211,7 @@ private String getStatementForSQLServer(final Long after, final Long before, fin
     {
         String sql = "SELECT sender, nickname, logTime, subject, body, stanza, messageId ";
         sql += " FROM ( ";
-        sql += "   SELECT TOP("+String.valueOf(maxResults)+") sender, nickname, logTime, subject, body, stanza, messageId FROM ofMucConversationLog ";
+        sql += "   SELECT TOP("+ maxResults +") sender, nickname, logTime, subject, body, stanza, messageId FROM ofMucConversationLog ";
         sql += "   WHERE messageId IS NOT NULL AND logTime > ? AND logTime <= ? AND roomID = ? AND (nickname IS NOT NULL OR subject IS NOT NULL) ";
         if ( with != null ) {
             // XEP-0313 specifies: If (and only if) the supplied JID is a bare JID (i.e. no resource is present), then the server

src/java/com/reucon/openfire/plugin/archive/model/Preferences.java

@@ -63,19 +63,6 @@ public class ArchiveSearch {
     private SortOrder sortOrder;
     private boolean externalWildcardMode;
 
-    /**
-     * Creates a new search on a query string.
-     *
-     * @param queryString the query string to use for the search.
-     * @return an ArchiveSearch instance to search using the specified query string.
-     */
-    public static ArchiveSearch createKeywordSearch(String queryString) {
-        ArchiveSearch search = new ArchiveSearch();
-        search.setQueryString(queryString);
-        search.setSortField(SortField.relevance);
-        return search;
-    }
-
     /**
      * Constructs a new archive search, sorted on date descending.
      */

src/java/com/reucon/openfire/plugin/archive/util/EscapeUtil.java

@@ -430,9 +430,7 @@ public Iterator<Conversation> iterator() {
                 public boolean hasNext() {
                     if (nextElement == null) {
                         nextElement = getNextElement();
-                        if (nextElement == null) {
-                            return false;
-                        }
+                        return nextElement != null;
                     }
                     return true;
                 }
@@ -518,9 +516,7 @@ public Iterator<Conversation> iterator() {
                 public boolean hasNext() {
                     if (nextElement == null) {
                         nextElement = getNextElement();
-                        if (nextElement == null) {
-                            return false;
-                        }
+                        return nextElement != null;
                     }
                     return true;
                 }

src/java/com/reucon/openfire/plugin/archive/xep0136/RemoveRequest.java

@@ -201,7 +201,7 @@ public static ConversationEvent roomMessageReceived(JID roomJID, JID user, Strin
         return event;
     }
 
-    private static enum Type {
+    private enum Type {
         /**
          * Event triggered when a room was destroyed.
          */

src/java/org/jivesoftware/openfire/archive/ArchiveSearch.java

@@ -32,7 +32,7 @@ public interface ConversationListener {
      *
      * @param conversation the conversation.
      */
-    public void conversationCreated(Conversation conversation);
+    void conversationCreated(Conversation conversation);
 
     /**
      * A conversation was updated, which means that a new message was sent between
@@ -41,14 +41,13 @@ public interface ConversationListener {
      * @param conversation the conversation.
      * @param date the date the conversation was updated.
      */
-    public void conversationUpdated(Conversation conversation, Date date);
+    void conversationUpdated(Conversation conversation, Date date);
 
     /**
      * A conversation ended due to inactivity or because the maximum conversation time
      * was hit.
      *
      * @param conversation the conversation.
      */
-    public void conversationEnded(Conversation conversation);
-
+    void conversationEnded(Conversation conversation);
 }