Minor improvements
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9df43e9f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9df43e9f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9df43e9f Branch: refs/heads/master Commit: 9df43e9f3e8c17592499103301d5a1ab1badf60b Parents: ac2d039 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Feb 6 13:39:54 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Feb 6 13:39:54 2012 +0200 ---------------------------------------------------------------------- .../apache/wicket/markup/MarkupResourceStream.java | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9df43e9f/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java index a1678ae..c14fb28 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java @@ -23,6 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.wicket.Component; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.lang.WicketObjects; import org.apache.wicket.util.resource.IFixedLocationResourceStream; @@ -68,7 +69,7 @@ public class MarkupResourceStream implements IResourceStream, IFixedLocationReso /** In case of the inherited markup, this is the base markup */ private transient Markup baseMarkup; - /** The encoding as found in <?xml ... encoding="" ?>. Null, else */ + /** The encoding as found in <?xml ... encoding="" ?>. {@code null}, otherwise */ private String encoding; /** Wicket namespace: see WICKET_XHTML_DTD */ @@ -100,15 +101,10 @@ public class MarkupResourceStream implements IResourceStream, IFixedLocationReso public MarkupResourceStream(final IResourceStream resourceStream, final ContainerInfo containerInfo, final Class<?> markupClass) { - this.resourceStream = resourceStream; + this.resourceStream = Args.notNull(resourceStream, "resourceStream"); this.containerInfo = containerInfo; markupClassName = markupClass == null ? null : markupClass.getName(); - if (resourceStream == null) - { - throw new IllegalArgumentException("Parameter 'resourceStream' must not be null"); - } - setWicketNamespace(MarkupParser.WICKET); } @@ -267,7 +263,7 @@ public class MarkupResourceStream implements IResourceStream, IFixedLocationReso this.wicketNamespace = wicketNamespace; wicketId = wicketNamespace + ":id"; - if (!MarkupParser.WICKET.equals(wicketNamespace)) + if (!MarkupParser.WICKET.equals(wicketNamespace) && log.isDebugEnabled()) { log.debug("You are using a non-standard namespace name: '{}'", wicketNamespace); } @@ -386,7 +382,7 @@ public class MarkupResourceStream implements IResourceStream, IFixedLocationReso } /** - * @see href http://www.w3.org/TR/html5-diff/#doctype + * @see <a href="http://www.w3.org/TR/html5-diff/#doctype";>DOCTYPE</a> * @return True, if doctype == <!DOCTYPE html> */ public boolean isHtml5()
