Author: pete
Date: Thu Apr 28 13:27:18 2011
New Revision: 1097450
URL: http://svn.apache.org/viewvc?rev=1097450&view=rev
Log:
remove redundant usage of IHeaderContributor since Component implements it now
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1097450&r1=1097449&r2=1097450&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Thu
Apr 28 13:27:18 2011
@@ -2674,7 +2674,7 @@ public abstract class Component
* Make sure that all attached behaviors are asked as well.
* <p>
* NOT intended for overriding by framework clients. Rather, use
- * {@link
IHeaderContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse)}
+ * {@link
Component#renderHead(org.apache.wicket.markup.html.IHeaderResponse)}}
* </p>
*
* @param container
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1097450&r1=1097449&r2=1097450&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
Thu Apr 28 13:27:18 2011
@@ -29,7 +29,6 @@ import org.apache.wicket.WicketRuntimeEx
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
@@ -139,7 +138,7 @@ import org.slf4j.LoggerFactory;
* @param <T>
* The model object type
*/
-public class Form<T> extends WebMarkupContainer implements
IFormSubmitListener, IHeaderContributor
+public class Form<T> extends WebMarkupContainer implements IFormSubmitListener
{
private static final String HIDDEN_DIV_START = "<div
style=\"width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden\">";
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=1097450&r1=1097449&r2=1097450&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
Thu Apr 28 13:27:18 2011
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -61,8 +60,6 @@ import org.apache.wicket.util.upload.Fil
* @author Igor Vaynberg (ivaynberg)
*/
public class MultiFileUploadField extends
FormComponentPanel<Collection<FileUpload>>
- implements
- IHeaderContributor
{
private static final long serialVersionUID = 1L;
@@ -202,9 +199,6 @@ public class MultiFileUploadField extend
return true;
}
- /**
- * @see
org.apache.wicket.markup.html.IHeaderContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
- */
@Override
public void renderHead(IHeaderResponse response)
{
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=1097450&r1=1097449&r2=1097450&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Thu Apr 28 13:27:18 2011
@@ -36,7 +36,6 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupFragment;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
@@ -65,8 +64,7 @@ public abstract class AbstractTree exten
implements
ITreeStateListener,
TreeModelListener,
- AjaxRequestTarget.ITargetRespondListener,
- IHeaderContributor
+ AjaxRequestTarget.ITargetRespondListener
{
/**
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java?rev=1097450&r1=1097449&r2=1097450&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java
Thu Apr 28 13:27:18 2011
@@ -141,10 +141,7 @@ public class DecoratingHeaderResponseTes
/**
*
*/
- public static class TestPage extends WebPage
- implements
- IHeaderContributor,
- IMarkupResourceStreamProvider
+ public static class TestPage extends WebPage implements
IMarkupResourceStreamProvider
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java?rev=1097450&r1=1097449&r2=1097450&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
Thu Apr 28 13:27:18 2011
@@ -22,7 +22,6 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.examples.WicketExamplePage;
import
org.apache.wicket.examples.resourcedecoration.GroupedAndOrderedResourceReference.ResourceGroup;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -111,8 +110,6 @@ public class HomePage extends WicketExam
}
private static class AjaxProofContainer extends WebMarkupContainer
- implements
- IHeaderContributor
{
private static final long serialVersionUID = 1L;
