Author: pete
Date: Sat Nov 6 13:30:23 2010
New Revision: 1032050
URL: http://svn.apache.org/viewvc?rev=1032050&view=rev
Log:
cleanup wicket settings:
- removed field 'automaticMultiWindowSupport'
- fixed some broken javadoc
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java?rev=1032050&r1=1032049&r2=1032050&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IRequestCycleSettings.java
Sat Nov 6 13:30:23 2010
@@ -127,13 +127,13 @@ public interface IRequestCycleSettings
* instances of RequestCycle are created and processed.
* </p>
* <p>
- * Also, even with this strategy set, it is ignored for
- * {...@link BookmarkableListenerInterfaceRequestTarget}s,
because otherwise they wouldn't be
- * bookmarkable.
+ * Also, even with this strategy set, it is ignored for
instances of
+ * {...@link
org.apache.wicket.request.handler.BookmarkableListenerInterfaceRequestHandler},
+ * because otherwise they wouldn't be bookmarkable.
* </p>
*/
REDIRECT_TO_RENDER
- };
+ }
/**
* Adds a response filter to the list. Filters are evaluated in the
order they have been added.
@@ -285,8 +285,6 @@ public interface IRequestCycleSettings
void setTimeout(Duration timeout);
/**
- * @see
org.apache.wicket.settings.IExceptionSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.Settings.UnexpectedExceptionDisplay)
- *
* @param unexpectedExceptionDisplay
*/
void setUnexpectedExceptionDisplay(final UnexpectedExceptionDisplay
unexpectedExceptionDisplay);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=1032050&r1=1032049&r2=1032050&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
Sat Nov 6 13:30:23 2010
@@ -204,8 +204,6 @@ public interface IResourceSettings
List<IStringResourceLoader> getStringResourceLoaders();
/**
- * @see
org.apache.wicket.settings.IExceptionSettings#getThrowExceptionOnMissingResource()
- *
* @return boolean
*/
boolean getThrowExceptionOnMissingResource();
@@ -224,7 +222,7 @@ public interface IResourceSettings
* default cache duration in seconds
*
* @see org.apache.wicket.util.time.Duration#NONE
- * @see org.apache.wicket.protocol.http.RequestUtils#MAX_CACHE_DURATION
+ * @see org.apache.wicket.request.http.WebResponse#MAX_CACHE_DURATION
*/
void setDefaultCacheDuration(Duration defaultDuration);
@@ -297,8 +295,6 @@ public interface IResourceSettings
void setResourceWatcher(IModificationWatcher watcher);
/**
- * @see
org.apache.wicket.settings.IExceptionSettings#setThrowExceptionOnMissingResource(boolean)
- *
* @param throwExceptionOnMissingResource
*/
void setThrowExceptionOnMissingResource(final boolean
throwExceptionOnMissingResource);
@@ -349,8 +345,8 @@ public interface IResourceSettings
* Wicket-1992). In case you really need it, a good value for
placeholder would e.g. be "$up$".
* Resources additionally are protected by a
* {...@link org.apache.wicket.markup.html.IPackageResourceGuard
IPackageResourceGuard}
- * implementation such as {...@link
org.apache.wicket.resource.resourceGuard.PackageResourceGuard
- * PackageResourceGuard} which you may use or extend based on your
needs.
+ * implementation such as {...@link
org.apache.wicket.markup.html.PackageResourceGuard}
+ * which you may use or extend based on your needs.
*
* @see #getParentFolderPlaceholder()
*
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=1032050&r1=1032049&r2=1032050&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Sat Nov 6 13:30:23 2010
@@ -112,11 +112,6 @@ public final class Settings
/** Application default for automatically resolving hrefs */
private boolean automaticLinking = false;
- /**
- * Whether Wicket should try to support multiple windows transparently,
true by default.
- */
- private boolean automaticMultiWindowSupport = true;
-
/** True if the response should be buffered */
private boolean bufferResponse = true;
@@ -296,7 +291,7 @@ public final class Settings
*
* @TODO Remove in 1.5
*/
- private final boolean stripJavascriptCommentsAndWhitespace = false;
+ //private final boolean stripJavascriptCommentsAndWhitespace = false;
/** The Javascript compressor */
private IJavascriptCompressor javascriptCompressor;
@@ -374,7 +369,7 @@ public final class Settings
}
/**
- * @see
org.apache.wicket.settings.IRequestCycleSettings#addResponseFilter(org.apache.wicket.IResponseFilter)
+ * @see
org.apache.wicket.settings.IRequestCycleSettings#addResponseFilter(org.apache.wicket.response.filter.IResponseFilter)
*/
public void addResponseFilter(final IResponseFilter responseFilter)
{
@@ -971,7 +966,7 @@ public final class Settings
}
/**
- * @see
org.apache.wicket.settings.IRequestCycleSettings#setRenderStrategy(org.apache.wicket.settings.Settings.RenderStrategy)
+ * @see
org.apache.wicket.settings.IRequestCycleSettings#setRenderStrategy(org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy)
*/
public void setRenderStrategy(IRequestCycleSettings.RenderStrategy
renderStrategy)
{
@@ -1075,7 +1070,7 @@ public final class Settings
}
/**
- * @see
org.apache.wicket.settings.IRequestCycleSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.Settings.UnexpectedExceptionDisplay)
+ * @see
org.apache.wicket.settings.IRequestCycleSettings#setUnexpectedExceptionDisplay(org.apache.wicket.settings.IExceptionSettings.UnexpectedExceptionDisplay)
*/
public void setUnexpectedExceptionDisplay(
final UnexpectedExceptionDisplay unexpectedExceptionDisplay)
@@ -1282,7 +1277,7 @@ public final class Settings
}
/**
- * @see
org.apache.wicket.settings.IResourceSettings#setParentFolderPlaceholder(CharSequence)
+ * @see
org.apache.wicket.settings.IResourceSettings#setParentFolderPlaceholder(String)
*/
public void setParentFolderPlaceholder(final String sequence)
{
@@ -1296,7 +1291,7 @@ public final class Settings
return outputComponentPath;
}
- /** @see IDebugSettings#setOutputComponentPath() */
+ /** @see IDebugSettings#setOutputComponentPath(boolean) */
public void setOutputComponentPath(boolean outputComponentPath)
{
this.outputComponentPath = outputComponentPath;
