You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/11/24 03:09:12 UTC
svn commit: r1038442 - in /wicket/trunk:
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
wicket-extensions/src/main/java/org/apache/wicket/extension...
Author: ivaynberg
Date: Wed Nov 24 02:09:11 2010
New Revision: 1038442
URL: http://svn.apache.org/viewvc?rev=1038442&view=rev
Log:
introduce Component parameter as context into ibehavior methods
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IMarkupIdStrategy.java (with props)
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Wed Nov 24 02:09:11 2010
@@ -217,7 +217,7 @@ public class DatePicker extends Abstract
* @see org.apache.wicket.markup.html.IHeaderContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
if (includeYUILibraries())
{
@@ -271,7 +271,7 @@ public class DatePicker extends Abstract
}
// ${calendarInit}
- StringBuilder calendarInit = new StringBuilder();
+ StringBuilder calendarInit = new StringBuilder();
for (Iterator<Entry<String, Object>> i = p.entrySet().iterator(); i.hasNext();)
{
Entry<String, Object> entry = i.next();
@@ -599,7 +599,8 @@ public class DatePicker extends Abstract
filterEmpty(dfSymbols.getShortWeekdays()));
setWidgetProperty(widgetProperties, "WEEKDAYS_LONG", filterEmpty(dfSymbols.getWeekdays()));
- widgetProperties.put("START_WEEKDAY", Calendar.getInstance(getLocale()).getFirstDayOfWeek() - 1);
+ widgetProperties.put("START_WEEKDAY",
+ Calendar.getInstance(getLocale()).getFirstDayOfWeek() - 1);
if (Locale.SIMPLIFIED_CHINESE.equals(getLocale()) ||
Locale.TRADITIONAL_CHINESE.equals(getLocale()))
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java Wed Nov 24 02:09:11 2010
@@ -61,7 +61,7 @@ public class AjaxIndicatorAppender exten
}
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
if (AjaxRequestTarget.get() != null)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java Wed Nov 24 02:09:11 2010
@@ -84,9 +84,9 @@ public abstract class AjaxLazyLoadPanel
}
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
- super.renderHead(response);
+ super.renderHead(component, response);
handleCallbackScript(response, getCallbackScript().toString());
}
@@ -150,8 +150,8 @@ public abstract class AjaxLazyLoadPanel
{
IRequestHandler handler = new ResourceReferenceRequestHandler(
AbstractDefaultAjaxBehavior.INDICATOR);
- return new Label(markupId, "<img alt=\"Loading...\" src=\"" + RequestCycle.get().urlFor(handler) +
- "\"/>").setEscapeModelStrings(false);
+ return new Label(markupId, "<img alt=\"Loading...\" src=\"" +
+ RequestCycle.get().urlFor(handler) + "\"/>").setEscapeModelStrings(false);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java Wed Nov 24 02:09:11 2010
@@ -17,6 +17,7 @@
package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -45,9 +46,9 @@ public abstract class AbstractAutoComple
* @see org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
- super.renderHead(response);
+ super.renderHead(component, response);
renderAutocompleteHead(response);
}
Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java (original)
+++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java Wed Nov 24 02:09:11 2010
@@ -24,7 +24,6 @@ import org.apache.velocity.app.Velocity;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
@@ -42,7 +41,7 @@ public class VelocityContributor extends
private String encoding = "ISO-8859-1";
- private final IModel< ? extends Map< ? , ? >> model;
+ private final IModel<? extends Map<?, ?>> model;
private final String templateName;
@@ -57,7 +56,7 @@ public class VelocityContributor extends
* @param templateName
* @param model
*/
- public VelocityContributor(String templateName, final IModel< ? extends Map< ? , ? >> model)
+ public VelocityContributor(String templateName, final IModel<? extends Map<?, ?>> model)
{
this.templateName = templateName;
this.model = model;
@@ -87,7 +86,7 @@ public class VelocityContributor extends
* @see org.apache.wicket.markup.html.IHeaderContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
@Override
- public void renderHead(final IHeaderResponse response)
+ public void renderHead(Component component, final IHeaderResponse response)
{
CharSequence s = evaluate();
if (null != s)
Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java (original)
+++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java Wed Nov 24 02:09:11 2010
@@ -19,13 +19,14 @@ package org.apache.wicket.velocity;
import java.util.Map;
import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Packages;
/**
- * A derivation of VelocityContributor that uses {@link
- * org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(CharSequence, String)}
+ * A derivation of VelocityContributor that uses
+ * {@link org.apache.wicket.markup.html.IHeaderResponse#renderJavascript(CharSequence, String)}
*/
public class VelocityJavascriptContributor extends VelocityContributor
{
@@ -42,8 +43,8 @@ public class VelocityJavascriptContribut
* @param model
* @param id
*/
- public VelocityJavascriptContributor(Class< ? > clazz, String templatePath,
- IModel< ? extends Map< ? , ? >> model, String id)
+ public VelocityJavascriptContributor(Class<?> clazz, String templatePath,
+ IModel<? extends Map<?, ?>> model, String id)
{
super(Packages.absolutePath(clazz, templatePath), model);
this.id = id;
@@ -57,8 +58,8 @@ public class VelocityJavascriptContribut
* @param model
* @param id
*/
- public VelocityJavascriptContributor(String templatePath,
- IModel< ? extends Map< ? , ? >> model, String id)
+ public VelocityJavascriptContributor(String templatePath, IModel<? extends Map<?, ?>> model,
+ String id)
{
super(templatePath, model);
this.id = id;
@@ -66,10 +67,10 @@ public class VelocityJavascriptContribut
/**
* @see org.apache.wicket.velocity.VelocityContributor#renderHead(org.apache.wicket.markup.html.
- * IHeaderResponse)
+ * IHeaderResponse)
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
CharSequence s = evaluate();
if (s != null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java Wed Nov 24 02:09:11 2010
@@ -56,7 +56,7 @@ final class Behaviors implements IDetach
internalAdd(behavior);
- if (!behavior.isTemporary())
+ if (!behavior.isTemporary(component))
{
component.addStateChange();
}
@@ -106,7 +106,7 @@ final class Behaviors implements IDetach
if (internalRemove(behavior))
{
- if (!behavior.isTemporary())
+ if (!behavior.isTemporary(component))
{
component.addStateChange();
}
@@ -140,7 +140,7 @@ final class Behaviors implements IDetach
behavior.detach(component);
- if (behavior.isTemporary())
+ if (behavior.isTemporary(component))
{
internalRemove(behavior);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Wed Nov 24 02:09:11 2010
@@ -1545,8 +1545,8 @@ public abstract class Component
return null;
}
- final int generatedMarkupId = storedMarkupId instanceof Integer
- ? (Integer) storedMarkupId : Session.get().nextSequenceValue();
+ final int generatedMarkupId = storedMarkupId instanceof Integer ? (Integer)storedMarkupId
+ : Session.get().nextSequenceValue();
if (storedMarkupId == null)
{
@@ -2617,7 +2617,7 @@ public abstract class Component
{
if (response.wasRendered(behavior) == false)
{
- behavior.renderHead(response);
+ behavior.renderHead(this, response);
response.markRendered(behavior);
}
}
@@ -2763,7 +2763,7 @@ public abstract class Component
if (markupId instanceof Integer)
{
- generatedMarkupId = (Integer) markupId;
+ generatedMarkupId = (Integer)markupId;
setMetaData(MARKUP_ID_KEY, null);
return;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java Wed Nov 24 02:09:11 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.ajax;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -96,9 +97,9 @@ public abstract class AbstractAjaxTimerB
* @see org.apache.wicket.behavior.AbstractAjaxBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
- super.renderHead(response);
+ super.renderHead(component, response);
WebRequest request = (WebRequest)RequestCycle.get().getRequest();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Wed Nov 24 02:09:11 2010
@@ -64,10 +64,10 @@ public abstract class AbstractDefaultAja
}
/**
- * @see org.apache.wicket.behavior.AbstractAjaxBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
+ * @see org.apache.wicket.behavior.AbstractAjaxBehavior#renderHead(Component,org.apache.wicket.markup.html.IHeaderResponse)
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
final IDebugSettings debugSettings = Application.get().getDebugSettings();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java Wed Nov 24 02:09:11 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.ajax.form;
+import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -60,9 +61,9 @@ public abstract class AjaxFormChoiceComp
* @see org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
- super.renderHead(response);
+ super.renderHead(component, response);
AppendingStringBuffer asb = new AppendingStringBuffer();
asb.append("function attachChoiceHandlers(markupId, callbackScript) {\n");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Wed Nov 24 02:09:11 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.request.Response;
/**
@@ -30,10 +29,7 @@ import org.apache.wicket.request.Respons
* @author Ralf Ebert
* @author Igor Vaynberg
*/
-public abstract class AbstractAjaxBehavior extends AbstractBehavior
- implements
- IHeaderContributor,
- IBehaviorListener
+public abstract class AbstractAjaxBehavior extends AbstractBehavior implements IBehaviorListener
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java Wed Nov 24 02:09:11 2010
@@ -150,9 +150,9 @@ public abstract class AbstractBehavior i
}
/**
- * @see org.apache.wicket.behavior.IBehavior#isTemporary()
+ * @see org.apache.wicket.behavior.IBehavior#isTemporary(Component)
*/
- public boolean isTemporary()
+ public boolean isTemporary(Component component)
{
return false;
}
@@ -164,7 +164,7 @@ public abstract class AbstractBehavior i
{
}
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java Wed Nov 24 02:09:11 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponse;
/**
* Behaviors are kind of plug-ins for Components. They allow functionality to be added to a
@@ -49,7 +49,7 @@ import org.apache.wicket.markup.html.IHe
* @author Eelco Hillenius
* @author Igor Vaynberg (ivaynberg)
*/
-public interface IBehavior extends IClusterable, IHeaderContributor
+public interface IBehavior extends IClusterable
{
/**
* Called when a component is about to render.
@@ -147,9 +147,11 @@ public interface IBehavior extends IClus
* rendering only when it renders next. Usecases include javascript effects, initial clientside
* dom setup, etc.
*
+ * @param component
+ *
* @return true if this behavior is temporary
*/
- boolean isTemporary();
+ boolean isTemporary(Component component);
/**
* Checks if a listener can be invoked on this behavior
@@ -158,4 +160,14 @@ public interface IBehavior extends IClus
* @return true if a listener interface can be invoked on this behavior
*/
boolean canCallListenerInterface(Component component);
+
+ /**
+ * Render to the web response whatever the component wants to contribute to the head section.
+ *
+ * @param component
+ *
+ * @param response
+ * Response object
+ */
+ void renderHead(Component component, IHeaderResponse response);
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java Wed Nov 24 02:09:11 2010
@@ -235,7 +235,14 @@ public class WicketServlet extends HttpS
if (stream == null)
{
- response.sendError(HttpServletResponse.SC_NOT_FOUND);
+ if (response.isCommitted())
+ {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ }
+ else
+ {
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
+ }
}
else
{
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IMarkupIdStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IMarkupIdStrategy.java?rev=1038442&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IMarkupIdStrategy.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IMarkupIdStrategy.java Wed Nov 24 02:09:11 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.settings;
+
+import org.apache.wicket.Component;
+
+/**
+ *
+ * @author juergen donnerstag
+ */
+public interface IMarkupIdStrategy
+{
+ /**
+ * @param component
+ * @return markup id
+ */
+ String getMarkupId(Component component);
+}
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IMarkupIdStrategy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java Wed Nov 24 02:09:11 2010
@@ -78,7 +78,7 @@ public class BehaviorUrlTest extends Tes
private static class TestTemporaryBehavior extends AbstractBehavior
{
@Override
- public boolean isTemporary()
+ public boolean isTemporary(Component c)
{
return true;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java Wed Nov 24 02:09:11 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.renderStrategy;
+import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -58,7 +59,7 @@ public class SimplePage1 extends WebPage
container.add(new AbstractBehavior()
{
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
response.renderCSSReference(id + ".css");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java Wed Nov 24 02:09:11 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.renderStrategy;
+import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -60,7 +61,7 @@ public class SimplePage2 extends WebPage
container.add(new AbstractBehavior()
{
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
response.renderCSSReference(id + ".css");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java Wed Nov 24 02:09:11 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.renderStrategy;
+import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -68,7 +69,7 @@ public class SimplePanel1 extends Panel
container.add(new AbstractBehavior()
{
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(Component component, IHeaderResponse response)
{
response.renderCSSReference(id + ".css");
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java?rev=1038442&r1=1038441&r2=1038442&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java Wed Nov 24 02:09:11 2010
@@ -139,10 +139,10 @@ public class VersioningTestPage extends
{
/**
- * @see org.apache.wicket.behavior.AbstractBehavior#isTemporary()
+ * @see org.apache.wicket.behavior.AbstractBehavior#isTemporary(Component)
*/
@Override
- public boolean isTemporary()
+ public boolean isTemporary(Component c)
{
return true;
}
@@ -169,10 +169,10 @@ public class VersioningTestPage extends
{
/**
- * @see org.apache.wicket.behavior.AbstractBehavior#isTemporary()
+ * @see org.apache.wicket.behavior.AbstractBehavior#isTemporary(Component)
*/
@Override
- public boolean isTemporary()
+ public boolean isTemporary(Component c)
{
return false;
}