[jboss-cvs] JBoss Messaging SVN: r5527 - in trunk/src/main/org/jboss/messaging/core/postoffice: impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-12-12 16:54:32 -0500 (Fri, 12 Dec 2008)
New Revision: 5527

Modified:
   trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
   trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
Log:
cosmetic auto format & adding missing final in a method

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java	2008-12-12 20:12:26 UTC (rev 5526)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java	2008-12-12 21:54:32 UTC (rev 5527)
@@ -18,7 +18,7 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
+ */
 
 package org.jboss.messaging.core.postoffice;
 
@@ -55,41 +55,45 @@
  *
  */
 public interface PostOffice extends MessagingComponent
-{   
+{
    boolean addDestination(SimpleString address, boolean durable) throws Exception;
-   
+
    boolean removeDestination(SimpleString address, boolean durable) throws Exception;
-   
+
    boolean containsDestination(SimpleString address);
 
-   Binding addBinding(SimpleString address, SimpleString queueName, Filter filter,
-                      boolean durable, boolean temporary, boolean fanout) throws Exception;
-   
+   Binding addBinding(SimpleString address,
+                      SimpleString queueName,
+                      Filter filter,
+                      boolean durable,
+                      boolean temporary,
+                      boolean fanout) throws Exception;
+
    Binding removeBinding(SimpleString queueName) throws Exception;
-   
+
    List<Binding> getBindingsForAddress(SimpleString address) throws Exception;
-   
+
    Binding getBinding(SimpleString queueName);
-      
+
    /** Deliver references previously routed */
    void deliver(List<MessageReference> references);
 
    List<MessageReference> route(ServerMessage message) throws Exception;
 
-   //For testing only
+   // For testing only
    Map<SimpleString, List<Binding>> getMappings();
 
    Set<SimpleString> listAllDestinations();
-   
+
    List<Queue> activate();
-   
+
    PagingManager getPagingManager();
-   
+
    SendLock getAddressLock(SimpleString address);
-   
+
    DuplicateIDCache getDuplicateIDCache(SimpleString address);
-   
-   void scheduleReferences(long scheduledDeliveryTime,  List<MessageReference> references) throws Exception;
-   
-   void scheduleReferences( long transactionID,  long scheduledDeliveryTime,  List<MessageReference> references) throws Exception;
+
+   void scheduleReferences(long scheduledDeliveryTime, List<MessageReference> references) throws Exception;
+
+   void scheduleReferences(long transactionID, long scheduledDeliveryTime, List<MessageReference> references) throws Exception;
 }

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java	2008-12-12 20:12:26 UTC (rev 5526)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java	2008-12-12 21:54:32 UTC (rev 5527)
@@ -37,7 +37,6 @@
 import org.jboss.messaging.core.filter.Filter;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.management.ManagementService;
-import org.jboss.messaging.core.message.impl.MessageImpl;
 import org.jboss.messaging.core.paging.PagingManager;
 import org.jboss.messaging.core.paging.PagingStore;
 import org.jboss.messaging.core.persistence.StorageManager;
@@ -50,7 +49,6 @@
 import org.jboss.messaging.core.server.QueueFactory;
 import org.jboss.messaging.core.server.SendLock;
 import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.server.impl.MessageReferenceImpl;
 import org.jboss.messaging.core.server.impl.SendLockImpl;
 import org.jboss.messaging.core.settings.HierarchicalRepository;
 import org.jboss.messaging.core.settings.impl.QueueSettings;
@@ -325,7 +323,7 @@
          ref.getQueue().addLast(ref);
       }
    }
-   
+
    public List<MessageReference> route(final ServerMessage message) throws Exception
    {
       final PagingStore pagingStore = pagingManager.getPageStore(message.getDestination());
@@ -422,7 +420,7 @@
 
    public List<Queue> activate()
    {
-      this.backup = false;
+      backup = false;
 
       Map<SimpleString, Binding> nameMap = addressManager.getBindings();
 
@@ -457,7 +455,7 @@
       return lock;
    }
 
-   public DuplicateIDCache getDuplicateIDCache(SimpleString address)
+   public DuplicateIDCache getDuplicateIDCache(final SimpleString address)
    {
       DuplicateIDCache cache = duplicateIDCaches.get(address);
 
@@ -475,14 +473,15 @@
 
       return cache;
    }
-   
-   
+
    public void scheduleReferences(final long scheduledDeliveryTime, final List<MessageReference> references) throws Exception
    {
       scheduleReferences(-1, scheduledDeliveryTime, references);
    }
-   
-   public void scheduleReferences(final long transactionID, final long scheduledDeliveryTime, final List<MessageReference> references) throws Exception
+
+   public void scheduleReferences(final long transactionID,
+                                  final long scheduledDeliveryTime,
+                                  final List<MessageReference> references) throws Exception
    {
       for (MessageReference ref : references)
       {
@@ -501,7 +500,6 @@
          }
       }
    }
-   
 
    // Private -----------------------------------------------------------------
 
@@ -601,6 +599,7 @@
 
    private class MessageExpiryRunner extends Thread
    {
+      @Override
       public void run()
       {
          Map<SimpleString, Binding> nameMap = addressManager.getBindings();