http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-core/src/test/js/ajax.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/js/ajax.js b/wicket-core/src/test/js/ajax.js index 7e3df2f..a878bab 100644 --- a/wicket-core/src/test/js/ajax.js +++ b/wicket-core/src/test/js/ajax.js @@ -33,36 +33,32 @@ jQuery(document).ready(function() { return text; } - execute = function (dataElementId, options) { + execute = function (dataElementId, attributes) { var defaults = { - parseResponse: true, - randomUrl: false, - failureHandler: function () { + fh: function () { start(); ok(false, 'Failure handler should not be called!'); }, - channel: '0|s', - successHandler: function () { + ch: '0|s', + sh: function () { start(); ok(true, 'Success handler is executed'); }, - url: 'dummy/url', - transport: { - abort: function() {}, - responseText: loadData(dataElementId), // emulates Ajax response - responseXML: Wicket.Xml.parse(loadData(dataElementId)), // emulates Ajax response (IE) - status: 200, - readyState: 4 - } + u: 'dummy/url' + }; + var attrs = jQuery.extend({}, defaults, attributes); + var call = new Wicket.Ajax.Call(); + + var jqXHR = { + responseText: loadData(dataElementId), // emulates Ajax response + responseXML: Wicket.Xml.parse(loadData(dataElementId)), // emulates Ajax response (IE) + status: 200, + readyState: 4 }; - var opts = jQuery.extend({}, defaults, options); - var call = new Wicket.Ajax.Call(opts.url, opts.successHandler, opts.failureHandler, opts.channel); - var request = new Wicket.Ajax.Request(opts.url, call.loadedCallback.bind(call), opts.parseResponse, opts.randomUrl, opts.failureHandler, opts.channel, opts.successHandler); - - request.transport = opts.transport; - request.stateChangeCallback(); + call.channel = attrs.ch; + call.stateChangeCallback({}, "success", jqXHR, attrs); }; module('Wicket.Ajax.stateChangeCallback'); @@ -93,7 +89,7 @@ jQuery(document).ready(function() { expect(2); var options = { - successHandler: function() { + sh: function() { start(); equal(jQuery('#componentToReplace').text(), 'new body', 'The component must be replaced'); @@ -121,7 +117,7 @@ jQuery(document).ready(function() { }; var options = { - successHandler: function() { + sh: function() { equal(jQuery('#componentToReplaceDoesNotExist').length, 0, 'A component with id \'componentToReplaceDoesNotExist\' must not exist!'); } }; @@ -134,7 +130,7 @@ jQuery(document).ready(function() { expect(4); var options = { - successHandler: function() { + sh: function() { start(); equal(jQuery('#componentToReplace')[0].tagName.toLowerCase(), 'table', 'A component with id \'componentToReplace\' must be a table now!'); } @@ -151,7 +147,7 @@ jQuery(document).ready(function() { var oldTitle = jQuery('title').text(); var options = { - successHandler: function() { + sh: function() { start(); var $title = jQuery('title'); equal($title.text(), 'new title', 'The title text should be updated!');
http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java index 892af0a..4c0d5da 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java @@ -20,7 +20,7 @@ import org.apache.wicket.Application; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; /** * Use the {@link #load(IHeaderResponse)} method to initialize the YUI library using the YUI loader. http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java index 22b81cb..30c491d 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java @@ -22,11 +22,11 @@ import java.util.Map.Entry; import java.util.Properties; import org.apache.wicket.extensions.yui.YuiLib; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.CssHeaderItem; /** @@ -126,7 +126,7 @@ public abstract class AbstractCalendar extends WebComponent private void contributeDependencies(IHeaderResponse response) { response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference( - YuiLib.class, "yahoodomevent/yahoo-dom-event.js"))); + YuiLib.class, "yahoodomevent/yahoo-dom-event.js"))); response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference( AbstractCalendar.class, "calendar-min.js"))); response.render(CssHeaderItem.forReference(new PackageResourceReference( http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java index 08cefef..a355942 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java @@ -37,6 +37,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.datetime.markup.html.form.DateTextField; import org.apache.wicket.extensions.yui.YuiLib; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider; import org.apache.wicket.request.Response; @@ -45,7 +46,6 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandle import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.convert.converter.DateConverter; import org.apache.wicket.util.lang.Objects; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java index c48c383..58dc226 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java @@ -31,8 +31,8 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; /** * The debug bar is for use during development. It allows contributors to add useful functions or http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java index 6fe5c2c..605b0cb 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.java @@ -19,10 +19,10 @@ package org.apache.wicket.examples.ajax.builtin; 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.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; /** * Demonstrates ajax effects http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java index fd04052..186103d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java @@ -17,7 +17,6 @@ package org.apache.wicket.examples.ajax.prototype; import org.apache.wicket.examples.WicketExamplePage; -import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.markup.html.link.Link; @@ -28,8 +27,6 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.ComponentRenderingRequestHandler; import org.apache.wicket.request.handler.ListenerInterfaceRequestHandler; import org.apache.wicket.request.handler.PageAndComponentProvider; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; import org.apache.wicket.util.string.AppendingStringBuffer; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java index f48d5dd..32d0839 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java @@ -21,6 +21,7 @@ import org.apache.wicket.ajax.AbstractAjaxTimerBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.examples.WicketExamplePage; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -28,9 +29,8 @@ import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.resource.JQueryPluginResourceReference; import org.apache.wicket.resource.filtering.HeaderResponseFilteredResponseContainer; -import org.apache.wicket.resource.header.CssHeaderItem; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.util.time.Duration; /** @@ -95,7 +95,7 @@ public class HomePage extends WicketExamplePage // two CSS resources in the same group. header.css is rendered first because has lower // "order" number response.render(CssHeaderItem.forReference(new CssResourceReference(HomePage.class, - "footer.css"))); + "footer.css"))); response.render(CssHeaderItem.forReference(new CssResourceReference(HomePage.class, "header.css"))); http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java index cc6f886..1a7cdae 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java @@ -24,6 +24,7 @@ import org.apache.wicket.ajax.AjaxRequestAttributes; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.basic.Label; @@ -34,7 +35,6 @@ import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.string.Strings; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java index 3c7cbe4..2ba1ad8 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java @@ -26,6 +26,7 @@ import org.apache.wicket.ajax.AjaxRequestAttributes; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.FormComponent; @@ -34,7 +35,6 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.IObjectClassAwareModel; import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.string.JavaScriptUtils; import org.apache.wicket.validation.IValidator; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java index 3a34f4e..ed4364c 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java @@ -24,13 +24,13 @@ import org.apache.wicket.ajax.AjaxRequestAttributes.Method; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.MultiLineLabel; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; /** * An inplace editor much like {@link AjaxEditableLabel}, but now with support for multi line http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java index d882637..df333ed 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java @@ -27,8 +27,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; /** * A panel where you can lazy load another panel. This can be used if you have a panel/component http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java index 9961e92..8381059 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java @@ -20,13 +20,13 @@ 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.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.util.string.Strings; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java index dbbd59d..3520752 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java @@ -19,7 +19,7 @@ package org.apache.wicket.extensions.ajax.markup.html.autocomplete; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.model.IModel; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.markup.head.CssHeaderItem; /** * An {@link AutoCompleteTextField} which automatically includes the default CSS for the http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java index 32e925f..c9a57bb 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java @@ -22,6 +22,8 @@ import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.IInitializer; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; @@ -33,9 +35,7 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.SharedResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; -import org.apache.wicket.resource.header.CssHeaderItem; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java index 51a19f8..2888ab7 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java @@ -25,6 +25,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.IAjaxCallDecorator; import org.apache.wicket.ajax.calldecorator.CancelEventIfNoAjaxDecorator; import org.apache.wicket.markup.ComponentTag; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; @@ -39,8 +40,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.CoreLibrariesContributor; -import org.apache.wicket.resource.header.CssHeaderItem; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.util.lang.EnumeratedType; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.string.Strings; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java index 8e524c3..ef0009b 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java @@ -26,6 +26,7 @@ import org.apache.wicket.extensions.markup.html.form.palette.component.Choices; import org.apache.wicket.extensions.markup.html.form.palette.component.Recorder; import org.apache.wicket.extensions.markup.html.form.palette.component.Selection; import org.apache.wicket.markup.ComponentTag; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -38,8 +39,7 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; -import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java index 2afb561..f52c57a 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java @@ -23,7 +23,7 @@ import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.FormComponent; -import org.apache.wicket.resource.header.OnLoadHeaderItem; +import org.apache.wicket.markup.head.OnLoadHeaderItem; import org.apache.wicket.util.string.Strings; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java index 0e88d2e..5bff6ac 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java @@ -28,6 +28,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.IAjaxLink; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.link.Link; @@ -41,7 +42,6 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; /** * Tree class that contains convenient functions related to presentation of the tree, which includes http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java index 2b2e700..c481afc 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java @@ -26,6 +26,7 @@ import org.apache.wicket.behavior.Behavior; import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree; import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment; import org.apache.wicket.markup.ComponentTag; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -36,7 +37,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.resource.header.OnDomReadyHeaderItem; /** @@ -207,7 +207,7 @@ public class TreeTable extends DefaultAbstractTree public void renderHead(final Component component, final IHeaderResponse response) { response.render(OnDomReadyHeaderItem.forScript("Wicket.TreeTable.attachUpdate(\"" + - getMarkupId() + "\")")); + getMarkupId() + "\")")); } }); } http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java index ce05490..9f799ba 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java @@ -33,7 +33,7 @@ import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.markup.head.CssHeaderItem; /** * Rating component that generates a number of stars where a user can click on to rate something. http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java index 3bd6063..44810f1 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.form.IFormSubmittingComponent; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.markup.head.CssHeaderItem; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java index aa39585..08f4ee9 100644 --- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java +++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java @@ -24,9 +24,9 @@ import org.apache.velocity.app.Velocity; import org.apache.wicket.Component; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.behavior.Behavior; +import org.apache.wicket.markup.head.StringHeaderItem; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.model.IModel; -import org.apache.wicket.resource.header.StringHeaderItem; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; http://git-wip-us.apache.org/repos/asf/wicket/blob/bdbff0c4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java index a2cac35..100215d 100644 --- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java +++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java @@ -22,7 +22,7 @@ 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.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.util.lang.Packages; /**
