Add @Override annotations where appropiate (OF-343)

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11608 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/apache/mina/management/MINAStatCollector.java

@@ -257,6 +257,12 @@ public class MINAStatCollector {
             super( "StatCollectorWorker-"+id );
         }
 
+        /*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.lang.Thread#run()
+		 */
+        @Override 
         public void run()
         {
             while ( !stop )

src/java/org/jivesoftware/admin/SidebarTag.java

@@ -132,6 +132,7 @@ public class SidebarTag extends BodyTagSupport {
     /**
      * Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
      */
+    @Override
     public int doStartTag() throws JspException {
         return EVAL_BODY_BUFFERED;
     }
@@ -145,6 +146,7 @@ public class SidebarTag extends BodyTagSupport {
      * @return {@link #EVAL_PAGE} after rendering the tabs.
      * @throws JspException if an exception occurs while rendering the sidebar items.
      */
+    @Override
     public int doEndTag() throws JspException {
         // Start by getting the request from the page context
         HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();

src/java/org/jivesoftware/admin/SubSidebarTag.java

@@ -64,6 +64,7 @@ public class SubSidebarTag extends SidebarTag {
      * @return {@link #EVAL_BODY_BUFFERED} if no errors.
      * @throws javax.servlet.jsp.JspException if a parent SidebarTag is not found.
      */
+    @Override
     public int doStartTag() throws JspException {
         // The I18nTag should be our parent Tag
         parent = (SidebarTag)findAncestorWithClass(this, SidebarTag.class);
@@ -81,6 +82,7 @@ public class SubSidebarTag extends SidebarTag {
      * @return {@link #EVAL_PAGE}
      * @throws JspException if an error occurs.
      */
+    @Override
     public int doEndTag() throws JspException {
         setBody(bodyContent.getString());
         parent.setSubSidebar(this);

src/java/org/jivesoftware/admin/SubnavTag.java

@@ -101,6 +101,7 @@ public class SubnavTag extends BodyTagSupport {
     /**
      * Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
      */
+    @Override
     public int doStartTag() throws JspException {
         return EVAL_BODY_BUFFERED;
     }
@@ -114,6 +115,7 @@ public class SubnavTag extends BodyTagSupport {
      * @return {@link #EVAL_PAGE} after rendering the tabs.
      * @throws JspException if an exception occurs while rendering the sidebar items.
      */
+    @Override
     public int doEndTag() throws JspException {
         // Start by getting the request from the page context
         HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();

src/java/org/jivesoftware/admin/TabsTag.java

@@ -125,6 +125,7 @@ public class TabsTag extends BodyTagSupport {
     /**
      * Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
      */
+    @Override
     public int doStartTag() throws JspException {
         return EVAL_BODY_BUFFERED;
     }
@@ -137,6 +138,7 @@ public class TabsTag extends BodyTagSupport {
      * @return {@link #EVAL_PAGE} after rendering the tabs.
      * @throws JspException if an exception occurs while rendering the tabs.
      */
+    @Override
     public int doEndTag() throws JspException {
         HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
         // Get the page data bean from the request:

src/java/org/jivesoftware/database/CachedPreparedStatement.java

@@ -156,7 +156,8 @@ public class CachedPreparedStatement  {
         }
     }
 
-    public boolean equals(Object object) {
+    @Override
+	public boolean equals(Object object) {
         if (object == null) {
             return false;
         }
@@ -171,7 +172,8 @@ public class CachedPreparedStatement  {
                 && types.equals(otherStmt.types) && params.equals(otherStmt.params);
     }
 
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         int hashCode = 1;
         if (sql != null) {
             hashCode += sql.hashCode();
@@ -181,7 +183,8 @@ public class CachedPreparedStatement  {
         return hashCode;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         String toStringSql = sql;
         try {
             int index = toStringSql.indexOf('?');

src/java/org/jivesoftware/database/DefaultConnectionProvider.java

@@ -380,7 +380,8 @@ public class DefaultConnectionProvider implements ConnectionProvider {
                 Double.toString(connectionTimeout));
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         try {
             ConnectionPoolDefinitionIF poolDef = ProxoolFacade.getConnectionPoolDefinition("openfire");
             SnapshotIF poolStats = ProxoolFacade.getSnapshot("openfire", true);

src/java/org/jivesoftware/database/DefaultConnectionProviderBeanInfo.java

@@ -43,14 +43,32 @@ public class DefaultConnectionProviderBeanInfo extends JiveBeanInfo {
         super();
     }
 
+    /*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jivesoftware.util.JiveBeanInfo#getBeanClass()
+	 */
+    @Override
     public Class getBeanClass() {
         return org.jivesoftware.database.DefaultConnectionProvider.class;
     }
 
+    /*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jivesoftware.util.JiveBeanInfo#getPropertyNames()
+	 */
+    @Override
     public String[] getPropertyNames() {
         return PROPERTY_NAMES;
     }
 
+    /*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jivesoftware.util.JiveBeanInfo#getName()
+	 */
+    @Override
     public String getName() {
         return "DefaultConnectionProvider";
     }

src/java/org/jivesoftware/database/EmbeddedConnectionProvider.java

@@ -113,7 +113,8 @@ public class EmbeddedConnectionProvider implements ConnectionProvider {
         settings = null;
     }
 
-    public void finalize() throws Throwable {
+    @Override
+	public void finalize() throws Throwable {
         super.finalize();
         destroy();
     }

src/java/org/jivesoftware/database/SchemaManager.java

@@ -92,7 +92,8 @@ public class SchemaManager {
         try {
             return checkSchema(con, "openfire", DATABASE_VERSION,
                     new ResourceLoader() {
-                        public InputStream loadResource(String resourceName) {
+                        @Override
+						public InputStream loadResource(String resourceName) {
                             File file = new File(JiveGlobals.getHomeDirectory() + File.separator +
                                     "resources" + File.separator + "database", resourceName);
                             try {
@@ -134,7 +135,8 @@ public class SchemaManager {
         try {
             con = DbConnectionManager.getConnection();
             return checkSchema(con, schemaKey, schemaVersion, new ResourceLoader() {
-                public InputStream loadResource(String resourceName) {
+                @Override
+				public InputStream loadResource(String resourceName) {
                     File file = new File(pluginManager.getPluginDirectory(plugin) +
                             File.separator + "database", resourceName);
                     try {

src/java/org/jivesoftware/openfire/FlashCrossDomainHandler.java

@@ -50,7 +50,8 @@ public class FlashCrossDomainHandler extends BasicModule {
         super("Flash CrossDomain Handler");
     }
 
-    public void start() {
+    @Override
+	public void start() {
         Thread thread = new Thread(new Runnable() {
             public void run() {
                 try {
@@ -65,7 +66,8 @@ public class FlashCrossDomainHandler extends BasicModule {
         thread.start();
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         try {
             if (serverSocket != null) {
                 serverSocket.close();

src/java/org/jivesoftware/openfire/IQRouter.java

@@ -249,7 +249,8 @@ public class IQRouter extends BasicModule {
         resultTimeout.put(id, System.currentTimeMillis() + timeoutmillis);
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         TaskEngine.getInstance().scheduleAtFixedRate(new TimeoutTask(), 5000, 5000);
         serverName = server.getServerInfo().getXMPPDomain();

src/java/org/jivesoftware/openfire/LocalSessionManager.java

@@ -166,7 +166,8 @@ class LocalSessionManager {
         /**
          * Close incoming server sessions that have been idle for a long time.
          */
-        public void run() {
+        @Override
+		public void run() {
             // Do nothing if this feature is disabled
             int idleTime = SessionManager.getInstance().getServerSessionIdleTime();
             if (idleTime == -1) {

src/java/org/jivesoftware/openfire/MessageRouter.java

@@ -171,7 +171,8 @@ public class MessageRouter extends BasicModule {
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         messageStrategy = server.getOfflineMessageStrategy();
         routingTable = server.getRoutingTable();

src/java/org/jivesoftware/openfire/MulticastRouter.java

@@ -401,7 +401,8 @@ public class MulticastRouter extends BasicModule implements ServerFeaturesProvid
         return features.iterator();
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         this.server = server;
         this.packetRouter = server.getPacketRouter();

src/java/org/jivesoftware/openfire/OfflineMessageStore.java

@@ -432,7 +432,8 @@ public class OfflineMessageStore extends BasicModule implements UserEventListene
         //Do nothing
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         // Initialize the pool of sax readers
         for (int i=0; i<POOL_SIZE; i++) {
@@ -445,7 +446,8 @@ public class OfflineMessageStore extends BasicModule implements UserEventListene
         UserEventDispatcher.addListener(this);
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
         // Clean up the pool of sax readers
         xmlReaders.clear();

src/java/org/jivesoftware/openfire/OfflineMessageStrategy.java

@@ -182,7 +182,8 @@ public class OfflineMessageStrategy extends BasicModule {
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         messageStore = server.getOfflineMessageStore();
         router = server.getPacketRouter();

src/java/org/jivesoftware/openfire/PresenceRouter.java

@@ -214,7 +214,8 @@ public class PresenceRouter extends BasicModule {
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         serverName = server.getServerInfo().getXMPPDomain();
         routingTable = server.getRoutingTable();

src/java/org/jivesoftware/openfire/PrivateStorage.java

@@ -232,7 +232,8 @@ public class PrivateStorage extends BasicModule implements UserEventListener {
         //Do nothing
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         // Initialize the pool of sax readers
         for (int i=0; i<POOL_SIZE; i++) {
@@ -245,7 +246,8 @@ public class PrivateStorage extends BasicModule implements UserEventListener {
         UserEventDispatcher.addListener(this);
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
         // Clean up the pool of sax readers
         xmlReaders.clear();

src/java/org/jivesoftware/openfire/SessionManager.java

@@ -1260,7 +1260,8 @@ public class SessionManager extends BasicModule implements ClusterEventListener
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         this.server = server;
         router = server.getPacketRouter();
@@ -1348,12 +1349,14 @@ public class SessionManager extends BasicModule implements ClusterEventListener
         return message;
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         localSessionManager.start();
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         Log.debug("SessionManager: Stopping server");
         // Stop threads that are sending packets to remote servers
         OutgoingSessionPromise.getInstance().shutdown();

src/java/org/jivesoftware/openfire/SessionNotFoundException.java

@@ -43,21 +43,24 @@ public class SessionNotFoundException extends Exception {
         this.nestedThrowable = nestedThrowable;
     }
 
-    public void printStackTrace() {
+    @Override
+	public void printStackTrace() {
         super.printStackTrace();
         if (nestedThrowable != null) {
             nestedThrowable.printStackTrace();
         }
     }
 
-    public void printStackTrace(PrintStream ps) {
+    @Override
+	public void printStackTrace(PrintStream ps) {
         super.printStackTrace(ps);
         if (nestedThrowable != null) {
             nestedThrowable.printStackTrace(ps);
         }
     }
 
-    public void printStackTrace(PrintWriter pw) {
+    @Override
+	public void printStackTrace(PrintWriter pw) {
         super.printStackTrace(pw);
         if (nestedThrowable != null) {
             nestedThrowable.printStackTrace(pw);

src/java/org/jivesoftware/openfire/SessionResultFilter.java

@@ -311,7 +311,8 @@ public class SessionResultFilter {
         return date - (date % (1000 * seconds));
     }
 
-    public boolean equals(Object object) {
+    @Override
+	public boolean equals(Object object) {
         if (this == object) {
             return true;
         }

src/java/org/jivesoftware/openfire/XMPPServer.java

@@ -419,7 +419,8 @@ public class XMPPServer {
             AdminManager.getInstance().getAdminAccounts();
 
             Thread finishSetup = new Thread() {
-                public void run() {
+                @Override
+				public void run() {
                     try {
                         if (isStandAlone()) {
                             // Always restart the HTTP server manager. This covers the case
@@ -654,7 +655,8 @@ public class XMPPServer {
      */
     public void restartHTTPServer() {
         Thread restartThread = new Thread() {
-            public void run() {
+            @Override
+			public void run() {
                 if (isStandAlone()) {
                     // Restart the HTTP server manager. This covers the case
                     // of changing the ports, as well as generating self-signed certificates.
@@ -897,7 +899,8 @@ public class XMPPServer {
         /**
          * <p>Logs the server shutdown.</p>
          */
-        public void run() {
+        @Override
+		public void run() {
             shutdownServer();
             Log.info("Server halted");
             System.err.println("Server halted");
@@ -916,7 +919,8 @@ public class XMPPServer {
         /**
          * <p>Shuts down the JVM after a 5 second delay.</p>
          */
-        public void run() {
+        @Override
+		public void run() {
             try {
                 Thread.sleep(5000);
                 // No matter what, we make sure it's dead

src/java/org/jivesoftware/openfire/audit/spi/AuditManagerImpl.java

@@ -235,7 +235,8 @@ public class AuditManagerImpl extends BasicModule implements AuditManager {
     // Basic module methods
     // #########################################################################
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         enabled = JiveGlobals.getBooleanProperty("xmpp.audit.active");
         auditMessage = JiveGlobals.getBooleanProperty("xmpp.audit.message");
@@ -272,7 +273,8 @@ public class AuditManagerImpl extends BasicModule implements AuditManager {
         }
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         if (auditor != null) {
             auditor.stop();
         }

src/java/org/jivesoftware/openfire/audit/spi/AuditorImpl.java

@@ -355,7 +355,8 @@ public class AuditorImpl implements Auditor {
      * Saves the queued entries to an XML file and checks that very old files are deleted.
      */
     private class SaveQueuedPacketsTask extends TimerTask {
-        public void run() {
+        @Override
+		public void run() {
             try {
                 // Ensure that saved audit logs are not too old
                 ensureMaxDays();

src/java/org/jivesoftware/openfire/clearspace/ClearspaceMUCEventDelegate.java

@@ -56,7 +56,8 @@ public class ClearspaceMUCEventDelegate extends MUCEventDelegate {
         csComponentAddress = ClearspaceManager.CLEARSPACE_COMPONENT + "." + xmppDomain;
     }
 
-    public InvitationResult sendingInvitation(MUCRoom room, JID invitee, JID inviter, String reason)
+    @Override
+	public InvitationResult sendingInvitation(MUCRoom room, JID invitee, JID inviter, String reason)
     {
         // Packet should look like:
         // <iq to="clearspace.example.org" from="clearspace-conference.example.org">
@@ -103,7 +104,8 @@ public class ClearspaceMUCEventDelegate extends MUCEventDelegate {
      * @param userjid  the JID of the user attempting to join the room.
      * @return true if the user is allowed to join the room.
      */
-    public boolean joiningRoom(MUCRoom room, JID userjid) {
+    @Override
+	public boolean joiningRoom(MUCRoom room, JID userjid) {
         // Always allow an owner to join the room (especially since they need to join to configure the
         // room on initial creation).
         Collection<String> owners = room.getOwners();
@@ -145,11 +147,13 @@ public class ClearspaceMUCEventDelegate extends MUCEventDelegate {
         return false;
     }
 
-    public boolean shouldRecreate(String roomName, JID userjid) {
+    @Override
+	public boolean shouldRecreate(String roomName, JID userjid) {
         return !(roomName + "@" + csComponentAddress).equals(userjid.toBareJID());
     }
 
-    public Map<String, String> getRoomConfig(String roomName) {
+    @Override
+	public Map<String, String> getRoomConfig(String roomName) {
         Map<String, String> roomConfig = new HashMap<String, String>();
 
         IQ iq = new IQ(IQ.Type.get);
@@ -209,7 +213,8 @@ public class ClearspaceMUCEventDelegate extends MUCEventDelegate {
      * @param userjid  the JID of the user attempting to destroy the room.
      * @return true if the user is allowed to destroy the room.
      */
-    public boolean destroyingRoom(String roomName, JID userjid) {
+    @Override
+	public boolean destroyingRoom(String roomName, JID userjid) {
         // We never allow destroying a room as a user, but clearspace components are permitted.
         return ClearspaceManager.getInstance().isFromClearspace(userjid);
     }

src/java/org/jivesoftware/openfire/clearspace/ClearspaceMUCTranscriptManager.java

@@ -124,7 +124,8 @@ public class ClearspaceMUCTranscriptManager implements MUCEventListener {
 
         // Schedule a task for this new transcript event queue.
         transcriptUpdateTask = new TimerTask() {
-            public void run() {
+            @Override
+			public void run() {
                 if (roomEvents.isEmpty()) {
                     return;
                 }

src/java/org/jivesoftware/openfire/clearspace/ClearspaceManager.java

@@ -155,7 +155,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
         }
         // Create xmpp parser to keep in each thread
         localParser = new ThreadLocal<XMPPPacketReader>() {
-            protected XMPPPacketReader initialValue() {
+            @Override
+			protected XMPPPacketReader initialValue() {
                 XMPPPacketReader parser = new XMPPPacketReader();
                 factory.setNamespaceAware(true);
                 parser.setXPPFactory(factory);
@@ -529,7 +530,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
         return AuthFactory.getAuthProvider() instanceof ClearspaceAuthProvider;
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         if (isEnabled()) {
             // Before starting up service make sure there is a default secret
@@ -587,7 +589,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
         }
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
 
         // Stops the Clearspace MUC transcript manager
@@ -1331,7 +1334,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
 
     private class ConfigClearspaceTask extends TimerTask {
 
-        public void run() {
+        @Override
+		public void run() {
             try {
                 Log.debug("Trying to configure Clearspace.");
                 doConfigClearspace();

src/java/org/jivesoftware/openfire/clearspace/SSLProtocolSocketFactory.java

@@ -171,11 +171,13 @@ public class SSLProtocolSocketFactory implements SecureProtocolSocketFactory {
         );
     }
 
-    public boolean equals(Object obj) {
+    @Override
+	public boolean equals(Object obj) {
         return ((obj != null) && obj.getClass().equals(SSLProtocolSocketFactory.class));
     }
 
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return SSLProtocolSocketFactory.class.hashCode();
     }
 

src/java/org/jivesoftware/openfire/cluster/ClusterManager.java

@@ -49,7 +49,8 @@ public class ClusterManager {
 
     static {
         Thread thread = new Thread("ClusterManager events dispatcher") {
-            public void run() {
+            @Override
+			public void run() {
                 for (; ;) {
                     try {
                         Event event = events.take();
@@ -453,7 +454,8 @@ public class ClusterManager {
             this.processed = processed;
         }
 
-        public String toString() {
+        @Override
+		public String toString() {
             return super.toString() + " type: " + type;
         }
     }

src/java/org/jivesoftware/openfire/cluster/NodeID.java

@@ -79,7 +79,8 @@ public class NodeID implements Externalizable {
         return Arrays.equals(nodeID, anotherID);
     }
 
-    public boolean equals(Object o) {
+    @Override
+	public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
@@ -88,7 +89,8 @@ public class NodeID implements Externalizable {
         return Arrays.equals(nodeID, that.nodeID);
     }
 
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return Arrays.hashCode(nodeID);
     }
 

src/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java

@@ -84,11 +84,13 @@ public class AdHocCommandHandler extends IQHandler
         manager = new AdHocCommandManager();
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         return manager.process(packet);
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
@@ -144,14 +146,16 @@ public class AdHocCommandHandler extends IQHandler
         return answer.iterator();
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         serverName = server.getServerInfo().getXMPPDomain();
         infoHandler = server.getIQDiscoInfoHandler();
         itemsHandler = server.getIQDiscoItemsHandler();
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         infoHandler.setServerNodeInfoProvider(NAMESPACE, this);
         itemsHandler.setServerNodeInfoProvider(NAMESPACE, this);
@@ -159,7 +163,8 @@ public class AdHocCommandHandler extends IQHandler
         addDefaultCommands();
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
         infoHandler.removeServerNodeInfoProvider(NAMESPACE);
         itemsHandler.removeServerNodeInfoProvider(NAMESPACE);

src/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java

@@ -44,11 +44,13 @@ import java.util.List;
  */
 public class GetAdminConsoleInfo extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         //Do nothing since there are no stages
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -126,25 +128,30 @@ public class GetAdminConsoleInfo extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-console-info";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get admin console info.";
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 
@@ -155,7 +162,8 @@ public class GetAdminConsoleInfo extends AdHocCommand {
      * @param requester the JID of the user requesting to execute this command.
      * @return true if the requester can access this command.
      */
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java

@@ -38,7 +38,8 @@ import java.util.*;
  */
 public class GetListActiveUsers extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Requesting List of Active Users");
         form.addInstruction("Fill out this form to request the active users of this service.");
@@ -64,7 +65,8 @@ public class GetListActiveUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         String max_items = data.getData().get("max_items").get(0);
         int maxItems = -1;
         if (max_items != null && "none".equals(max_items)) {
@@ -105,23 +107,28 @@ public class GetListActiveUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-active-users";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get List of Active Users";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java

@@ -40,11 +40,13 @@ import java.util.Set;
  */
 public class GetNumberActiveUsers extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         //Do nothing since there are no stages
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -68,26 +70,31 @@ public class GetNumberActiveUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-active-users-num";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         // TODO Use i18n
         return "Number of Active Users";
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java

@@ -41,11 +41,13 @@ import java.util.Set;
  */
 public class GetNumberOnlineUsers extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         //Do nothing since there are no stages
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -67,26 +69,31 @@ public class GetNumberOnlineUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-online-users-num";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         // TODO Use i18n
         return "Number of Online Users";
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java

@@ -33,11 +33,13 @@ import java.util.List;
  */
 public class GetNumberUserSessions extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         //Do nothing since there are no stages
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -54,26 +56,31 @@ public class GetNumberUserSessions extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-sessions-num";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         // TODO Use i18n
         return "Number of Connected User Sessions";
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java

@@ -48,11 +48,13 @@ import java.util.*;
 public class GetServerStats extends AdHocCommand {
     final private FastDateFormat dateFormat = FastDateFormat.getInstance(JiveConstants.XMPP_DATETIME_FORMAT, TimeZone.getTimeZone("UTC"));
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         //Do nothing since there are no stages
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -130,25 +132,30 @@ public class GetServerStats extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-server-stats";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get basic statistics of the server.";
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 
@@ -159,7 +166,8 @@ public class GetServerStats extends AdHocCommand {
      * @param requester the JID of the user requesting to execute this command.
      * @return true if the requester can access this command.
      */
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java

@@ -42,7 +42,8 @@ import java.util.List;
  */
 public class GetUsersPresence extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Requesting Presence of Active Users");
         form.addInstruction("Fill out this form to request the active users presence of this service.");
@@ -68,7 +69,8 @@ public class GetUsersPresence extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         String max_items = data.getData().get("max_items").get(0);
         int maxItems = -1;
         if (max_items != null && "none".equals(max_items)) {
@@ -105,23 +107,28 @@ public class GetUsersPresence extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-active-presences";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get Presence of Active Users";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
@@ -132,7 +139,8 @@ public class GetUsersPresence extends AdHocCommand {
      * @param requester the JID of the entity requesting to execute this command.
      * @return true if the requester can access this command.
      */
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java

@@ -39,19 +39,23 @@ import java.util.List;
  * @author Alexander Wenckus
  */
 public class HttpBindStatus extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#status-http-bind";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Current Http Bind Status";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -89,15 +93,18 @@ public class HttpBindStatus extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         // no stages, do nothing.
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Collections.emptyList();
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return null;
     }
 

src/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java

@@ -41,7 +41,8 @@ import java.util.List;
  */
 public class PacketsNotification extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Receiving notification of packets activity");
         form.addInstruction("Fill out this form to configure packets to receive.");
@@ -80,7 +81,8 @@ public class PacketsNotification extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         boolean presenceEnabled = false;
         boolean messageEnabled = false;
         boolean iqEnabled = false;
@@ -110,23 +112,28 @@ public class PacketsNotification extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#packets_notification";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get notifications of packet activity";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
@@ -137,7 +144,8 @@ public class PacketsNotification extends AdHocCommand {
      * @param requester the JID of the user requesting to execute this command.
      * @return true if the requester can access this command.
      */
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return InternalComponentManager.getInstance().hasComponent(requester);
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java

@@ -46,7 +46,8 @@ public class AddGroup extends AdHocCommand {
 	
 	private static final Logger Log = LoggerFactory.getLogger(AddGroup.class);
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Create new group");
         form.addInstruction("Fill out this form to create a new group.");
@@ -99,7 +100,8 @@ public class AddGroup extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         // Check if groups cannot be modified (backend is read-only)
         if (GroupManager.getInstance().isReadOnly()) {
@@ -174,23 +176,28 @@ public class AddGroup extends AdHocCommand {
         note.setText("Operation finished" + (withErrors ? " with errors" : " successfully"));
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#add-group";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Create new group";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java

@@ -46,7 +46,8 @@ public class AddGroupUsers extends AdHocCommand {
 	
 	private static final Logger Log = LoggerFactory.getLogger(AddGroupUsers.class);
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Add members or admins to a group");
         form.addInstruction("Fill out this form to add new members or admins to a group.");
@@ -79,7 +80,8 @@ public class AddGroupUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         // Check if groups cannot be modified (backend is read-only)
         if (GroupManager.getInstance().isReadOnly()) {
@@ -116,23 +118,28 @@ public class AddGroupUsers extends AdHocCommand {
         note.setText("Operation finished" + (withErrors ? " with errors" : " successfully"));
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#add-group-members";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Add members or admins to a group";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java

@@ -39,7 +39,8 @@ import java.util.List;
  * TODO Use i18n
  */
 public class DeleteGroup extends AdHocCommand {
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Delete group");
         form.addInstruction("Fill out this form to delete a group.");
@@ -59,7 +60,8 @@ public class DeleteGroup extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         // Check if groups cannot be modified (backend is read-only)
         if (GroupManager.getInstance().isReadOnly()) {
@@ -84,23 +86,28 @@ public class DeleteGroup extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#delete-group";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Delete group";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java

@@ -45,7 +45,8 @@ public class DeleteGroupUsers extends AdHocCommand {
 	
 	private static final Logger Log = LoggerFactory.getLogger(DeleteGroupUsers.class);
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Delete members or admins from a group");
         form.addInstruction("Fill out this form to delete members or admins from a group.");
@@ -71,7 +72,8 @@ public class DeleteGroupUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         // Check if groups cannot be modified (backend is read-only)
         if (GroupManager.getInstance().isReadOnly()) {
@@ -105,23 +107,28 @@ public class DeleteGroupUsers extends AdHocCommand {
         note.setText("Operation finished" + (withErrors ? " with errors" : " successfully"));
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#delete-group-members";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Delete members or admins from a group";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java

@@ -42,7 +42,8 @@ import java.util.Map;
  * TODO Use i18n
  */
 public class GetListGroupUsers extends AdHocCommand {
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Requesting List of Group Members");
         form.addInstruction("Fill out this form to request list of group members and admins.");
@@ -62,7 +63,8 @@ public class GetListGroupUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Group group;
         try {
             group = GroupManager.getInstance().getGroup(data.getData().get("group").get(0));
@@ -96,23 +98,28 @@ public class GetListGroupUsers extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-group-members";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get List of Group Members";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java

@@ -42,7 +42,8 @@ import java.util.Map;
  */
 public class GetListGroups extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Requesting List of Existing Groups");
         form.addInstruction("Fill out this form to request list of groups.");
@@ -84,7 +85,8 @@ public class GetListGroups extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         String start = data.getData().get("start").get(0);
         String max_items = data.getData().get("max_items").get(0);
         int nStart = 0;
@@ -141,23 +143,28 @@ public class GetListGroups extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-groups";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get List of Existing Groups";
     }
 
-    protected List<AdHocCommand.Action> getActions(SessionData data) {
+    @Override
+	protected List<AdHocCommand.Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java

@@ -38,7 +38,8 @@ import java.util.*;
  * TODO Use i18n
  */
 public class UpdateGroup extends AdHocCommand {
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         if (data.getStage() == 0) {
             form.setTitle("Update group configuration");
@@ -146,7 +147,8 @@ public class UpdateGroup extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         // Get requested group
         Group group;
@@ -198,15 +200,18 @@ public class UpdateGroup extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#update-group";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Update group configuration";
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         if (data.getStage() == 0) {
             return Arrays.asList(AdHocCommand.Action.next);
         }
@@ -216,14 +221,16 @@ public class UpdateGroup extends AdHocCommand {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         if (data.getStage() == 0) {
             return AdHocCommand.Action.next;
         }
         return AdHocCommand.Action.complete;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 2;
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java

@@ -41,19 +41,23 @@ import java.util.Map;
  * @author Alexander Wenckus
  */
 public class CreateMUCRoom extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#create-muc-room";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Create a Multi-user Chat";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
         Collection<JID> admins = XMPPServer.getInstance().getAdmins();
         if (admins.size() <= 0) {
@@ -114,7 +118,8 @@ public class CreateMUCRoom extends AdHocCommand {
         }
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Create a multi-user chat room");
         form.addInstruction("Fill out this form to create a multi-user chat room.");
@@ -160,11 +165,13 @@ public class CreateMUCRoom extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 

src/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Alexander Wenckus
  */
 public class AddUser extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#add-user";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Add a User";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
         // Check if groups cannot be modified (backend is read-only)
         if (UserManager.getUserProvider().isReadOnly()) {
@@ -116,7 +120,8 @@ public class AddUser extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Adding a user");
         form.addInstruction("Fill out this form to add a user.");
@@ -161,15 +166,18 @@ public class AddUser extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return (super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester))
                 && !UserManager.getUserProvider().isReadOnly();
     }

src/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java

@@ -44,19 +44,23 @@ import java.util.List;
  * @author Alexander Wenckus
  */
 public class AuthenticateUser extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#authenticate-user";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Authenticate User";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         JID account;
         try {
@@ -109,7 +113,8 @@ public class AuthenticateUser extends AdHocCommand {
         note.setText("Operation finished successfully.");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Authenticating a user");
         form.addInstruction("Fill out this form to authenticate a user.");
@@ -135,11 +140,13 @@ public class AuthenticateUser extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 

src/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java

@@ -41,19 +41,23 @@ import java.util.List;
  * TODO Use i18n
  */
 public class ChangeUserPassword extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#change-user-password";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Change User Password";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         Element note = command.addElement("note");
         // Check if groups cannot be modified (backend is read-only)
         if (UserManager.getUserProvider().isReadOnly()) {
@@ -85,7 +89,8 @@ public class ChangeUserPassword extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Changing a User Password");
         form.addInstruction("Fill out this form to change a user\u2019s password.");
@@ -111,16 +116,19 @@ public class ChangeUserPassword extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) && !UserManager.getUserProvider().isReadOnly();
     }
 }

src/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java

@@ -37,19 +37,23 @@ import java.util.Arrays;
  * @author Alexander Wenckus
  */
 public class UserProperties extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/admin#get-user-properties";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Get User Properties";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -93,7 +97,8 @@ public class UserProperties extends AdHocCommand {
         }
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Retrieve Users' Information");
         form.addInstruction("Fill out this form to retrieve users' information.");
@@ -113,11 +118,13 @@ public class UserProperties extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(AdHocCommand.Action.complete);
     }
 
-    protected AdHocCommand.Action getExecuteAction(SessionData data) {
+    @Override
+	protected AdHocCommand.Action getExecuteAction(SessionData data) {
         return AdHocCommand.Action.complete;
     }
 }

src/java/org/jivesoftware/openfire/commands/clearspace/ChangeSharedSecret.java

@@ -38,19 +38,23 @@ import java.util.Map;
  * @author Gabriel Guardincerri
  */
 public class ChangeSharedSecret extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/clearspace#change-sharedsecret";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Change the share secret";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -89,7 +93,8 @@ public class ChangeSharedSecret extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Changing the share secret");
         form.addInstruction("Fill out this form to change the shared secret.");
@@ -115,15 +120,18 @@ public class ChangeSharedSecret extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return (super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester));
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/clearspace/GenerateNonce.java

@@ -37,11 +37,13 @@ import java.util.List;
  */
 public class GenerateNonce extends AdHocCommand {
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         //Do nothing since there are no stages
     }
 
-    public void execute(SessionData data, Element command) {
+    @Override
+	public void execute(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.result);
 
         FormField field = form.addField();
@@ -57,30 +59,36 @@ public class GenerateNonce extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/clearspace#generate-nonce";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         // TODO Use i18n
         return "New nonce";
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         //Do nothing since there are no stages
         return null;
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 0;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return (super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester));
     }
     

src/java/org/jivesoftware/openfire/commands/clearspace/SystemAdminAdded.java

@@ -35,19 +35,23 @@ import java.util.Arrays;
  * @author Armando Jagucki
  */
 public class SystemAdminAdded extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#sys-admin-added";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "System administrator added";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -71,7 +75,8 @@ public class SystemAdminAdded extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a system admin added event.");
         form.addInstruction("Fill out this form to dispatch a system admin added event.");
@@ -91,11 +96,13 @@ public class SystemAdminAdded extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 

src/java/org/jivesoftware/openfire/commands/clearspace/SystemAdminRemoved.java

@@ -35,19 +35,23 @@ import java.util.Arrays;
  * @author Armando Jagucki
  */
 public class SystemAdminRemoved extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#sys-admin-removed";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "System administrator status removed";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -71,7 +75,8 @@ public class SystemAdminRemoved extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a system admin removed event.");
         form.addInstruction("Fill out this form to dispatch a system admin removed event.");
@@ -91,11 +96,13 @@ public class SystemAdminRemoved extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 

src/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupAdminAdded extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-admin-added";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group admin added";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -107,7 +111,8 @@ public class GroupAdminAdded extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a group admin added event.");
         form.addInstruction("Fill out this form to dispatch a group admin added event.");
@@ -133,15 +138,18 @@ public class GroupAdminAdded extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupAdminRemoved extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-admin-removed";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group admin removed";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -107,7 +111,8 @@ public class GroupAdminRemoved extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a group admin removed event.");
         form.addInstruction("Fill out this form to dispatch a group admin removed event.");
@@ -133,15 +138,18 @@ public class GroupAdminRemoved extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/GroupCreated.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupCreated extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-created";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group created";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -90,7 +94,8 @@ public class GroupCreated extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a group created event.");
         form.addInstruction("Fill out this form to dispatch a group created event.");
@@ -110,15 +115,18 @@ public class GroupCreated extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupDeleting extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-created";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group deleting";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -90,7 +94,8 @@ public class GroupDeleting extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a deleting group event.");
         form.addInstruction("Fill out this form to dispatch a deleting group event.");
@@ -110,15 +115,18 @@ public class GroupDeleting extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupMemberAdded extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-member-added";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group member added";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -107,7 +111,8 @@ public class GroupMemberAdded extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a group member added event.");
         form.addInstruction("Fill out this form to dispatch a group member added event.");
@@ -133,15 +138,18 @@ public class GroupMemberAdded extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupMemberRemoved extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-member-removed";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group member removed";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -107,7 +111,8 @@ public class GroupMemberRemoved extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a group member removed event.");
         form.addInstruction("Fill out this form to dispatch a group member removed event.");
@@ -133,15 +138,18 @@ public class GroupMemberRemoved extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/GroupModified.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class GroupModified extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#group-modified";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Group modified";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -139,7 +143,8 @@ public class GroupModified extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a group created event.");
         form.addInstruction("Fill out this form to dispatch a group created event.");
@@ -181,15 +186,18 @@ public class GroupModified extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/UserCreated.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class UserCreated extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#user-created";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "User created";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -91,7 +95,8 @@ public class UserCreated extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a user created event.");
         form.addInstruction("Fill out this form to dispatch a user created event.");
@@ -111,15 +116,18 @@ public class UserCreated extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/UserDeleting.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class UserDeleting extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#user-deleting";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Deleting a User";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -88,7 +92,8 @@ public class UserDeleting extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a user deleting event.");
         form.addInstruction("Fill out this form to dispatch a user deleting event.");
@@ -108,15 +113,18 @@ public class UserDeleting extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/UserModified.java

@@ -43,19 +43,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class UserModified extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#user-modified";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "User modified";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -143,7 +147,8 @@ public class UserModified extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a user updated event.");
         form.addInstruction("Fill out this form to dispatch a user updated event.");
@@ -187,15 +192,18 @@ public class UserModified extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/VCardCreated.java

@@ -40,19 +40,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class VCardCreated extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#vcard-created";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "VCard created";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -85,7 +89,8 @@ public class VCardCreated extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a vCard created event.");
         form.addInstruction("Fill out this form to dispatch a vCard created event.");
@@ -105,15 +110,18 @@ public class VCardCreated extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java

@@ -40,19 +40,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class VCardDeleting extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#vcard-deleting";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "Deleting a VCard";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -85,7 +89,8 @@ public class VCardDeleting extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a vCard deleting event.");
         form.addInstruction("Fill out this form to dispatch a vCard deleting event.");
@@ -105,15 +110,18 @@ public class VCardDeleting extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/commands/event/VCardModified.java

@@ -40,19 +40,23 @@ import java.util.Map;
  * @author Gabriel Guarincerri
  */
 public class VCardModified extends AdHocCommand {
-    public String getCode() {
+    @Override
+	public String getCode() {
         return "http://jabber.org/protocol/event#vcard-modified";
     }
 
-    public String getDefaultLabel() {
+    @Override
+	public String getDefaultLabel() {
         return "VCard modified";
     }
 
-    public int getMaxStages(SessionData data) {
+    @Override
+	public int getMaxStages(SessionData data) {
         return 1;
     }
 
-    public void execute(SessionData sessionData, Element command) {
+    @Override
+	public void execute(SessionData sessionData, Element command) {
         Element note = command.addElement("note");
 
         Map<String, List<String>> data = sessionData.getData();
@@ -85,7 +89,8 @@ public class VCardModified extends AdHocCommand {
         note.setText("Operation finished successfully");
     }
 
-    protected void addStageInformation(SessionData data, Element command) {
+    @Override
+	protected void addStageInformation(SessionData data, Element command) {
         DataForm form = new DataForm(DataForm.Type.form);
         form.setTitle("Dispatching a vCard updated event.");
         form.addInstruction("Fill out this form to dispatch a vCard updated event.");
@@ -105,15 +110,18 @@ public class VCardModified extends AdHocCommand {
         command.add(form.getElement());
     }
 
-    protected List<Action> getActions(SessionData data) {
+    @Override
+	protected List<Action> getActions(SessionData data) {
         return Arrays.asList(Action.complete);
     }
 
-    protected Action getExecuteAction(SessionData data) {
+    @Override
+	protected Action getExecuteAction(SessionData data) {
         return Action.complete;
     }
 
-    public boolean hasPermission(JID requester) {
+    @Override
+	public boolean hasPermission(JID requester) {
         return super.hasPermission(requester) || InternalComponentManager.getInstance().hasComponent(requester);
     }
 }
\ No newline at end of file

src/java/org/jivesoftware/openfire/component/InternalComponentManager.java

@@ -97,12 +97,14 @@ public class InternalComponentManager extends BasicModule implements ComponentMa
         return instance;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         routingTable = server.getRoutingTable();
     }
 
-    public void start() {
+    @Override
+	public void start() {
         // Set this ComponentManager as the current component manager
         ComponentManagerFactory.setComponentManager(instance);
 
@@ -116,7 +118,8 @@ public class InternalComponentManager extends BasicModule implements ComponentMa
         }
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
         if (getAddress() != null) {
             // Remove the route to this service

src/java/org/jivesoftware/openfire/container/PluginIconServlet.java

@@ -41,11 +41,13 @@ import java.io.OutputStream;
  */
 public class PluginIconServlet extends HttpServlet {
 
-    public void init(ServletConfig config) throws ServletException {
+    @Override
+	public void init(ServletConfig config) throws ServletException {
         super.init(config);
     }
 
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    @Override
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         String pluginName = ParamUtils.getParameter(request, "plugin");
         PluginManager pluginManager = XMPPServer.getInstance().getPluginManager();
         Plugin plugin = pluginManager.getPlugin(pluginName);

src/java/org/jivesoftware/openfire/container/PluginServlet.java

@@ -82,12 +82,14 @@ public class PluginServlet extends HttpServlet {
         servlets = new ConcurrentHashMap<String, GenericServlet>();
     }
 
-    public void init(ServletConfig config) throws ServletException {
+    @Override
+	public void init(ServletConfig config) throws ServletException {
         super.init(config);
         servletConfig = config;
     }
 
-    public void service(HttpServletRequest request, HttpServletResponse response)
+    @Override
+	public void service(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
         String pathInfo = request.getPathInfo();
         if (pathInfo == null) {

src/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java

@@ -96,11 +96,13 @@ public class IQDiscoInfoHandler extends IQHandler implements ClusterEventListene
         userFeatures.add(NAMESPACE_DISCO_INFO);
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
-    public IQ handleIQ(IQ packet) {
+    @Override
+	public IQ handleIQ(IQ packet) {
         // Create a copy of the sent pack that will be used as the reply
         // we only need to add the requested info to the reply if any otherwise add 
         // a not found error
@@ -312,7 +314,8 @@ public class IQDiscoInfoHandler extends IQHandler implements ClusterEventListene
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         serverFeatures = CacheFactory.createCache("Disco Server Features");
         addServerFeature(NAMESPACE_DISCO_INFO);

src/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java

@@ -91,11 +91,13 @@ public class IQDiscoItemsHandler extends IQHandler implements ServerFeaturesProv
         info = new IQHandlerInfo("query", NAMESPACE_DISCO_ITEMS);
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
-    public IQ handleIQ(IQ packet) {
+    @Override
+	public IQ handleIQ(IQ packet) {
         // Create a copy of the sent pack that will be used as the reply
         // we only need to add the requested items to the reply if any otherwise add 
         // a not found error
@@ -389,7 +391,8 @@ public class IQDiscoItemsHandler extends IQHandler implements ServerFeaturesProv
         localServerItems.remove(jid);
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         serverItems = CacheFactory.createCache("Disco Server Items");
         // Track the implementors of ServerItemsProvider so that we can collect the items
@@ -400,7 +403,8 @@ public class IQDiscoItemsHandler extends IQHandler implements ServerFeaturesProv
         ClusterManager.addListener(this);
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         for (ServerItemsProvider provider : XMPPServer.getInstance().getServerItemsProviders()) {
             addServerItemsProvider(provider);

src/java/org/jivesoftware/openfire/filetransfer/FileTransferRejectedException.java

@@ -57,21 +57,24 @@ public class FileTransferRejectedException extends Exception {
         this.nestedThrowable = nestedThrowable;
     }
 
-    public void printStackTrace() {
+    @Override
+	public void printStackTrace() {
         super.printStackTrace();
         if (nestedThrowable != null) {
             nestedThrowable.printStackTrace();
         }
     }
 
-    public void printStackTrace(PrintStream ps) {
+    @Override
+	public void printStackTrace(PrintStream ps) {
         super.printStackTrace(ps);
         if (nestedThrowable != null) {
             nestedThrowable.printStackTrace(ps);
         }
     }
 
-    public void printStackTrace(PrintWriter pw) {
+    @Override
+	public void printStackTrace(PrintWriter pw) {
         super.printStackTrace(pw);
         if (nestedThrowable != null) {
             nestedThrowable.printStackTrace(pw);

src/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java

@@ -169,7 +169,8 @@ public class FileTransferProxy extends BasicModule
         return info;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
 
         proxyServiceName = JiveGlobals.getProperty("xmpp.proxy.service", "proxy");
@@ -206,7 +207,8 @@ public class FileTransferProxy extends BasicModule
         return server.getFileTransferManager();
     }
 
-    public void start() {
+    @Override
+	public void start() {
         super.start();
 
         if (isEnabled()) {
@@ -225,7 +227,8 @@ public class FileTransferProxy extends BasicModule
         server.getIQDiscoItemsHandler().addServerItemsProvider(this);
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
 
         XMPPServer.getInstance().getIQDiscoItemsHandler()
@@ -234,7 +237,8 @@ public class FileTransferProxy extends BasicModule
         connectionManager.disable();
     }
 
-    public void destroy() {
+    @Override
+	public void destroy() {
         super.destroy();
 
         connectionManager.shutdown();

src/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyOutputStream.java

@@ -34,7 +34,8 @@ public class ProxyOutputStream extends DataOutputStream {
         super(out);
     }
 
-    public synchronized void write(byte b[], int off, int len) throws IOException {
+    @Override
+	public synchronized void write(byte b[], int off, int len) throws IOException {
         super.write(b, off, len);
         amountTransfered.addAndGet(len);
     }

src/java/org/jivesoftware/openfire/forms/spi/XFormFieldImpl.java

@@ -217,7 +217,8 @@ public class XFormFieldImpl implements FormField {
         }
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         return "XFormFieldImpl " + Integer.toHexString(hashCode()) + " " + getVariable() + ">" + values
                 + " o: " + (options.isEmpty() ? "no options" : options.toString());
     }

src/java/org/jivesoftware/openfire/group/Group.java

@@ -275,7 +275,8 @@ public class Group implements Cacheable, Externalizable {
         }
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         return name;
     }
 
@@ -365,11 +366,13 @@ public class Group implements Cacheable, Externalizable {
         return size;
     }
 
-    public int hashCode() {
+    @Override
+	public int hashCode() {
         return name.hashCode();
     }
 
-    public boolean equals(Object object) {
+    @Override
+	public boolean equals(Object object) {
         if (this == object) {
             return true;
         }
@@ -394,7 +397,8 @@ public class Group implements Cacheable, Externalizable {
             this.adminCollection = adminCollection;
         }
 
-        public Iterator<JID> iterator() {
+        @Override
+		public Iterator<JID> iterator() {
             return new Iterator<JID>() {
 
                 Iterator<JID> iter = users.iterator();
@@ -439,11 +443,13 @@ public class Group implements Cacheable, Externalizable {
             };
         }
 
-        public int size() {
+        @Override
+		public int size() {
             return users.size();
         }
 
-        public boolean add(Object member) {
+        @Override
+		public boolean add(Object member) {
             // Do nothing if the provider is read-only.
             if (provider.isReadOnly()) {
                 return false;
@@ -513,7 +519,8 @@ public class Group implements Cacheable, Externalizable {
      */
     private class PropertiesMap extends AbstractMap {
 
-        public Object put(Object key, Object value) {
+        @Override
+		public Object put(Object key, Object value) {
             if (key == null || value == null) {
                 throw new NullPointerException();
             }
@@ -549,7 +556,8 @@ public class Group implements Cacheable, Externalizable {
             return answer;
         }
 
-        public Set<Entry> entrySet() {
+        @Override
+		public Set<Entry> entrySet() {
             return new PropertiesEntrySet();
         }
     }
@@ -559,11 +567,13 @@ public class Group implements Cacheable, Externalizable {
      */
     private class PropertiesEntrySet extends AbstractSet {
 
-        public int size() {
+        @Override
+		public int size() {
             return properties.entrySet().size();
         }
 
-        public Iterator iterator() {
+        @Override
+		public Iterator iterator() {
             return new Iterator() {
 
                 Iterator iter = properties.entrySet().iterator();

src/java/org/jivesoftware/openfire/group/GroupCollection.java

@@ -49,11 +49,13 @@ public class GroupCollection extends AbstractCollection {
         this.elements = elements;
     }
 
-    public Iterator iterator() {
+    @Override
+	public Iterator iterator() {
         return new UserIterator();
     }
 
-    public int size() {
+    @Override
+	public int size() {
         return elements.length;
     }
 

src/java/org/jivesoftware/openfire/handler/IQAuthHandler.java

@@ -107,7 +107,8 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
         anonymousAllowed = JiveGlobals.getBooleanProperty("xmpp.auth.anonymous");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
         JID from = packet.getFrom();
         LocalClientSession session = (LocalClientSession) sessionManager.getSession(from);
         // If no session was found then answer an error (if possible)
@@ -388,7 +389,8 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
         JiveGlobals.setProperty("xmpp.auth.anonymous", Boolean.toString(anonymousAllowed));
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         userManager = server.getUserManager();
         routingTable = server.getRoutingTable();
@@ -396,7 +398,8 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
         serverName = server.getServerInfo().getXMPPDomain();
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 }

src/java/org/jivesoftware/openfire/handler/IQBindHandler.java

@@ -64,7 +64,8 @@ public class IQBindHandler extends IQHandler {
         info = new IQHandlerInfo("bind", "urn:ietf:params:xml:ns:xmpp-bind");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         LocalClientSession session = (LocalClientSession) sessionManager.getSession(packet.getFrom());
         // If no session was found then answer an error (if possible)
         if (session == null) {
@@ -161,13 +162,15 @@ public class IQBindHandler extends IQHandler {
         return null;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         routingTable = server.getRoutingTable();
         serverName = server.getServerInfo().getXMPPDomain();
      }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 }

src/java/org/jivesoftware/openfire/handler/IQHandler.java

@@ -114,7 +114,8 @@ public abstract class IQHandler extends BasicModule implements ChannelHandler {
      */
     public abstract IQHandlerInfo getInfo();
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         deliverer = server.getPacketDeliverer();
         sessionManager = server.getSessionManager();

src/java/org/jivesoftware/openfire/handler/IQLastActivityHandler.java

@@ -52,7 +52,8 @@ public class IQLastActivityHandler extends IQHandler implements ServerFeaturesPr
         info = new IQHandlerInfo("query", "jabber:iq:last");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         IQ reply = IQ.createResultIQ(packet);
         Element lastActivity = reply.setChildElement("query", "jabber:iq:last");
         String sender = packet.getFrom().getNode();
@@ -99,7 +100,8 @@ public class IQLastActivityHandler extends IQHandler implements ServerFeaturesPr
         return reply;
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
@@ -109,7 +111,8 @@ public class IQLastActivityHandler extends IQHandler implements ServerFeaturesPr
         return features.iterator();
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         presenceManager = server.getPresenceManager();
         rosterManager = server.getRosterManager();

src/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java

@@ -83,7 +83,8 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         IQ reply = IQ.createResultIQ(packet);
         Element offlineRequest = packet.getChildElement();
 
@@ -137,7 +138,8 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
         routingTable.routePacket(receipient, offlineMessage, true);
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
@@ -195,7 +197,8 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
         return answer.iterator();
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         infoHandler = server.getIQDiscoInfoHandler();
         itemsHandler = server.getIQDiscoItemsHandler();
@@ -204,13 +207,15 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
         routingTable = server.getRoutingTable();
     }
 
-    public void start() throws IllegalStateException {
+    @Override
+	public void start() throws IllegalStateException {
         super.start();
         infoHandler.setServerNodeInfoProvider(NAMESPACE, this);
         itemsHandler.setServerNodeInfoProvider(NAMESPACE, this);
     }
 
-    public void stop() {
+    @Override
+	public void stop() {
         super.stop();
         infoHandler.removeServerNodeInfoProvider(NAMESPACE);
         itemsHandler.removeServerNodeInfoProvider(NAMESPACE);

src/java/org/jivesoftware/openfire/handler/IQPrivacyHandler.java

@@ -58,7 +58,8 @@ public class IQPrivacyHandler extends IQHandler
         info = new IQHandlerInfo("query", "jabber:iq:privacy");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         IQ.Type type = packet.getType();
         JID from = packet.getFrom();
         if (from.getNode() == null || !UserManager.getInstance().isRegisteredUser(from.getNode())) {
@@ -409,7 +410,8 @@ public class IQPrivacyHandler extends IQHandler
         return result;
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
@@ -432,7 +434,8 @@ public class IQPrivacyHandler extends IQHandler
         //Do nothing
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
     }
 }

src/java/org/jivesoftware/openfire/handler/IQPrivateHandler.java

@@ -69,7 +69,8 @@ public class IQPrivateHandler extends IQHandler implements ServerFeaturesProvide
         info = new IQHandlerInfo("query", "jabber:iq:private");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
         IQ replyPacket;
         Element child = packet.getChildElement();
         Element dataElement = (Element) child.elementIterator().next();
@@ -97,12 +98,14 @@ public class IQPrivateHandler extends IQHandler implements ServerFeaturesProvide
         return replyPacket;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         privateStorage = server.getPrivateStorage();
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 

src/java/org/jivesoftware/openfire/handler/IQRegisterHandler.java

@@ -99,7 +99,8 @@ public class IQRegisterHandler extends IQHandler implements ServerFeaturesProvid
         info = new IQHandlerInfo("query", "jabber:iq:register");
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         userManager = server.getUserManager();
         rosterManager = server.getRosterManager();
@@ -162,7 +163,8 @@ public class IQRegisterHandler extends IQHandler implements ServerFeaturesProvid
         canChangePassword = JiveGlobals.getBooleanProperty("register.password", true);
     }
 
-    public IQ handleIQ(IQ packet) throws PacketException, UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws PacketException, UnauthorizedException {
         ClientSession session = sessionManager.getSession(packet.getFrom());
         IQ reply = null;
         // If no session was found then answer an error (if possible)
@@ -461,7 +463,8 @@ public class IQRegisterHandler extends IQHandler implements ServerFeaturesProvid
         JiveGlobals.setProperty("register.password", canChangePassword ? "true" : "false");
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 

src/java/org/jivesoftware/openfire/handler/IQRosterHandler.java

@@ -108,7 +108,8 @@ public class IQRosterHandler extends IQHandler implements ServerFeaturesProvider
      * @param packet The update packet
      * @return The reply or null if no reply
      */
-    public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
         try {
             IQ returnPacket = null;
             org.xmpp.packet.Roster roster = (org.xmpp.packet.Roster)packet;
@@ -307,14 +308,16 @@ public class IQRosterHandler extends IQHandler implements ServerFeaturesProvider
         return response;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         localServer = server;
         userManager = server.getUserManager();
         router = server.getPacketRouter();
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 

src/java/org/jivesoftware/openfire/handler/IQSessionEstablishmentHandler.java

@@ -44,14 +44,16 @@ public class IQSessionEstablishmentHandler extends IQHandler {
         info = new IQHandlerInfo("session", "urn:ietf:params:xml:ns:xmpp-session");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         // Just answer that the session has been activated
         IQ reply = IQ.createResultIQ(packet);
         reply.setChildElement(packet.getChildElement().createCopy());
         return reply;
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 }

src/java/org/jivesoftware/openfire/handler/IQSharedGroupHandler.java

@@ -45,7 +45,8 @@ public class IQSharedGroupHandler extends IQHandler {
         info = new IQHandlerInfo("sharedgroup", "http://www.jivesoftware.org/protocol/sharedgroup");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException {
         IQ result = IQ.createResultIQ(packet);
         String username = packet.getFrom().getNode();
         if (!serverName.equals(packet.getFrom().getDomain()) || username == null) {
@@ -69,11 +70,13 @@ public class IQSharedGroupHandler extends IQHandler {
         return result;
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         serverName = server.getServerInfo().getXMPPDomain();
         rosterManager = server.getRosterManager();

src/java/org/jivesoftware/openfire/handler/IQTimeHandler.java

@@ -76,7 +76,8 @@ public class IQTimeHandler extends IQHandler implements ServerFeaturesProvider {
         responseElement.addElement("display");
     }
 
-    public IQ handleIQ(IQ packet) {
+    @Override
+	public IQ handleIQ(IQ packet) {
         IQ response = null;
         response = IQ.createResultIQ(packet);
         response.setChildElement(buildResponse());
@@ -97,7 +98,8 @@ public class IQTimeHandler extends IQHandler implements ServerFeaturesProvider {
         return response;
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 

src/java/org/jivesoftware/openfire/handler/IQVersionHandler.java

@@ -57,7 +57,8 @@ public class IQVersionHandler extends IQHandler implements ServerFeaturesProvide
         }
     }
 
-    public IQ handleIQ(IQ packet) throws PacketException {
+    @Override
+	public IQ handleIQ(IQ packet) throws PacketException {
         if (IQ.Type.get == packet.getType()) {
             // Could cache this information for every server we see
             Element answerElement = bodyElement.createCopy();
@@ -77,7 +78,8 @@ public class IQVersionHandler extends IQHandler implements ServerFeaturesProvide
         return null;
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 

src/java/org/jivesoftware/openfire/handler/IQvCardHandler.java

@@ -83,7 +83,8 @@ public class IQvCardHandler extends IQHandler {
         info = new IQHandlerInfo("vCard", "vcard-temp");
     }
 
-    public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
+    @Override
+	public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
         IQ result = IQ.createResultIQ(packet);
         IQ.Type type = packet.getType();
         if (type.equals(IQ.Type.set)) {
@@ -151,13 +152,15 @@ public class IQvCardHandler extends IQHandler {
         return result;
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         this.server = server;
         userManager = server.getUserManager();
     }
 
-    public IQHandlerInfo getInfo() {
+    @Override
+	public IQHandlerInfo getInfo() {
         return info;
     }
 }

src/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java

@@ -487,7 +487,8 @@ public class PresenceSubscribeHandler extends BasicModule implements ChannelHand
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         localServer = server;
         serverName = server.getServerInfo().getXMPPDomain();

src/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java

@@ -530,7 +530,8 @@ public class PresenceUpdateHandler extends BasicModule implements ChannelHandler
         }
     }
 
-    public void initialize(XMPPServer server) {
+    @Override
+	public void initialize(XMPPServer server) {
         super.initialize(server);
         localServer = server;
         rosterManager = server.getRosterManager();

src/java/org/jivesoftware/openfire/http/HttpSession.java

@@ -86,7 +86,8 @@ public class HttpSession extends LocalClientSession {
         }
         // Create xmpp parser to keep in each thread
         localParser = new ThreadLocal<XMPPPacketReader>() {
-            protected XMPPPacketReader initialValue() {
+            @Override
+			protected XMPPPacketReader initialValue() {
                 XMPPPacketReader parser = new XMPPPacketReader();
                 factory.setNamespaceAware(true);
                 parser.setXPPFactory(factory);
@@ -174,7 +175,8 @@ public class HttpSession extends LocalClientSession {
         return elements;
     }
 
-    public String getAvailableStreamFeatures() {
+    @Override
+	public String getAvailableStreamFeatures() {
         StringBuilder sb = new StringBuilder(200);
         for (Element element : getAvailableStreamFeaturesElements()) {
             sb.append(element.asXML());
@@ -186,7 +188,8 @@ public class HttpSession extends LocalClientSession {
      * Closes the session. After a session has been closed it will no longer accept new connections
      * on the session ID.
      */
-    public void close() {
+    @Override
+	public void close() {
         if (isClosed) {
             return;
         }
@@ -198,7 +201,8 @@ public class HttpSession extends LocalClientSession {
      *
      * @return true if this session has been closed and no longer activley accepting connections.
      */
-    public synchronized boolean isClosed() {
+    @Override
+	public synchronized boolean isClosed() {
         return isClosed;
     }
 
@@ -340,7 +344,8 @@ public class HttpSession extends LocalClientSession {
      * @return true if all connections on this session should be secured, and false if they should
      *         not.
      */
-    public boolean isSecure() {
+    @Override
+	public boolean isSecure() {
         return isSecure;
     }
 
@@ -982,7 +987,8 @@ public class HttpSession extends LocalClientSession {
             this.address = address;
         }
 
-        public void closeVirtualConnection() {
+        @Override
+		public void closeVirtualConnection() {
             ((HttpSession) session).closeConnection();
         }
 
@@ -1010,7 +1016,8 @@ public class HttpSession extends LocalClientSession {
             ((HttpSession) session).deliver(text);
         }
 
-        public Certificate[] getPeerCertificates() {
+        @Override
+		public Certificate[] getPeerCertificates() {
             return ((HttpSession) session).getPeerCertificates();
         }
     }

src/java/org/jivesoftware/openfire/http/HttpSessionManager.java

@@ -363,7 +363,8 @@ public class HttpSessionManager {
 
     private class HttpSessionReaper extends TimerTask {
 
-        public void run() {
+        @Override
+		public void run() {
             long currentTime = System.currentTimeMillis();
             for (HttpSession session : sessionMap.values()) {
                 long lastActive = currentTime - session.getLastActivity();

src/java/org/jivesoftware/openfire/http/ResourceServlet.java

@@ -44,14 +44,16 @@ public class ResourceServlet extends HttpServlet {
     private boolean disableCompression = false;
     private static Cache<String, byte[]> cache = CacheFactory.createCache("Javascript Cache");
 
-    public void init(ServletConfig config) throws ServletException {
+    @Override
+	public void init(ServletConfig config) throws ServletException {
         super.init(config);
 
         debug = Boolean.valueOf(config.getInitParameter("debug"));
         disableCompression = Boolean.valueOf(config.getInitParameter("disableCompression"));
     }
 
-    public void service(HttpServletRequest request, HttpServletResponse response) {
+    @Override
+	public void service(HttpServletRequest request, HttpServletResponse response) {
         boolean compress = false;
 
         boolean javascript = request.getRequestURI().endsWith("scripts/");