You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/04/07 15:36:59 UTC
wicket git commit: WICKET-5802 HTML Import
Repository: wicket
Updated Branches:
refs/heads/master 907f891af -> 18a8223f4
WICKET-5802 HTML Import
Reuse code by chaining methods
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/18a8223f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/18a8223f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/18a8223f
Branch: refs/heads/master
Commit: 18a8223f479d8bc0c5ec974a7f5ea5dcc79a7e05
Parents: 907f891
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 7 16:35:55 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 7 16:35:55 2015 +0300
----------------------------------------------------------------------
.../wicket/markup/head/HtmlImportHeaderItem.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/18a8223f/wicket-core/src/main/java/org/apache/wicket/markup/head/HtmlImportHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/HtmlImportHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/HtmlImportHeaderItem.java
index 6e415fa..9e0261f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/HtmlImportHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/HtmlImportHeaderItem.java
@@ -152,7 +152,7 @@ public class HtmlImportHeaderItem extends MetaDataHeaderItem
*/
public static MetaDataHeaderItem forImportLinkTag(Class<? extends Page> pageClass)
{
- return forImportLinkTag(Model.of(RequestCycle.get().urlFor(pageClass, null).toString()));
+ return forImportLinkTag(pageClass, null);
}
/**
@@ -167,8 +167,7 @@ public class HtmlImportHeaderItem extends MetaDataHeaderItem
public static MetaDataHeaderItem forImportLinkTag(Class<? extends Page> pageClass,
PageParameters pageParameters)
{
- return forImportLinkTag(Model.of(RequestCycle.get().urlFor(pageClass,
- pageParameters).toString()));
+ return forImportLinkTag(pageClass, pageParameters, false);
}
/**
@@ -185,12 +184,7 @@ public class HtmlImportHeaderItem extends MetaDataHeaderItem
public static MetaDataHeaderItem forImportLinkTag(Class<? extends Page> pageClass,
PageParameters pageParameters, boolean async)
{
- MetaDataHeaderItem linkTag = forImportLinkTag(Model.of(RequestCycle.get().urlFor(pageClass,
- pageParameters).toString()));
-
- addAsyncAttribute(linkTag, async);
-
- return linkTag;
+ return forImportLinkTag(pageClass, pageParameters, (String)null, async);
}
/**
@@ -243,8 +237,7 @@ public class HtmlImportHeaderItem extends MetaDataHeaderItem
public static MetaDataHeaderItem forImportLinkTag(Class<? extends Page> pageClass,
PageParameters pageParameters, IModel<String> media)
{
- return forLinkTag(Model.of("import"),
- Model.of(RequestCycle.get().urlFor(pageClass, pageParameters).toString()), media);
+ return forImportLinkTag(pageClass, pageParameters, media, false);
}
/**