Author: clebert.suconic(a)jboss.com Date: 2010-10-04 12:14:36 -0400 (Mon, 04 Oct 2010) New Revision: 9743 Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCache.java branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursor.java branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursorProvider.java branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PagePosition.java branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/StorageCursor.java branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/impl/PageCursorImpl.java Log: formatting Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCache.java =================================================================== --- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCache.java 2010-10-04 16:12:30 UTC (rev 9742) +++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCache.java 2010-10-04 16:14:36 UTC (rev 9743) @@ -26,9 +26,9 @@ public interface PageCache { Page getPage(); - + int getNumberOfMessages(); - + /** * * @param messageNumber The order of the message on the page Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursor.java =================================================================== --- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursor.java 2010-10-04 16:12:30 UTC (rev 9742) +++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursor.java 2010-10-04 16:14:36 UTC (rev 9743) @@ -25,12 +25,12 @@ */ public interface PageCursor { - + Pair<PagePosition, ServerMessage> moveNext() throws Exception; - + PagePosition getFirstPosition(); - + void ack(PagePosition position); - + void returnElement(PagePosition position); } Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursorProvider.java =================================================================== --- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursorProvider.java 2010-10-04 16:12:30 UTC (rev 9742) +++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PageCursorProvider.java 2010-10-04 16:14:36 UTC (rev 9743) @@ -14,7 +14,6 @@ package org.hornetq.core.paging.cursor; import org.hornetq.api.core.Pair; -import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.PagingStore; import org.hornetq.core.server.ServerMessage; @@ -31,24 +30,23 @@ // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- - + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- // Public -------------------------------------------------------- - - + PageCache getPageCache(long pageId) throws Exception; - + PagingStore getAssociatedStore(); - + PageCursor createCursor(); - - //PageCursor recoverCursor(PagePosition position); - - Pair<PagePosition,ServerMessage> getAfter(PagePosition pos) throws Exception; + // PageCursor recoverCursor(PagePosition position); + + Pair<PagePosition, ServerMessage> getAfter(PagePosition pos) throws Exception; + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PagePosition.java =================================================================== --- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PagePosition.java 2010-10-04 16:12:30 UTC (rev 9742) +++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/PagePosition.java 2010-10-04 16:14:36 UTC (rev 9743) @@ -22,7 +22,7 @@ */ public interface PagePosition extends Comparable<PagePosition> { - + long getRecordID(); // TODO: this belongs somewhere else @@ -31,9 +31,9 @@ long getPageNr(); int getMessageNr(); - + PagePosition nextMessage(); - + PagePosition nextPage(); - + } Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/StorageCursor.java =================================================================== --- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/StorageCursor.java 2010-10-04 16:12:30 UTC (rev 9742) +++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/StorageCursor.java 2010-10-04 16:14:36 UTC (rev 9743) @@ -24,5 +24,5 @@ */ public interface StorageCursor { - void storeCursorInitialPosition(PagePositionImpl position); + void storeCursorInitialPosition(PagePositionImpl position); } Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/impl/PageCursorImpl.java =================================================================== --- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/impl/PageCursorImpl.java 2010-10-04 16:12:30 UTC (rev 9742) +++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/cursor/impl/PageCursorImpl.java 2010-10-04 16:14:36 UTC (rev 9743) @@ -14,7 +14,6 @@ package org.hornetq.core.paging.cursor.impl; import org.hornetq.api.core.Pair; -import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.PagingStore; import org.hornetq.core.paging.cursor.PageCursor; import org.hornetq.core.paging.cursor.PageCursorProvider;