Updated Branches: refs/heads/master 00623c372 -> a14fd5000
Introduce IWrappedHeaderItem that marks a HeaderItem as delegator Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7eef3bec Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7eef3bec Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7eef3bec Branch: refs/heads/master Commit: 7eef3becf84183598cdbe799860f41e20f1b76a6 Parents: 1e9ee6d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed May 16 09:04:12 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed May 16 09:09:15 2012 +0200 ---------------------------------------------------------------------- .../wicket/markup/head/IWrappedHeaderItem.java | 30 +++++++++++++++ .../wicket/markup/head/PriorityHeaderItem.java | 2 +- .../markup/head/filter/FilteredHeaderItem.java | 3 +- 3 files changed, 33 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7eef3bec/wicket-core/src/main/java/org/apache/wicket/markup/head/IWrappedHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/IWrappedHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/IWrappedHeaderItem.java new file mode 100644 index 0000000..35b2ce2 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/IWrappedHeaderItem.java @@ -0,0 +1,30 @@ +/* + * 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.markup.head; + +/** + * An interface for all HeaderItems which delegate to another HeaderItem + * + * @since 6.0 + */ +public interface IWrappedHeaderItem +{ + /** + * @return the wrapped header item + */ + HeaderItem getWrapped(); +} http://git-wip-us.apache.org/repos/asf/wicket/blob/7eef3bec/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityHeaderItem.java index cd7164e..352ca5f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/PriorityHeaderItem.java @@ -28,7 +28,7 @@ import org.apache.wicket.request.Response; * * @author papegaaij */ -public class PriorityHeaderItem extends HeaderItem +public class PriorityHeaderItem extends HeaderItem implements IWrappedHeaderItem { private HeaderItem wrapped; http://git-wip-us.apache.org/repos/asf/wicket/blob/7eef3bec/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java index 48ccfea..91803e0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.wicket.markup.head.HeaderItem; +import org.apache.wicket.markup.head.IWrappedHeaderItem; import org.apache.wicket.request.Response; /** @@ -31,7 +32,7 @@ import org.apache.wicket.request.Response; * * @author papegaaij */ -public class FilteredHeaderItem extends HeaderItem +public class FilteredHeaderItem extends HeaderItem implements IWrappedHeaderItem { private HeaderItem wrapped;
