You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2007/03/03 10:19:06 UTC
svn commit: r514105 [1/2] - in /incubator/wicket/trunk/wicket/src:
main/java/wicket/ main/java/wicket/ajax/ main/java/wicket/ajax/form/
main/java/wicket/application/ main/java/wicket/behavior/
main/java/wicket/feedback/ main/java/wicket/jmx/ main/java/...
Author: jdonnerstag
Date: Sat Mar 3 01:19:02 2007
New Revision: 514105
URL: http://svn.apache.org/viewvc?view=rev&rev=514105
Log:
applied Eclipse cleanup
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/AbortException.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java
incubator/wicket/trunk/wicket/src/main/java/wicket/IComponentBorder.java
incubator/wicket/trunk/wicket/src/main/java/wicket/IConverterLocator.java
incubator/wicket/trunk/wicket/src/main/java/wicket/IPageMap.java
incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestCycleFactory.java
incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestListener.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Request.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java
incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
incubator/wicket/trunk/wicket/src/main/java/wicket/application/ReloadingClassLoader.java
incubator/wicket/trunk/wicket/src/main/java/wicket/application/WildcardMatcherHelper.java
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractAjaxBehavior.java
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractHeaderContributor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/HeaderContributor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/feedback/FeedbackMessages.java
incubator/wicket/trunk/wicket/src/main/java/wicket/jmx/Initializer.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/ComponentTag.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/Markup.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/DynamicWebResource.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebPage.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSingleSelectChoice.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSubmitLink.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/image/resource/DefaultButtonImageResource.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/panel/Fragment.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/JavaScriptReference.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/PackagedResourceReference.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/StyleSheetReference.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/AbstractTree.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/MiddleColumnsView.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/TreeTable.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/BaseMarkupLoader.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/HeaderCleanupMarkupLoader.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java
incubator/wicket/trunk/wicket/src/main/java/wicket/model/StringResourceModel.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ClientProperties.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/RequestLogger.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycleProcessor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/AbstractPortletRequestCycleProcessor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletActionRequestCycleProcessor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRenderRequestCycleProcessor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRequestCodingStrategy.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletServlet.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/WebRequestCodingStrategy.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/servlet/ServletWebRequest.java
incubator/wicket/trunk/wicket/src/main/java/wicket/request/RequestParameters.java
incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
incubator/wicket/trunk/wicket/src/main/java/wicket/resource/ByteArrayResource.java
incubator/wicket/trunk/wicket/src/main/java/wicket/resource/loader/ComponentStringResourceLoader.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/io/IObjectStreamFactory.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/io/SerializableChecker.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/lang/Objects.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/license/ApacheLicenseHeaderTestCase.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/license/JavaLicenseHeaderHandler.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/StyleAndVariationResourceNameIterator.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/tester/FormTester.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/tester/WicketTester.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/value/AttributeMap.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/value/MarkupAttributeValueMap.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/value/ValueMap.java
incubator/wicket/trunk/wicket/src/main/java/wicket/validation/validator/AbstractValidator.java
incubator/wicket/trunk/wicket/src/main/java/wicket/version/undo/UndoPageVersionManager.java
incubator/wicket/trunk/wicket/src/test/java/wicket/AttributeModifierComponentPage.java
incubator/wicket/trunk/wicket/src/test/java/wicket/AttributeModifierComponentTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/html/border/WrappedWicketBodyTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/model/ModelToStringTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/model/StringResourceModelTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/performance/MarkupParserPerformanceTest.java
incubator/wicket/trunk/wicket/src/test/java/wicket/util/lang/Person.java
incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/MockPageWithFormAndAjaxFormSubmitBehavior.java
incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/MockPageWithFormAndCheckGroup.java
incubator/wicket/trunk/wicket/src/test/java/wicket/util/tester/WicketTesterTest.java
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/AbortException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/AbortException.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/AbortException.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/AbortException.java Sat Mar 3 01:19:02 2007
@@ -29,6 +29,7 @@
/**
* @see java.lang.Throwable#fillInStackTrace()
*/
+ @Override
public synchronized Throwable fillInStackTrace()
{
// we do not need a stack trace, so to speed things up just return null
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java Sat Mar 3 01:19:02 2007
@@ -231,7 +231,7 @@
this.name = Classes.simpleName(getClass());
// Construct markup cache for this application
- this.markupCache = new MarkupCache(this);
+ this.markupCache = new MarkupCache();
// Create shared resources repository
this.sharedResources = new SharedResources(this);
@@ -506,7 +506,9 @@
if (getRequestLoggerSettings().isRequestLoggerEnabled())
{
if (requestLogger == null)
+ {
requestLogger = newRequestLogger();
+ }
}
else
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java Sat Mar 3 01:19:02 2007
@@ -473,9 +473,6 @@
/** Reserved subclass-definable flag bit */
protected static final int FLAG_RESERVED8 = 0x80000;
- /** empty object[] array used for invoking listener methods */
- private static final Object[] LISTENER_ARGS = new Object[] {};
-
/** meta data key for missing body tags logging. */
private static final MetaDataKey<IComponentBorder> BORDER_KEY = new MetaDataKey<IComponentBorder>()
{
@@ -510,9 +507,6 @@
/** Flag for escaping HTML in model strings */
private static final int FLAG_ESCAPE_MODEL_STRINGS = 0x0002;
-
- /** Flag for Component holding root compound model */
- private static final int NOT_USED_ANYMORE_FREE = 0x0004;
/** Ignore attribute modifiers */
private static final int FLAG_IGNORE_ATTRIBUTE_MODIFIER = 0x0040;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/IComponentBorder.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/IComponentBorder.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/IComponentBorder.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/IComponentBorder.java Sat Mar 3 01:19:02 2007
@@ -16,8 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
-
/**
* @author jcompagner
*/
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/IConverterLocator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/IConverterLocator.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/IConverterLocator.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/IConverterLocator.java Sat Mar 3 01:19:02 2007
@@ -16,8 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
-
import wicket.util.convert.ConverterLocator;
import wicket.util.convert.IConverter;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/IPageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/IPageMap.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/IPageMap.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/IPageMap.java Sat Mar 3 01:19:02 2007
@@ -16,8 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
-
import wicket.session.pagemap.IPageMapEntry;
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestCycleFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestCycleFactory.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestCycleFactory.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestCycleFactory.java Sat Mar 3 01:19:02 2007
@@ -16,8 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
-
/**
* Factory for creating request cycles for a session.
*
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestListener.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestListener.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestListener.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/IRequestListener.java Sat Mar 3 01:19:02 2007
@@ -16,8 +16,6 @@
*/
package wicket;
-import java.io.Serializable;
-
/**
* Base interface for all interfaces that listen for requests from the client
* browser. All sub-interfaces of this interface must have a single method which
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Request.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Request.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Request.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Request.java Sat Mar 3 01:19:02 2007
@@ -191,6 +191,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "Request[url=" + getURL() + "]";
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java Sat Mar 3 01:19:02 2007
@@ -740,7 +740,9 @@
{
PageMapAccessMetaData pagemapMetaData = getMetaData(PAGEMAP_ACCESS_MDK);
if (pagemapMetaData != null)
+ {
pagemapMetaData.pageMapNames.remove(pageMap.getName());
+ }
usedPageMaps.remove(pageMap);
removeAttribute(attributeForPageMapName(pageMap.getName()));
dirty();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/AbstractAjaxTimerBehavior.java Sat Mar 3 01:19:02 2007
@@ -33,8 +33,6 @@
/** The update interval */
private final Duration updateInterval;
- private boolean attachedBodyOnLoadModifier = false;
-
private boolean stopped = false;
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java Sat Mar 3 01:19:02 2007
@@ -149,7 +149,10 @@
*/
private void onError(AjaxRequestTarget target, RuntimeException e)
{
- if (e != null) throw e;
+ if (e != null)
+ {
+ throw e;
+ }
}
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/application/ReloadingClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/application/ReloadingClassLoader.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/application/ReloadingClassLoader.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/application/ReloadingClassLoader.java Sat Mar 3 01:19:02 2007
@@ -66,7 +66,9 @@
{
String rawpattern = (String) includesIterator.next();
if (rawpattern.length()<=1)
- continue;
+ {
+ continue;
+ }
boolean isInclude = rawpattern.substring(0, 1).equals("+");
String pattern = rawpattern.substring(1);
if (WildcardMatcherHelper.match(pattern, name) != null) {
@@ -202,6 +204,7 @@
*
* @param name of resource
*/
+ @Override
public final URL getResource(final String name)
{
URL resource = findResource(name);
@@ -227,6 +230,7 @@
* @return the resulting <code>Class</code> object
* @exception ClassNotFoundException if the class could not be found
*/
+ @Override
public final Class loadClass(String name, boolean resolve) throws ClassNotFoundException
{
// First check if it's already loaded
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/application/WildcardMatcherHelper.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/application/WildcardMatcherHelper.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/application/WildcardMatcherHelper.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/application/WildcardMatcherHelper.java Sat Mar 3 01:19:02 2007
@@ -185,12 +185,18 @@
// if we are already at the end of both strings
// than the pattern matched
- if(ipat >= lpat && istr >= lstr) return true;
+ if(ipat >= lpat && istr >= lstr)
+ {
+ return true;
+ }
// if hole string has matched the pattern so far and the rest of the pattern only has wildcard(s)
// we match too otherwise we clearly don't match
if(ipat < lpat && istr >= lstr) {
- while(ipat < lpat && apat[ipat] == STAR) ipat++;
+ while(ipat < lpat && apat[ipat] == STAR)
+ {
+ ipat++;
+ }
if(ipat >= lpat) {
add("");
@@ -203,16 +209,25 @@
// if hole pattern has matched the string so far but the string has more characters left
// we don't match
- if(ipat >= lpat && istr < lstr) return false;
+ if(ipat >= lpat && istr < lstr)
+ {
+ return false;
+ }
// if we have not stopped at a wildcard character
// a character doesn't match and thus we do not match at all
- if(apat[ipat] != STAR) return false;
+ if(apat[ipat] != STAR)
+ {
+ return false;
+ }
// if it is a double (or more) wildcard pattern
if(ipat < lpat - 1 && apat[ipat + 1] == STAR) {
// skip to first non star charater in the pattern
- while(++ipat < lpat && apat[ipat] == STAR);
+ while(++ipat < lpat && apat[ipat] == STAR)
+ {
+ ;
+ }
// if we are at the end of the pattern we've matched and are finish scanning
if(ipat >= lpat) {
@@ -224,7 +239,10 @@
// Now we need to scan for the end of the literal characters in the pattern
final int sipat = ipat; // start position of a literal character used for substring operations
- while(ipat < lpat && (apat[ipat] != STAR || (ipat > 0 && apat[ipat - 1] == ESC))) ipat++;
+ while(ipat < lpat && (apat[ipat] != STAR || (ipat > 0 && apat[ipat - 1] == ESC)))
+ {
+ ipat++;
+ }
// if we reached the end of the pattern just do a string compare with the corresponding part from
// the end of the string
@@ -238,9 +256,15 @@
int eistr = lstr - l;
// beause the '**' wildcard need to be greedy we scan from the end of the string for a match
- while(istr < eistr && ! strncmp(apat, sipat, astr, eistr, l)) eistr--;
-
- if(istr >= eistr) return false;
+ while(istr < eistr && ! strncmp(apat, sipat, astr, eistr, l))
+ {
+ eistr--;
+ }
+
+ if(istr >= eistr)
+ {
+ return false;
+ }
add(new String(astr, istr, eistr - istr));
istr = eistr + l;
@@ -252,7 +276,10 @@
if(ipat >= lpat) {
final int sistr = istr;
- while(istr < lstr && (astr[istr] != PATHSEP)) istr++;
+ while(istr < lstr && (astr[istr] != PATHSEP))
+ {
+ istr++;
+ }
if(istr >= lstr) {
add(new String(astr, sistr, lstr - sistr));
@@ -292,9 +319,15 @@
final int l = ipat- sipat + 1;
final int sistr = istr;
- while(istr < lstr && ! strncmp(apat, sipat, astr, istr, l)) istr++;
-
- if(istr >= lstr) return false;
+ while(istr < lstr && ! strncmp(apat, sipat, astr, istr, l))
+ {
+ istr++;
+ }
+
+ if(istr >= lstr)
+ {
+ return false;
+ }
add(new String(astr, sistr, istr - sistr));
ipat++;
@@ -337,7 +370,10 @@
final int l) {
int i = 0;
- while(i < l && o1 + i < a1.length && o2 + i < a2.length && a1[o1 + i] == a2[o2 + i]) i++;
+ while(i < l && o1 + i < a1.length && o2 + i < a2.length && a1[o1 + i] == a2[o2 + i])
+ {
+ i++;
+ }
return i == l;
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractAjaxBehavior.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractAjaxBehavior.java Sat Mar 3 01:19:02 2007
@@ -153,6 +153,7 @@
/**
* @see wicket.markup.html.IHeaderContributor#renderHead(IHeaderResponse)
*/
+ @Override
public void renderHead(final IHeaderResponse response)
{
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractHeaderContributor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractHeaderContributor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractHeaderContributor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/AbstractHeaderContributor.java Sat Mar 3 01:19:02 2007
@@ -47,6 +47,7 @@
/**
* @see wicket.markup.html.IHeaderContributor#renderHead(wicket.Response)
*/
+ @Override
public final void renderHead(final IHeaderResponse response)
{
IHeaderContributor[] contributors = getHeaderContributors();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/HeaderContributor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/HeaderContributor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/HeaderContributor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/behavior/HeaderContributor.java Sat Mar 3 01:19:02 2007
@@ -16,9 +16,6 @@
*/
package wicket.behavior;
-import static wicket.behavior.HeaderContributor.forCss;
-import static wicket.behavior.HeaderContributor.forJavaScript;
-
import java.util.ArrayList;
import java.util.List;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/feedback/FeedbackMessages.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/feedback/FeedbackMessages.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/feedback/FeedbackMessages.java Sat Mar 3 01:19:02 2007
@@ -70,7 +70,9 @@
public FeedbackMessages(List<FeedbackMessage> messagesList)
{
if (messagesList == null)
+ {
throw new IllegalArgumentException("messages list can't be null");
+ }
messages = messagesList;
}
@@ -99,7 +101,7 @@
{
for(int i = messages.size() - 1; i >= 0; i--)
{
- final FeedbackMessage msg = (FeedbackMessage)messages.get(i);
+ final FeedbackMessage msg = messages.get(i);
if (msg.isRendered())
{
messages.remove(i);
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/jmx/Initializer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/jmx/Initializer.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/jmx/Initializer.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/jmx/Initializer.java Sat Mar 3 01:19:02 2007
@@ -99,7 +99,7 @@
String agentId = System.getProperty("wicket.mbean.server.agentid");
if (agentId != null)
{
- ArrayList<MBeanServer> mbeanServers = (ArrayList<MBeanServer>)MBeanServerFactory
+ ArrayList<MBeanServer> mbeanServers = MBeanServerFactory
.findMBeanServer(agentId);
if (!mbeanServers.isEmpty())
{
@@ -115,7 +115,7 @@
String impl = System.getProperty("wicket.mbean.server.class");
if (impl != null)
{
- ArrayList<MBeanServer> mbeanServers = (ArrayList<MBeanServer>)MBeanServerFactory
+ ArrayList<MBeanServer> mbeanServers = MBeanServerFactory
.findMBeanServer(null);
if (!mbeanServers.isEmpty())
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/ComponentTag.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/ComponentTag.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/ComponentTag.java Sat Mar 3 01:19:02 2007
@@ -70,7 +70,7 @@
/** True if a href attribute is available and autolinking is on */
private boolean autolink = false;
- /** The component's id identified by wicket:id="xxx" */
+ /** The component's id, usually the same as wicket:id="xxx" */
private String id;
/** True, if attributes have been modified or added */
@@ -81,7 +81,6 @@
* and the information about the tags origin is lost. In some cases like
* wicket:head and wicket:link this information however is required.
*/
- // TODO remove when no longer needed
private Class markupClass;
/**
@@ -90,18 +89,16 @@
*/
private boolean hasNoCloseTag = false;
- /** True if a Wicket tag such as <wicket:panel> * */
+ /** True if a Wicket tag such as <wicket:panel> */
private boolean wicketTag = false;
/**
- * True if the tag has not wicket namespace and no wicket:id. E.g. <head> or
+ * True if the tag has no wicket namespace and no wicket:id. E.g. <head> or
* <body>
*/
private boolean internalTag = false;
- /**
- * added behaviors
- */
+ /** added behaviors */
private Collection<IBehavior> behaviors;
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/Markup.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/Markup.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/Markup.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/Markup.java Sat Mar 3 01:19:02 2007
@@ -46,9 +46,6 @@
/** Wicket namespace: <html xmlns:wicket="http://wicket.sourceforge.net"> */
private String wicketNamespace;
- /** == wicketNamespace + ":id" */
- private String wicketId;
-
/**
* Constructor
*/
@@ -111,8 +108,6 @@
public final void setWicketNamespace(final String wicketNamespace)
{
this.wicketNamespace = wicketNamespace;
- this.wicketId = wicketNamespace + ":id";
-
if (!ComponentTag.DEFAULT_WICKET_NAMESPACE.equals(wicketNamespace))
{
log.info("You are using a non-standard component name: " + wicketNamespace);
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/MarkupCache.java Sat Mar 3 01:19:02 2007
@@ -55,17 +55,11 @@
*/
private final Watcher afterLoadListeners = new Watcher();
- /** The Wicket application */
- private final Application application;
-
/**
* Constructor.
- *
- * @param application
*/
- public MarkupCache(final Application application)
+ public MarkupCache()
{
- this.application = application;
}
/**
@@ -350,7 +344,7 @@
if (markupResourceStream.getCacheKey() != null)
{
// Watch file in the future
- final ModificationWatcher watcher = application.getResourceSettings()
+ final ModificationWatcher watcher = Application.get().getResourceSettings()
.getResourceWatcher(true);
if (watcher != null)
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/DynamicWebResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/DynamicWebResource.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/DynamicWebResource.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/DynamicWebResource.java Sat Mar 3 01:19:02 2007
@@ -64,7 +64,9 @@
public Time lastModifiedTime()
{
if (lastModifiedTime == null)
+ {
lastModifiedTime = Time.now();
+ }
return lastModifiedTime;
}
@@ -133,6 +135,7 @@
/**
* @see wicket.markup.html.WebResource#setHeaders(wicket.protocol.http.WebResponse)
*/
+ @Override
protected void setHeaders(WebResponse response)
{
super.setHeaders(response);
@@ -155,6 +158,7 @@
* @return Gets the resource to attach to the component.
*/
// this method is deliberately non-final. some users depend on it
+ @Override
public IResourceStream getResourceStream()
{
return new IResourceStream()
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java Sat Mar 3 01:19:02 2007
@@ -47,15 +47,6 @@
private static final long serialVersionUID = 1L;
- /** True if body onLoad attribute modifiers have been attached */
- private boolean checkedBody = false;
-
- /** <wicket:head> is only allowed before <body>, </head>, <wicket:panel> etc. */
- private boolean noMoreWicketHeadTagsAllowed = false;
-
- /** True, if headers have been added */
- private transient boolean headersInitialized;
-
/**
* @see Component#Component(MarkupContainer,String)
*/
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebPage.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebPage.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/WebPage.java Sat Mar 3 01:19:02 2007
@@ -255,6 +255,7 @@
/**
* Common code executed by constructors.
*/
+ @Override
protected void onAssociatedMarkupLoaded(final MarkupFragment markup)
{
// Create a body container, assuming that all HTML pages require a
@@ -338,9 +339,6 @@
{
private static final long serialVersionUID = 1L;
- /** The unload model for deleting the pagemap cookie */
- private Model onUnLoadModel;
-
private final WebPage webPage;
/**
@@ -356,6 +354,7 @@
/**
* @see wicket.markup.html.IHeaderContributor#renderHead(wicket.Response)
*/
+ @Override
public final void renderHead(final IHeaderResponse headResponse)
{
Response response = headResponse.getResponse();
@@ -375,7 +374,7 @@
Session session = Session.get();
- Session.PageMapAccessMetaData meta = (Session.PageMapAccessMetaData)session
+ Session.PageMapAccessMetaData meta = session
.getMetaData(Session.PAGEMAP_ACCESS_MDK);
if (meta == null)
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSingleSelectChoice.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSingleSelectChoice.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSingleSelectChoice.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSingleSelectChoice.java Sat Mar 3 01:19:02 2007
@@ -34,9 +34,6 @@
*/
abstract class AbstractSingleSelectChoice<T> extends AbstractChoice<T, T>
{
- /** String to display when the selected value is null and nullValid is false. */
- private static final String CHOOSE_ONE = "Choose One";
-
private static final String NO_SELECTION_VALUE = "-1";
private static final String EMPTY_STRING = "";
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSubmitLink.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSubmitLink.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSubmitLink.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/AbstractSubmitLink.java Sat Mar 3 01:19:02 2007
@@ -151,9 +151,13 @@
public Form getForm()
{
if (form != null)
+ {
return form;
+ }
else
+ {
return findParent(Form.class);
+ }
}
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/image/resource/DefaultButtonImageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/image/resource/DefaultButtonImageResource.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/image/resource/DefaultButtonImageResource.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/image/resource/DefaultButtonImageResource.java Sat Mar 3 01:19:02 2007
@@ -230,6 +230,7 @@
*
* @see RenderedDynamicImageResource#render(Graphics2D)
*/
+ @Override
protected boolean render(final Graphics2D graphics)
{
// Get width and height
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/panel/Fragment.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/panel/Fragment.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/panel/Fragment.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/panel/Fragment.java Sat Mar 3 01:19:02 2007
@@ -233,6 +233,7 @@
*
* @see wicket.MarkupContainer#getMarkupFragment(java.lang.String)
*/
+ @Override
public MarkupFragment getMarkupFragment(final String id)
{
if (this.fragment == null)
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/JavaScriptReference.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/JavaScriptReference.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/JavaScriptReference.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/JavaScriptReference.java Sat Mar 3 01:19:02 2007
@@ -29,6 +29,7 @@
* @deprecated Use the {@link HeaderContributor#forJavaScript(ResourceReference)} instead
* @author Eelco Hillenius
*/
+@Deprecated
public class JavaScriptReference extends PackagedResourceReference
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/PackagedResourceReference.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/PackagedResourceReference.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/PackagedResourceReference.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/PackagedResourceReference.java Sat Mar 3 01:19:02 2007
@@ -30,6 +30,7 @@
*
* @author Eelco Hillenius
*/
+@Deprecated
public class PackagedResourceReference extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/StyleSheetReference.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/StyleSheetReference.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/StyleSheetReference.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/resources/StyleSheetReference.java Sat Mar 3 01:19:02 2007
@@ -29,6 +29,7 @@
* @deprecated Use the {@link HeaderContributor#forCss(ResourceReference)} instead
* @author Eelco Hillenius
*/
+@Deprecated
public final class StyleSheetReference extends PackagedResourceReference
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/AbstractTree.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/AbstractTree.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/AbstractTree.java Sat Mar 3 01:19:02 2007
@@ -695,11 +695,11 @@
// item
for (int i = parent.getChildren().size() - 2; i >= 0; --i)
{
- TreeItem item = (TreeItem)parent.getChildren().get(i);
+ TreeItem item = parent.getChildren().get(i);
// invalidate the node and it's children, so that they are
// redrawn
- invalidateNodeWithChildren((TreeNode)item.getModelObject());
+ invalidateNodeWithChildren(item.getModelObject());
}
}
}
@@ -846,11 +846,11 @@
}
else
{
- previous = (TreeItem)parent.getChildren().get(index - 1);
+ previous = parent.getChildren().get(index - 1);
// get the last item of previous item subtree
while (previous.getChildren() != null && previous.getChildren().size() > 0)
{
- previous = (TreeItem)previous.getChildren().get(
+ previous = previous.getChildren().get(
previous.getChildren().size() - 1);
}
}
@@ -1171,7 +1171,9 @@
dirtyItems.add(item);
if (createDOM)
+ {
dirtyItemsCreateDOM.add(item);
+ }
}
}
}
@@ -1380,6 +1382,6 @@
*/
public Component getNodeComponent(TreeNode node)
{
- return (Component)nodeToItemMap.get(node);
+ return nodeToItemMap.get(node);
}
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/MiddleColumnsView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/MiddleColumnsView.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/MiddleColumnsView.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/MiddleColumnsView.java Sat Mar 3 01:19:02 2007
@@ -218,9 +218,13 @@
// determine whether we should render the left border
if (!treeHasLeftColumn && i == 0)
+ {
response.write("<span class=\"d_\">");
+ }
else
+ {
response.write("<span class=\"c_\">");
+ }
if (component != null) // is there a component for current column?
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/TreeTable.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/TreeTable.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/tree/table/TreeTable.java Sat Mar 3 01:19:02 2007
@@ -197,7 +197,9 @@
private boolean hasLeftColumn() {
for (int i = 0; i < columns.length; ++i) {
if (columns[i].getLocation().getAlignment().equals(Alignment.LEFT))
+ {
return true;
+ }
}
return false;
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/BaseMarkupLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/BaseMarkupLoader.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/BaseMarkupLoader.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/BaseMarkupLoader.java Sat Mar 3 01:19:02 2007
@@ -20,10 +20,10 @@
import wicket.Application;
import wicket.MarkupContainer;
+import wicket.markup.IMarkupParserFactory;
import wicket.markup.MarkupFragment;
import wicket.markup.MarkupParser;
import wicket.markup.MarkupResourceStream;
-import wicket.settings.IMarkupSettings;
import wicket.util.resource.ResourceStreamNotFoundException;
/**
@@ -49,16 +49,9 @@
final MarkupResourceStream markupResourceStream) throws IOException,
ResourceStreamNotFoundException
{
- // Create a Markup parser
- final IMarkupSettings settings = Application.get().getMarkupSettings();
- final MarkupParser parser = settings.getMarkupParserFactory().newMarkupParser(markupResourceStream);
-
- parser.setCompressWhitespace(settings.getCompressWhitespace());
- parser.setStripComments(settings.getStripComments());
- parser.setDefaultMarkupEncoding(settings.getDefaultMarkupEncoding());
-
- // read and parse the markup
- MarkupFragment markup = parser.readAndParse();
- return markup;
+ final IMarkupParserFactory fac = Application.get().getMarkupSettings()
+ .getMarkupParserFactory();
+ final MarkupParser parser = fac.newMarkupParser(markupResourceStream);
+ return parser.readAndParse();
}
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/DefaultMarkupLoader.java Sat Mar 3 01:19:02 2007
@@ -18,7 +18,6 @@
import java.io.IOException;
-import wicket.Application;
import wicket.MarkupContainer;
import wicket.markup.MarkupFragment;
import wicket.markup.MarkupResourceStream;
@@ -49,10 +48,8 @@
final MarkupResourceStream markupResourceStream) throws IOException,
ResourceStreamNotFoundException
{
- final Application application = Application.get();
-
- IMarkupLoader loader = new InheritedMarkupMarkupLoader(application)
- .setParent(new HeaderCleanupMarkupLoader(application)
+ IMarkupLoader loader = new InheritedMarkupMarkupLoader()
+ .setParent(new HeaderCleanupMarkupLoader()
.setParent(new BaseMarkupLoader()));
return loader.loadMarkup(container, markupResourceStream);
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/HeaderCleanupMarkupLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/HeaderCleanupMarkupLoader.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/HeaderCleanupMarkupLoader.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/HeaderCleanupMarkupLoader.java Sat Mar 3 01:19:02 2007
@@ -18,7 +18,6 @@
import java.io.IOException;
-import wicket.Application;
import wicket.MarkupContainer;
import wicket.markup.MarkupElement;
import wicket.markup.MarkupFragment;
@@ -34,17 +33,11 @@
*/
public class HeaderCleanupMarkupLoader extends AbstractMarkupLoader
{
- /** The Wicket application */
- private final Application application;
-
/**
* Constructor.
- *
- * @param application
*/
- public HeaderCleanupMarkupLoader(final Application application)
+ public HeaderCleanupMarkupLoader()
{
- this.application = application;
}
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/loader/InheritedMarkupMarkupLoader.java Sat Mar 3 01:19:02 2007
@@ -55,18 +55,13 @@
/** onunload attribute; according to XHTML all attrs are lowercase */
private static final String ONUNLOAD = "onunload";
- /** The Wicket application */
- private final Application application;
-
/**
* Constructor.
*
- * @param application
* @param cache
*/
- public InheritedMarkupMarkupLoader(final Application application)
+ public InheritedMarkupMarkupLoader()
{
- this.application = application;
}
/**
@@ -126,11 +121,13 @@
private MarkupFragment getBaseMarkup(final MarkupContainer container,
final MarkupFragment markup)
{
+ final Application application = Application.get();
+
// Get the super class to than retrieve the markup associated with it
final Class<? extends MarkupContainer> markupClass = (Class<? extends MarkupContainer>)markup
.getMarkup().getResource().getMarkupClass().getSuperclass();
- final MarkupFragment baseMarkup = this.application.getMarkupCache().getMarkup(container,
+ final MarkupFragment baseMarkup = application.getMarkupCache().getMarkup(container,
markupClass);
if (baseMarkup == MarkupFragment.NO_MARKUP_FRAGMENT)
{
@@ -144,7 +141,7 @@
// Register an after-load listener for base markup. The listener
// implementation will remove the derived markup from the cache as
// reloading the base markup invalidates the derived markup as well
- this.application.getMarkupCache().addAfterLoadListener(
+ application.getMarkupCache().addAfterLoadListener(
baseMarkup.getMarkup().getResource(), new IChangeListener()
{
public void onChange()
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java Sat Mar 3 01:19:02 2007
@@ -522,7 +522,10 @@
finally
{
inputStream.close();
- if(this.xmlReader != null) this.xmlReader.close();
+ if(this.xmlReader != null)
+ {
+ this.xmlReader.close();
+ }
}
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java Sat Mar 3 01:19:02 2007
@@ -104,9 +104,6 @@
Class clazz = markupStream.getContainerClass();
ComponentTag tag = markupStream.getTag();
- // However if the markup stream is a merged markup stream
- // (inheritance), than we need the class of the markup file
- // which contained the tag.
if (tag.getMarkupClass() != null)
{
clazz = tag.getMarkupClass();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/model/StringResourceModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/model/StringResourceModel.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/model/StringResourceModel.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/model/StringResourceModel.java Sat Mar 3 01:19:02 2007
@@ -384,7 +384,9 @@
// of the get operation
String s = localizer.getString(getResourceKey(), component, model);
if (s == null)
+ {
s = defaultValue;
+ }
if (s != null)
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/AbstractHttpSessionStore.java Sat Mar 3 01:19:02 2007
@@ -153,7 +153,10 @@
if(id != null)
{
IRequestLogger logger = Application.get().getRequestLogger();
- if(logger != null) logger.sessionCreated(id);
+ if(logger != null)
+ {
+ logger.sessionCreated(id);
+ }
}
}
return id;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ClientProperties.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ClientProperties.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ClientProperties.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ClientProperties.java Sat Mar 3 01:19:02 2007
@@ -976,6 +976,7 @@
this.utcOffset = utcOffset;
}
+ @Override
public String toString()
{
StringBuffer b = new StringBuffer();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/MockWebApplication.java Sat Mar 3 01:19:02 2007
@@ -118,9 +118,6 @@
/** Request cycle factory. */
private IRequestCycleFactory requestCycleFactory;
- /** The homepage */
- private Class<? extends Page> homePage;
-
/** The tester object */
private final WebApplication application;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketFilter.java Sat Mar 3 01:19:02 2007
@@ -68,6 +68,7 @@
/**
* @see wicket.protocol.http.WicketFilter#getClassLoader()
*/
+ @Override
protected ClassLoader getClassLoader()
{
return reloadingClassLoader;
@@ -76,6 +77,7 @@
/**
* @see wicket.protocol.http.WicketFilter#init(javax.servlet.FilterConfig)
*/
+ @Override
public void init(final FilterConfig filterConfig) throws ServletException
{
reloadingClassLoader.setListener(new IChangeListener()
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/ReloadingWicketServlet.java Sat Mar 3 01:19:02 2007
@@ -54,6 +54,7 @@
*/
private static final long serialVersionUID = 1L;
+ @Override
protected WicketFilter newWicketFilter()
{
return new ReloadingWicketFilter();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/RequestLogger.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/RequestLogger.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/RequestLogger.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/RequestLogger.java Sat Mar 3 01:19:02 2007
@@ -180,7 +180,9 @@
{
liveSessions.put(sessionId, new SessionData(sessionId));
if (liveSessions.size() > peakSessions)
+ {
peakSessions = liveSessions.size();
+ }
totalCreatedSessions++;
}
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebApplication.java Sat Mar 3 01:19:02 2007
@@ -352,6 +352,7 @@
* {@link WebApplication#newSession(Request)}.
*/
// FIXME remove this method after 2.0.0
+ @Deprecated
public final Session newSession()
{
throw new UnsupportedOperationException("this method is replaced by Application#newSession");
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycleProcessor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycleProcessor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/WebRequestCycleProcessor.java Sat Mar 3 01:19:02 2007
@@ -149,6 +149,7 @@
/**
* @see wicket.request.AbstractRequestCycleProcessor#newRequestCodingStrategy()
*/
+ @Override
protected IRequestCodingStrategy newRequestCodingStrategy()
{
return new WebRequestCodingStrategy();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/AbstractPortletRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/AbstractPortletRequestCycleProcessor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/AbstractPortletRequestCycleProcessor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/AbstractPortletRequestCycleProcessor.java Sat Mar 3 01:19:02 2007
@@ -115,6 +115,7 @@
* @see wicket.request.IRequestCycleProcessor#respond(java.lang.RuntimeException,
* wicket.RequestCycle)
*/
+ @Override
@SuppressWarnings("unchecked")
public void respond(RuntimeException e, RequestCycle requestCycle)
{
@@ -179,6 +180,7 @@
/**
* @see wicket.request.AbstractRequestCycleProcessor#newRequestCodingStrategy()
*/
+ @Override
protected IRequestCodingStrategy newRequestCodingStrategy()
{
return new PortletRequestCodingStrategy();
@@ -200,6 +202,7 @@
* The exception
* @return Any error page to redirect to
*/
+ @Override
@SuppressWarnings("unchecked")
protected Page onRuntimeException(final Page page, final RuntimeException e)
{
@@ -215,6 +218,7 @@
* the request parameters object
* @return the bookmarkable page as a request target
*/
+ @Override
@SuppressWarnings("unchecked")
protected IRequestTarget resolveBookmarkablePage(final RequestCycle requestCycle,
final RequestParameters requestParameters)
@@ -255,6 +259,7 @@
* the request parameters object
* @return the home page as a request target
*/
+ @Override
@SuppressWarnings("unchecked")
protected IRequestTarget resolveHomePageTarget(final RequestCycle requestCycle,
final RequestParameters requestParameters)
@@ -299,6 +304,7 @@
* @param requestParameters
* @return The RequestTarget that was resolved
*/
+ @Override
@SuppressWarnings("unchecked")
protected IRequestTarget resolveListenerInterfaceTarget(final RequestCycle requestCycle,
final Page page, final String componentPath, final String interfaceName,
@@ -361,6 +367,7 @@
* the request parameters object
* @return the previously rendered page as a request target
*/
+ @Override
@SuppressWarnings("unchecked")
protected IRequestTarget resolveRenderedPage(final RequestCycle requestCycle,
final RequestParameters requestParameters)
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletActionRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletActionRequestCycleProcessor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletActionRequestCycleProcessor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletActionRequestCycleProcessor.java Sat Mar 3 01:19:02 2007
@@ -40,6 +40,7 @@
/**
* @see wicket.request.AbstractRequestCycleProcessor#respond(wicket.RequestCycle)
*/
+ @Override
public void respond(RequestCycle requestCycle)
{
PortletRequestCodingStrategy strategy = (PortletRequestCodingStrategy)requestCycle
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRenderRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRenderRequestCycleProcessor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRenderRequestCycleProcessor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRenderRequestCycleProcessor.java Sat Mar 3 01:19:02 2007
@@ -50,6 +50,7 @@
/**
* Process only PortletMode and WindowState changes in the RenderRequests
*/
+ @Override
public void processEvents(final RequestCycle requestCycle)
{
PortletPage<?> page = (PortletPage<?>)requestCycle.getRequest().getPage();
@@ -64,6 +65,7 @@
/**
* @see wicket.request.AbstractRequestCycleProcessor#respond(wicket.RequestCycle)
*/
+ @Override
public void respond(RequestCycle requestCycle)
{
IRequestTarget requestTarget = requestCycle.getRequestTarget();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRequestCodingStrategy.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRequestCodingStrategy.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletRequestCodingStrategy.java Sat Mar 3 01:19:02 2007
@@ -585,23 +585,6 @@
}
- /**
- * @param requestCycle
- * @return the PortletURL instance for portlet render URL
- */
- private PortletURL getRenderURL(RequestCycle requestCycle)
- {
- PortletRequestCycle portletRequestCycle = (PortletRequestCycle)requestCycle;
- PortletResponse response = portletRequestCycle.getPortletResponse().getPortletResponse();
- if (!(response instanceof RenderResponse))
- {
- throw new WicketRuntimeException("Unable to render URL while not in RenderResponse");
- }
-
- RenderResponse resp = (RenderResponse)response;
- return resp.createRenderURL();
- }
-
private ActionResponse getActionResponse(RequestCycle requestCycle)
{
PortletRequestCycle portletRequestCycle = (PortletRequestCycle)requestCycle;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletServlet.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletServlet.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletServlet.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/WicketPortletServlet.java Sat Mar 3 01:19:02 2007
@@ -38,6 +38,7 @@
* @deprecated use WicketPortletFilter instead
* @author Janne Hietamäki
*/
+@Deprecated
@SuppressWarnings("deprecation")
public class WicketPortletServlet extends WicketServlet
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/WebRequestCodingStrategy.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/WebRequestCodingStrategy.java Sat Mar 3 01:19:02 2007
@@ -68,9 +68,6 @@
/** cached url prefix. */
private CharSequence urlPrefix;
- /** settings for the coding strategy */
- private final Settings settings;
-
/**
* Various settings used to configure this strategy
*
@@ -120,7 +117,6 @@
*/
public WebRequestCodingStrategy(Settings settings)
{
- this.settings = settings;
mountsOnPath = new MountsMap(settings.areMountsCaseSensitive());
}
@@ -153,7 +149,9 @@
// special check if the prefix ends on '/' because a mount always
// starts with '/'
if (prefix.charAt(prefix.length() - 1) == '/')
+ {
prefix = prefix.subSequence(0, prefix.length() - 1);
+ }
}
final AppendingStringBuffer buffer = new AppendingStringBuffer(prefix.length()
+ path.length());
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java Sat Mar 3 01:19:02 2007
@@ -59,6 +59,7 @@
/**
* @see wicket.protocol.http.WebRequestCycleProcessor#newRequestCodingStrategy()
*/
+ @Override
protected IRequestCodingStrategy newRequestCodingStrategy()
{
return new UrlCompressingWebCodingStrategy();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/servlet/ServletWebRequest.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/servlet/ServletWebRequest.java Sat Mar 3 01:19:02 2007
@@ -253,6 +253,7 @@
*
* @see wicket.Request#mergeVersion()
*/
+ @Override
public boolean mergeVersion()
{
RequestListenerInterface intface = getRequestParameters().getInterface();
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/request/RequestParameters.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/request/RequestParameters.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/request/RequestParameters.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/request/RequestParameters.java Sat Mar 3 01:19:02 2007
@@ -67,9 +67,6 @@
/** any bookmarkable page class. */
private String bookmarkablePageClass;
- /** bookmarkable form name */
- private String bookmarkableFormName;
-
/** free-to-use map of non-reserved parameters. */
private Map<String, ? extends Object> parameters;
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/MixedParamUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/MixedParamUrlCodingStrategy.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/MixedParamUrlCodingStrategy.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/MixedParamUrlCodingStrategy.java Sat Mar 3 01:19:02 2007
@@ -106,6 +106,7 @@
}
/** {@inheritDoc} */
+ @Override
@SuppressWarnings("unchecked")
protected void appendParameters(AppendingStringBuffer url, Map parameters)
{
@@ -148,6 +149,7 @@
}
/** {@inheritDoc} */
+ @Override
@SuppressWarnings("unchecked")
protected ValueMap decodeParameters(String urlFragment, Map urlParameters)
{
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/resource/ByteArrayResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/resource/ByteArrayResource.java?view=diff&rev=514105&r1=514104&r2=514105
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/resource/ByteArrayResource.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/resource/ByteArrayResource.java Sat Mar 3 01:19:02 2007
@@ -130,6 +130,7 @@
/**
* @see wicket.markup.html.WebResource#setHeaders(wicket.protocol.http.WebResponse)
*/
+ @Override
protected void setHeaders(WebResponse response)
{
super.setHeaders(response);
@@ -142,6 +143,7 @@
/**
* @see wicket.Resource#getResourceStream()
*/
+ @Override
public IResourceStream getResourceStream()
{
return new IResourceStream()