You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2018/01/05 17:58:32 UTC
[5/5] wicket git commit: [WICKET-6498] missing serialVersionUID is
added, whitespaces are fixed, IWrappedHeaderItem handling is added
[WICKET-6498] missing serialVersionUID is added, whitespaces are fixed, IWrappedHeaderItem handling is added
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f2bd9727
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f2bd9727
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f2bd9727
Branch: refs/heads/WICKET-6498_deferred_javascript
Commit: f2bd97270699f35ef1bb7a83bfcdc01bff530dbe
Parents: e4b969f
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Jan 6 00:58:19 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Jan 6 00:58:19 2018 +0700
----------------------------------------------------------------------
.../wicket/markup/head/PriorityHeaderItem.java | 5 ++--
.../wicket/markup/head/ResourceAggregator.java | 30 ++++++++++++--------
2 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f2bd9727/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 93813e0..1b357eb 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
@@ -26,16 +26,17 @@ import org.apache.wicket.request.Response;
* {@link HeaderItem} that has priority over other header items. {@code PriorityHeaderItem}s
* rendered parent-first at the beginning of the header. Dependencies of a
* {@code PriorityHeaderItem} also have priority.
- *
+ *
* @author papegaaij
*/
public class PriorityHeaderItem extends HeaderItem implements IWrappedHeaderItem
{
+ private static final long serialVersionUID = 1L;
private HeaderItem wrapped;
/**
* Construct.
- *
+ *
* @param wrapped
* the actual {@link HeaderItem} that should have priority
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/f2bd9727/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
index 2257e12..d71e26d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java
@@ -40,7 +40,7 @@ import org.apache.wicket.util.lang.Classes;
* {@code ResourceAggregator} implements resource dependencies, resource bundles and sorting of
* resources. During the rendering of components, all {@link HeaderItem}s are
* {@linkplain RecordedHeaderItem recorded} and processed at the end.
- *
+ *
* @author papegaaij
*/
public class ResourceAggregator extends DecoratingHeaderResponse
@@ -49,7 +49,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
* The location in which a {@link HeaderItem} is added, consisting of the component/behavior
* that added the item, the index in the list for that component/behavior at which the item was
* added and the index in the request.
- *
+ *
* @author papegaaij
*/
public static class RecordedHeaderItemLocation
@@ -60,7 +60,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
/**
* Construct.
- *
+ *
* @param renderBase
* The component or behavior that added the item.
* @param indexInRenderBase
@@ -111,7 +111,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
/**
* Contains information about an {@link HeaderItem} that must be rendered.
- *
+ *
* @author papegaaij
*/
public static class RecordedHeaderItem
@@ -122,7 +122,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
/**
* Construct.
- *
+ *
* @param item
*/
public RecordedHeaderItem(HeaderItem item)
@@ -133,7 +133,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
/**
* Records a location at which the item was added.
- *
+ *
* @param renderBase
* The component or behavior that added the item.
* @param indexInRenderBase
@@ -186,7 +186,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
/**
* Construct.
- *
+ *
* @param real
*/
public ResourceAggregator(IHeaderResponse real)
@@ -223,9 +223,15 @@ public class ResourceAggregator extends DecoratingHeaderResponse
private void recordHeaderItem(HeaderItem item, Set<HeaderItem> depsDone)
{
- if (item instanceof AbstractJavaScriptReferenceHeaderItem) {
- ((AbstractJavaScriptReferenceHeaderItem) item).setDefer(true);
- }
+ if (item instanceof AbstractJavaScriptReferenceHeaderItem) {
+ ((AbstractJavaScriptReferenceHeaderItem)item).setDefer(true);
+ }
+ if (item instanceof IWrappedHeaderItem) {
+ HeaderItem wrapped = ((IWrappedHeaderItem)item).getWrapped();
+ if (wrapped instanceof AbstractJavaScriptReferenceHeaderItem) {
+ ((AbstractJavaScriptReferenceHeaderItem)wrapped).setDefer(true);
+ }
+ }
renderDependencies(item, depsDone);
RecordedHeaderItem recordedItem = itemsToBeRendered.get(item);
@@ -405,7 +411,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
* Resolves the actual item that needs to be rendered for the given item. This can be a
* {@link NoHeaderItem} when the item was already rendered. It can also be a bundle or the item
* itself, when it is not part of a bundle.
- *
+ *
* @param item
* @return The item to be rendered
*/
@@ -479,7 +485,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse
* @param bundle The bundle that represents the replacement
* @return the bundle with the preserved details
*/
- private HeaderItem preserveJavaScriptDetails(JavaScriptReferenceHeaderItem item, JavaScriptReferenceHeaderItem bundle)
+ private static HeaderItem preserveJavaScriptDetails(JavaScriptReferenceHeaderItem item, JavaScriptReferenceHeaderItem bundle)
{
HeaderItem resultBundle;
ResourceReference bundleReference = bundle.getReference();