Author: jdonnerstag
Date: Wed Apr 9 04:50:43 2008
New Revision: 646287
URL: http://svn.apache.org/viewvc?rev=646287&view=rev
Log:
generics
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java?rev=646287&r1=646286&r2=646287&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
Wed Apr 9 04:50:43 2008
@@ -33,5 +33,5 @@
* The partially constructed component (only the id is
guaranteed to be valid).
* @see org.apache.wicket.application.IComponentInstantiationListener
*/
- void onUnauthorizedInstantiation(Component component);
+ void onUnauthorizedInstantiation(Component< ? > component);
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java?rev=646287&r1=646286&r2=646287&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IApplicationSettings.java
Wed Apr 9 04:50:43 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.settings;
+import org.apache.wicket.Page;
import org.apache.wicket.application.IClassResolver;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.util.lang.Bytes;
@@ -43,7 +44,7 @@
* @return Returns the accessDeniedPage.
* @see IApplicationSettings#setAccessDeniedPage(Class)
*/
- Class getAccessDeniedPage();
+ Class< ? extends Page> getAccessDeniedPage();
/**
* Gets the default resolver to use when finding classes and resources
@@ -66,7 +67,7 @@
* @return Returns the internalErrorPage.
* @see IApplicationSettings#setInternalErrorPage(Class)
*/
- Class getInternalErrorPage();
+ Class< ? extends Page> getInternalErrorPage();
/**
* Gets the page expired page class.
@@ -74,7 +75,7 @@
* @return Returns the pageExpiredErrorPage.
* @see IApplicationSettings#setPageExpiredErrorPage(Class)
*/
- Class getPageExpiredErrorPage();
+ Class< ? extends Page> getPageExpiredErrorPage();
/**
* Sets the access denied page class. The class must be bookmarkable
and must extend Page.
@@ -82,7 +83,7 @@
* @param accessDeniedPage
* The accessDeniedPage to set.
*/
- void setAccessDeniedPage(final Class accessDeniedPage);
+ void setAccessDeniedPage(final Class< ? extends Page> accessDeniedPage);
/**
* Sets the default class resolver to use when finding classes and
resources
@@ -107,7 +108,7 @@
* @param internalErrorPage
* The internalErrorPage to set.
*/
- void setInternalErrorPage(final Class internalErrorPage);
+ void setInternalErrorPage(final Class< ? extends Page>
internalErrorPage);
/**
* Sets the page expired page class. The class must be bookmarkable and
must extend Page.
@@ -115,5 +116,5 @@
* @param pageExpiredErrorPage
* The pageExpiredErrorPage to set.
*/
- void setPageExpiredErrorPage(final Class pageExpiredErrorPage);
+ void setPageExpiredErrorPage(final Class< ? extends Page>
pageExpiredErrorPage);
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=646287&r1=646286&r2=646287&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
Wed Apr 9 04:50:43 2008
@@ -103,7 +103,7 @@
* </p>
*/
public static final IRequestCycleSettings.RenderStrategy
ONE_PASS_RENDER = new IRequestCycleSettings.RenderStrategy(
- "ONE_PASS_RENDER");
+ "ONE_PASS_RENDER");
/**
* All logical parts of a request (the action and render part) are
handled within the same
@@ -112,7 +112,7 @@
* render this request.
*/
public static final IRequestCycleSettings.RenderStrategy
REDIRECT_TO_BUFFER = new IRequestCycleSettings.RenderStrategy(
- "REDIRECT_BUFFER");
+ "REDIRECT_BUFFER");
/**
* The render part of a request (opposed to the 'action part' which is
either the construction
@@ -141,7 +141,7 @@
* </p>
*/
public static final IRequestCycleSettings.RenderStrategy
REDIRECT_TO_RENDER = new IRequestCycleSettings.RenderStrategy(
- "CLIENT_SIDE_REDIRECT");
+ "CLIENT_SIDE_REDIRECT");
/**
* Adds a response filter to the list. Filters are evaluated in the
order they have been added.
@@ -176,7 +176,7 @@
/**
* @return an unmodifiable list of added response filters, null if none
*/
- List getResponseFilters();
+ List<IResponseFilter> getResponseFilters();
/**
* In order to do proper form parameter decoding it is important that
the response and the
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=646287&r1=646286&r2=646287&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
Wed Apr 9 04:50:43 2008
@@ -104,6 +104,18 @@
void addStringResourceLoader(final IStringResourceLoader loader);
/**
+ * Add a string resource loader to the chain of loaders. If this is the
first call to this
+ * method since the creation of the application settings then the
existing chain is cleared
+ * before the new loader is added.
+ *
+ * @param index
+ * The position within the array to insert the loader
+ * @param loader
+ * The loader to be added
+ */
+ void addStringResourceLoader(final int index, final
IStringResourceLoader loader);
+
+ /**
* Whether to disable gzip compression for resources. You need this on
SAP, which gzips things
* twice.
*
@@ -174,7 +186,7 @@
/**
* @return an unmodifiable list of all available string resource loaders
*/
- List getStringResourceLoaders();
+ List<IStringResourceLoader> getStringResourceLoaders();
/**
* @see
org.apache.wicket.settings.IExceptionSettings#getThrowExceptionOnMissingResource()
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=646287&r1=646286&r2=646287&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Wed Apr 9 04:50:43 2008
@@ -49,6 +49,7 @@
import org.apache.wicket.resource.loader.ClassStringResourceLoader;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
import org.apache.wicket.resource.loader.IStringResourceLoader;
+import org.apache.wicket.resource.loader.PackageStringResourceLoader;
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.session.pagemap.IPageMapEvictionStrategy;
import org.apache.wicket.session.pagemap.LeastRecentlyAccessedEvictionStrategy;
@@ -92,7 +93,7 @@
IRequestLoggerSettings
{
/** Class of access denied page. */
- private WeakReference/* <Class<? extends Page> */accessDeniedPage;
+ private WeakReference<Class< ? extends Page>> accessDeniedPage;
/** ajax debug mode status */
private boolean ajaxDebugModeEnabled = false;
@@ -118,7 +119,7 @@
private IClassResolver classResolver = new DefaultClassResolver();
/** List of (static) ComponentResolvers */
- private final List componentResolvers = new ArrayList();
+ private final List<IComponentResolver> componentResolvers = new
ArrayList<IComponentResolver>();
/** True to check that each component on a page is used */
private boolean componentUseCheck = true;
@@ -160,7 +161,7 @@
private boolean gatherExtendedBrowserInfo = false;
/** Class of internal error page. */
- private WeakReference/* <Class<? extends Page> */internalErrorPage;
+ private WeakReference<Class< ? extends Page>> internalErrorPage;
/**
* whether wicket should track line precise additions of components for
error reporting.
@@ -188,16 +189,13 @@
private int maxPageMaps = 5;
/** Map to look up resource factories by name */
- private final Map nameToResourceFactory = new HashMap();
-
- /** True if string resource loaders have been overridden */
- private boolean overriddenStringResourceLoaders = false;
+ private final Map<String, IResourceFactory> nameToResourceFactory = new
HashMap<String, IResourceFactory>();
/** The package resource guard. */
private IPackageResourceGuard packageResourceGuard = new
PackageResourceGuard();
/** The error page displayed when an expired page is accessed. */
- private WeakReference/* <Class<? extends Page> */pageExpiredErrorPage;
+ private WeakReference<Class< ? extends Page>> pageExpiredErrorPage;
/** factory to create new Page objects */
private IPageFactory pageFactory = new DefaultPageFactory();
@@ -229,7 +227,7 @@
private ModificationWatcher resourceWatcher;
/** List of [EMAIL PROTECTED] IResponseFilter}s. */
- private List responseFilters;
+ private List<IResponseFilter> responseFilters;
/**
* In order to do proper form parameter decoding it is important that
the response and the
@@ -239,7 +237,8 @@
private String responseRequestEncoding = "UTF-8";
/** Chain of string resource loaders to use */
- private final List stringResourceLoaders = new ArrayList(4);
+ private final List<IStringResourceLoader> stringResourceLoaders = new
ArrayList<IStringResourceLoader>(
+ 4);
/** Should HTML comments be stripped during rendering? */
private boolean stripComments = false;
@@ -277,7 +276,7 @@
* @param component
* The partially constructed component (only the id
is guaranteed to be valid).
*/
- public void onUnauthorizedInstantiation(final Component
component)
+ public void onUnauthorizedInstantiation(final Component< ? >
component)
{
throw new
UnauthorizedInstantiationException(component.getClass());
}
@@ -310,6 +309,9 @@
private boolean addLastModifiedTimeToResourceReferenceUrl = false;
+ /** */
+ private Bytes defaultMaximumUploadSize = Bytes.MAX;
+
/**
* Create the application settings, carrying out any necessary
initializations.
*
@@ -320,6 +322,7 @@
{
this.application = application;
stringResourceLoaders.add(new ComponentStringResourceLoader());
+ stringResourceLoaders.add(new PackageStringResourceLoader());
stringResourceLoaders.add(new
ClassStringResourceLoader(this.application.getClass()));
}
@@ -363,11 +366,11 @@
/**
* @see
org.apache.wicket.settings.IRequestCycleSettings#addResponseFilter(org.apache.wicket.IResponseFilter)
*/
- public void addResponseFilter(IResponseFilter responseFilter)
+ public void addResponseFilter(final IResponseFilter responseFilter)
{
if (responseFilters == null)
{
- responseFilters = new ArrayList(3);
+ responseFilters = new ArrayList<IResponseFilter>(4);
}
responseFilters.add(responseFilter);
}
@@ -377,20 +380,23 @@
*/
public void addStringResourceLoader(final IStringResourceLoader loader)
{
- if (!overriddenStringResourceLoaders)
- {
- stringResourceLoaders.clear();
- overriddenStringResourceLoaders = true;
- }
stringResourceLoaders.add(loader);
}
/**
+ * @see
org.apache.wicket.settings.IResourceSettings#addStringResourceLoader(org.apache.wicket.resource.loader.IStringResourceLoader)
+ */
+ public void addStringResourceLoader(int index, final
IStringResourceLoader loader)
+ {
+ stringResourceLoaders.add(index, loader);
+ }
+
+ /**
* @see
org.apache.wicket.settings.IApplicationSettings#getAccessDeniedPage()
*/
- public Class getAccessDeniedPage()
+ public Class< ? extends Page> getAccessDeniedPage()
{
- return (Class)accessDeniedPage.get();
+ return accessDeniedPage.get();
}
/**
@@ -439,7 +445,7 @@
* @see AutoComponentResolver for an example
* @return List of ComponentResolvers
*/
- public List getComponentResolvers()
+ public List<IComponentResolver> getComponentResolvers()
{
return componentResolvers;
}
@@ -531,9 +537,9 @@
/**
* @see
org.apache.wicket.settings.IApplicationSettings#getInternalErrorPage()
*/
- public Class getInternalErrorPage()
+ public Class< ? extends Page> getInternalErrorPage()
{
- return (Class)internalErrorPage.get();
+ return internalErrorPage.get();
}
/**
@@ -587,9 +593,9 @@
/**
* @see
org.apache.wicket.settings.IApplicationSettings#getPageExpiredErrorPage()
*/
- public Class getPageExpiredErrorPage()
+ public Class< ? extends Page> getPageExpiredErrorPage()
{
- return (Class)pageExpiredErrorPage.get();
+ return pageExpiredErrorPage.get();
}
/**
@@ -633,7 +639,7 @@
*/
public IResourceFactory getResourceFactory(final String name)
{
- return (IResourceFactory)nameToResourceFactory.get(name);
+ return nameToResourceFactory.get(name);
}
/**
@@ -685,7 +691,7 @@
/**
* @see
org.apache.wicket.settings.IRequestCycleSettings#getResponseFilters()
*/
- public List getResponseFilters()
+ public List<IResponseFilter> getResponseFilters()
{
if (responseFilters == null)
{
@@ -708,9 +714,9 @@
/**
* @see
org.apache.wicket.settings.IResourceSettings#getStringResourceLoaders()
*/
- public List getStringResourceLoaders()
+ public List<IStringResourceLoader> getStringResourceLoaders()
{
- return Collections.unmodifiableList(stringResourceLoaders);
+ return stringResourceLoaders;
}
/**
@@ -811,7 +817,7 @@
/**
* @see
org.apache.wicket.settings.IApplicationSettings#setAccessDeniedPage(java.lang.Class)
*/
- public void setAccessDeniedPage(Class accessDeniedPage)
+ public void setAccessDeniedPage(Class< ? extends Page> accessDeniedPage)
{
if (accessDeniedPage == null)
{
@@ -819,7 +825,7 @@
}
checkPageClass(accessDeniedPage);
- this.accessDeniedPage = new WeakReference(accessDeniedPage);
+ this.accessDeniedPage = new WeakReference<Class< ? extends
Page>>(accessDeniedPage);
}
/**
@@ -962,7 +968,7 @@
/**
* @see
org.apache.wicket.settings.IApplicationSettings#setInternalErrorPage(java.lang.Class)
*/
- public void setInternalErrorPage(final Class internalErrorPage)
+ public void setInternalErrorPage(final Class< ? extends Page>
internalErrorPage)
{
if (internalErrorPage == null)
{
@@ -970,7 +976,7 @@
}
checkPageClass(internalErrorPage);
- this.internalErrorPage = new WeakReference(internalErrorPage);
+ this.internalErrorPage = new WeakReference<Class< ? extends
Page>>(internalErrorPage);
}
/**
@@ -1009,7 +1015,7 @@
/**
* @see
org.apache.wicket.settings.IApplicationSettings#setPageExpiredErrorPage(java.lang.Class)
*/
- public void setPageExpiredErrorPage(final Class pageExpiredErrorPage)
+ public void setPageExpiredErrorPage(final Class< ? extends Page>
pageExpiredErrorPage)
{
if (pageExpiredErrorPage == null)
{
@@ -1017,7 +1023,7 @@
}
checkPageClass(pageExpiredErrorPage);
- this.pageExpiredErrorPage = new
WeakReference(pageExpiredErrorPage);
+ this.pageExpiredErrorPage = new WeakReference<Class< ? extends
Page>>(pageExpiredErrorPage);
}
/**
@@ -1171,7 +1177,7 @@
* @param pageClass
* the page class to check
*/
- private void checkPageClass(final Class pageClass)
+ private void checkPageClass(final Class< ? extends Page> pageClass)
{
// NOTE: we can't really check on whether it is a bookmarkable
page
// here, as - though the default is that a bookmarkable page
must
@@ -1287,53 +1293,91 @@
this.markupCache = markupCache;
}
- private Bytes defaultMaximumUploadSize = Bytes.MAX;
-
+ /**
+ *
+ * @see
org.apache.wicket.settings.IApplicationSettings#getDefaultMaximumUploadSize()
+ */
public Bytes getDefaultMaximumUploadSize()
{
return defaultMaximumUploadSize;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IApplicationSettings#setDefaultMaximumUploadSize(org.apache.wicket.util.lang.Bytes)
+ */
public void setDefaultMaximumUploadSize(Bytes defaultMaximumUploadSize)
{
this.defaultMaximumUploadSize = defaultMaximumUploadSize;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.ISessionSettings#setPageIdUniquePerSession(boolean)
+ */
public void setPageIdUniquePerSession(boolean value)
{
pageIdUniquePerSession = value;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.ISessionSettings#isPageIdUniquePerSession()
+ */
public boolean isPageIdUniquePerSession()
{
return pageIdUniquePerSession;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IDebugSettings#isLinePreciseReportingOnAddComponentEnabled()
+ */
public boolean isLinePreciseReportingOnAddComponentEnabled()
{
return linePreciseReportingOnAddComponentEnabled;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IDebugSettings#isLinePreciseReportingOnNewComponentEnabled()
+ */
public boolean isLinePreciseReportingOnNewComponentEnabled()
{
return linePreciseReportingOnNewComponentEnabled;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IDebugSettings#setLinePreciseReportingOnAddComponentEnabled(boolean)
+ */
public void setLinePreciseReportingOnAddComponentEnabled(boolean enable)
{
linePreciseReportingOnAddComponentEnabled = enable;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IDebugSettings#setLinePreciseReportingOnNewComponentEnabled(boolean)
+ */
public void setLinePreciseReportingOnNewComponentEnabled(boolean enable)
{
linePreciseReportingOnNewComponentEnabled = enable;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IResourceSettings#setAddLastModifiedTimeToResourceReferenceUrl(boolean)
+ */
public void setAddLastModifiedTimeToResourceReferenceUrl(boolean value)
{
addLastModifiedTimeToResourceReferenceUrl = value;
}
+ /**
+ *
+ * @see
org.apache.wicket.settings.IResourceSettings#getAddLastModifiedTimeToResourceReferenceUrl()
+ */
public boolean getAddLastModifiedTimeToResourceReferenceUrl()
{
return addLastModifiedTimeToResourceReferenceUrl;
