[hornetq-commits] JBoss hornetq SVN: r11472 - in trunk/hornetq-core/src/main/java/org/hornetq/core: paging/cursor/impl and 3 other directories.

Author: borges Date: 2011-10-05 12:42:40 -0400 (Wed, 05 Oct 2011) New Revision: 11472 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/RoutingContext.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java Log: Organize imports Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/AcceptorControlImpl.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -19,7 +19,6 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; -import org.hornetq.api.core.management.AddressControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.spi.core.remoting.Acceptor; Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/management/impl/QueueControlImpl.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -406,14 +405,14 @@ { while (iterator.hasNext()) { - MessageReference ref = (MessageReference)iterator.next(); + MessageReference ref = iterator.next(); if (filter == null || filter.match(ref.getMessage())) { Message message = ref.getMessage(); messages.add(message.toMap()); } } - return (Map<String, Object>[])messages.toArray(new Map[messages.size()]); + return messages.toArray(new Map[messages.size()]); } finally { @@ -465,7 +464,7 @@ int count = 0; while (iterator.hasNext()) { - MessageReference ref = (MessageReference)iterator.next(); + MessageReference ref = iterator.next(); if (filter.match(ref.getMessage())) { count++; Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PagePositionImpl.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -13,17 +13,12 @@ package org.hornetq.core.paging.cursor.impl; -import java.lang.ref.WeakReference; - -import org.hornetq.core.paging.cursor.PageCache; import org.hornetq.core.paging.cursor.PagePosition; /** * A PagePosition * * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * */ public class PagePositionImpl implements PagePosition { @@ -171,7 +166,5 @@ { return "PagePositionImpl [pageNr=" + pageNr + ", messageNr=" + messageNr + ", recordID=" + recordID + "]"; } - - } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -14,8 +14,6 @@ package org.hornetq.core.postoffice.impl; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -26,7 +24,6 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.DuplicateIDCache; import org.hornetq.core.server.MessageReference; -import org.hornetq.core.server.Queue; import org.hornetq.core.transaction.Transaction; import org.hornetq.core.transaction.TransactionOperation; Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/RoutingContext.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/RoutingContext.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/RoutingContext.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.core.transaction.Transaction; Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/RoutingContextImpl.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -15,11 +15,9 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.Queue; import org.hornetq.core.server.RouteContextList; @@ -37,7 +35,7 @@ { // The pair here is Durable and NonDurable - private Map<SimpleString, RouteContextList> map = new HashMap<SimpleString, RouteContextList>(); + private final Map<SimpleString, RouteContextList> map = new HashMap<SimpleString, RouteContextList>(); private Transaction transaction; @@ -121,9 +119,9 @@ private class ContextListing implements RouteContextList { - private List<Queue> durableQueue = new ArrayList<Queue>(1); + private final List<Queue> durableQueue = new ArrayList<Queue>(1); - private List<Queue> nonDurableQueue = new ArrayList<Queue>(1); + private final List<Queue> nonDurableQueue = new ArrayList<Queue>(1); public int getNumberOfQueues() { Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java 2011-10-05 16:42:19 UTC (rev 11471) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java 2011-10-05 16:42:40 UTC (rev 11472) @@ -17,7 +17,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -45,7 +44,7 @@ private final Object lockDelivery = new Object(); - private LinkedList<MessageReference> scheduledReferences = new LinkedList<MessageReference>(); + private final LinkedList<MessageReference> scheduledReferences = new LinkedList<MessageReference>(); public ScheduledDeliveryHandlerImpl(final ScheduledExecutorService scheduledExecutor) {