Author: mgrigorov
Date: Tue Dec 20 10:10:07 2011
New Revision: 1221180
URL: http://svn.apache.org/viewvc?rev=1221180&view=rev
Log:
WICKET-4304
Rename interface DataStoreEvictionStrategy to IDataStoreEvictionStrategy
Added:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/IDataStoreEvictionStrategy.java
(contents, props changed)
- copied, changed from r1221150,
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/DataStoreEvictionStrategy.java
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/DataStoreEvictionStrategy.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java?rev=1221180&r1=1221179&r2=1221180&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java
Tue Dec 20 10:10:07 2011
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
/**
* A {@link DataStore} which stores the pages in the {@link HttpSession}. Uses
- * {@link DataStoreEvictionStrategy} to keep the memory footprint reasonable.
+ * {@link IDataStoreEvictionStrategy} to keep the memory footprint reasonable.
*
* <p>
* Usage:
@@ -56,7 +56,7 @@ public class HttpSessionDataStore implem
private final IPageManagerContext pageManagerContext;
- private final DataStoreEvictionStrategy evictionStrategy;
+ private final IDataStoreEvictionStrategy evictionStrategy;
/**
* Construct.
@@ -65,7 +65,7 @@ public class HttpSessionDataStore implem
* @param evictionStrategy
*/
public HttpSessionDataStore(IPageManagerContext pageManagerContext,
- DataStoreEvictionStrategy evictionStrategy)
+ IDataStoreEvictionStrategy evictionStrategy)
{
this.pageManagerContext = pageManagerContext;
this.evictionStrategy = evictionStrategy;
Copied:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/IDataStoreEvictionStrategy.java
(from r1221150,
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/DataStoreEvictionStrategy.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/IDataStoreEvictionStrategy.java?p2=wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/IDataStoreEvictionStrategy.java&p1=wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/DataStoreEvictionStrategy.java&r1=1221150&r2=1221180&rev=1221180&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/DataStoreEvictionStrategy.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/IDataStoreEvictionStrategy.java
Tue Dec 20 10:10:07 2011
@@ -21,7 +21,7 @@ package org.apache.wicket.pageStore.memo
* An eviction strategy that decides whether the in-memory data structure used
as page store should
* be compacted
*/
-public interface DataStoreEvictionStrategy
+public interface IDataStoreEvictionStrategy
{
/**
Propchange:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/IDataStoreEvictionStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java?rev=1221180&r1=1221179&r2=1221180&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/MemorySizeEvictionStrategy.java
Tue Dec 20 10:10:07 2011
@@ -23,7 +23,7 @@ import org.apache.wicket.util.lang.Wicke
/**
* An eviction strategy that keeps the data store size up to configured bytes
*/
-public class MemorySizeEvictionStrategy implements DataStoreEvictionStrategy
+public class MemorySizeEvictionStrategy implements IDataStoreEvictionStrategy
{
private final Bytes maxBytes;
@@ -43,7 +43,7 @@ public class MemorySizeEvictionStrategy
/**
*
- * @see
org.apache.wicket.pageStore.memory.DataStoreEvictionStrategy#evict(org.apache.wicket.pageStore.memory.PageTable)
+ * @see
IDataStoreEvictionStrategy#evict(org.apache.wicket.pageStore.memory.PageTable)
*/
@Override
public void evict(PageTable pageTable)
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java?rev=1221180&r1=1221179&r2=1221180&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageNumberEvictionStrategy.java
Tue Dec 20 10:10:07 2011
@@ -21,7 +21,7 @@ package org.apache.wicket.pageStore.memo
* An eviction strategy which decides whether to evict entries from the
in-memory data store
* depending on the number of stored paged per session
*/
-public class PageNumberEvictionStrategy implements DataStoreEvictionStrategy
+public class PageNumberEvictionStrategy implements IDataStoreEvictionStrategy
{
private final int pagesNumber;
@@ -44,7 +44,7 @@ public class PageNumberEvictionStrategy
/**
*
- * @see
org.apache.wicket.pageStore.memory.DataStoreEvictionStrategy#evict(org.apache.wicket.pageStore.memory.PageTable)
+ * @see
IDataStoreEvictionStrategy#evict(org.apache.wicket.pageStore.memory.PageTable)
*/
@Override
public void evict(PageTable pageTable)
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java?rev=1221180&r1=1221179&r2=1221180&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/pageStore/memory/HttpSessionDataStoreTest.java
Tue Dec 20 10:10:07 2011
@@ -101,7 +101,7 @@ public class HttpSessionDataStoreTest ex
}
- private static final class NoopEvictionStrategy implements
DataStoreEvictionStrategy
+ private static final class NoopEvictionStrategy implements
IDataStoreEvictionStrategy
{
@Override