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/01/19 01:48:24 UTC
svn commit: r900627 - in
/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions:
ajax/markup/html/ ajax/markup/html/autocomplete/
ajax/markup/html/form/upload/ markup/html/repeater/data/table/filter/
markup/html/tree...
Author: ivaynberg
Date: Tue Jan 19 00:48:23 2010
New Revision: 900627
URL: http://svn.apache.org/viewvc?rev=900627&view=rev
Log:
WICKET-2670
Issue: WICKET-2670
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutocompleteTextField.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Tue Jan 19 00:48:23 2010
@@ -137,7 +137,7 @@
*/
public AjaxEditableChoiceLabel(String id, IModel<T> model, List<? extends T> choices)
{
- this(id, model, Model.of(choices));
+ this(id, model, Model.ofList(choices));
}
/**
@@ -155,7 +155,7 @@
public AjaxEditableChoiceLabel(String id, IModel<T> model, List<? extends T> choices,
IChoiceRenderer<T> renderer)
{
- this(id, model, Model.of(choices), renderer);
+ this(id, model, Model.ofList(choices), renderer);
}
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutocompleteTextField.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutocompleteTextField.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutocompleteTextField.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutocompleteTextField.java Tue Jan 19 00:48:23 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
-import org.apache.wicket.behavior.HeaderContributor;
+import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.model.IModel;
/**
@@ -33,7 +33,7 @@
public DefaultCssAutocompleteTextField(String string, IModel<T> model)
{
super(string, model);
- add(HeaderContributor.forCss(DefaultCssAutocompleteTextField.class,
+ add(CSSPackageResource.getHeaderContribution(DefaultCssAutocompleteTextField.class,
"DefaultCssAutocompleteTextField.css"));
}
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Tue Jan 19 00:48:23 2010
@@ -22,9 +22,10 @@
import org.apache.wicket.RequestCycle;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.CSSPackageResource;
+import org.apache.wicket.markup.html.JavascriptPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
@@ -114,11 +115,11 @@
form.setOutputMarkupId(true);
setRenderBodyOnly(true);
- add(HeaderContributor.forJavaScript(JS));
+ add(JavascriptPackageResource.getHeaderContribution(JS));
ResourceReference css = getCss();
if (css != null)
{
- add(HeaderContributor.forCss(css));
+ add(CSSPackageResource.getHeaderContribution(css));
}
final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java Tue Jan 19 00:48:23 2010
@@ -66,7 +66,7 @@
public ChoiceFilter(String id, IModel<T> model, FilterForm form, List<? extends T> choices,
boolean autoSubmit)
{
- this(id, model, form, Model.valueOf(choices), defaultRenderer, autoSubmit);
+ this(id, model, form, Model.ofList(choices), defaultRenderer, autoSubmit);
}
/**
@@ -80,7 +80,7 @@
public ChoiceFilter(String id, IModel<T> model, FilterForm form, List<? extends T> choices,
IChoiceRenderer<T> renderer, boolean autoSubmit)
{
- this(id, model, form, Model.valueOf(choices), renderer, autoSubmit);
+ this(id, model, form, Model.ofList(choices), renderer, autoSubmit);
}
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Tue Jan 19 00:48:23 2010
@@ -23,9 +23,9 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.tree.AbstractTree;
@@ -593,7 +593,7 @@
ResourceReference css = getCSS();
if (css != null)
{
- add(HeaderContributor.forCss(css.getScope(), css.getName()));
+ add(CSSPackageResource.getHeaderContribution(css.getScope(), css.getName()));
}
}
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java Tue Jan 19 00:48:23 2010
@@ -20,8 +20,8 @@
import org.apache.wicket.ResourceReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
-import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.Loop;
@@ -319,7 +319,7 @@
*/
public final void addDefaultCssStyle()
{
- add(HeaderContributor.forCss(RatingPanel.class, "RatingPanel.css"));
+ add(CSSPackageResource.getHeaderContribution(RatingPanel.class, "RatingPanel.css"));
}
/**
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java?rev=900627&r1=900626&r2=900627&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java Tue Jan 19 00:48:23 2010
@@ -19,8 +19,8 @@
import java.util.Iterator;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.feedback.ContainerFeedbackMessageFilter;
+import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
@@ -171,7 +171,7 @@
*/
public void addDefaultCssStyle()
{
- add(HeaderContributor.forCss(Wizard.class, "Wizard.css"));
+ add(CSSPackageResource.getHeaderContribution(Wizard.class, "Wizard.css"));
}
/**