Author: mgrigorov
Date: Tue May 3 17:39:08 2011
New Revision: 1099151
URL: http://svn.apache.org/viewvc?rev=1099151&view=rev
Log:
Javadoc fixes, minor non-functional changes.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java?rev=1099151&r1=1099150&r2=1099151&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
Tue May 3 17:39:08 2011
@@ -36,7 +36,7 @@ public class PersistentPageManager exten
* A cache that holds all registered page managers. <br/>
* applicationName -> page manager
*/
- private static ConcurrentMap<String, PersistentPageManager> managers =
new ConcurrentHashMap<String, PersistentPageManager>();
+ private static final ConcurrentMap<String, PersistentPageManager>
managers = new ConcurrentHashMap<String, PersistentPageManager>();
private final IPageStore pageStore;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java?rev=1099151&r1=1099150&r2=1099151&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java
Tue May 3 17:39:08 2011
@@ -75,7 +75,6 @@ public class DiskDataStore implements ID
this.fileStoreFolder = fileStoreFolder;
maxSizePerPageSession = maxSizePerSession;
-
try
{
fileChannelPool = new
FileChannelPool(fileChannelPoolCapacity);
@@ -86,9 +85,8 @@ public class DiskDataStore implements ID
catch (SecurityException e)
{
throw new WicketRuntimeException(
- // TODO improve the message by explaining where
in the API the disk store can be
- // changed
- "SecurityException occurred while creating
DiskDataStore. Consider using a non-disk based IDataStore implementation.",
+ "SecurityException occurred while creating
DiskDataStore. Consider using a non-disk based IDataStore implementation. "
+ + "See
org.apache.wicket.Application.setPageManagerProvider(IPageManagerProvider)",
e);
}
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java?rev=1099151&r1=1099150&r2=1099151&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/pageStore/FileChannelPool.java
Tue May 3 17:39:08 2011
@@ -35,7 +35,8 @@ import org.slf4j.LoggerFactory;
* Thread safe pool of {@link FileChannel} objects.
* <p>
* Opening and closing file is an expensive operation and under certain
circumstances this can
- * significantly harm performances, because on every close the file system
cache might be flushed.
+ * significantly harm the performance, because on every close the file system
cache might be
+ * flushed.
* <p>
* To minimize the negative impact opened files can be pooled, which is a
responsibility of
* {@link FileChannelPool} class.
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
* {@link FileChannelPool} allows to specify maximum number of opened {@link
FileChannel}s.
* <p>
* Note that under certain circumstances (when there are no empty slots in
pool) the initial
- * capacity can be exceeded (more files are opened then the specified capacity
is). If this happens,
+ * capacity can be exceeded (more files are opened than the specified capacity
is). If this happens,
* a warning is written to log, as this probably means that there is a problem
with page store.
*
* @author Matej Knopp