Updated Branches: refs/heads/wicket-1.5.x fa70c90aa -> 0e719b534
WICKET-4722 Don't set ADDED_AT and CONSTRUCTED_AT keys if components use checking is not enabled Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0e719b53 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0e719b53 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0e719b53 Branch: refs/heads/wicket-1.5.x Commit: 0e719b534b9e460663f3ff5033a7896ec838b3cc Parents: fa70c90 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Aug 22 10:42:32 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Aug 22 10:45:33 2012 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 2 +- .../java/org/apache/wicket/MarkupContainer.java | 2 +- .../src/main/java/org/apache/wicket/Page.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0e719b53/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index f784cdb..0f0ab76 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -679,7 +679,7 @@ public abstract class Component getApplication().getComponentInstantiationListeners().onInstantiation(this); final IDebugSettings debugSettings = getApplication().getDebugSettings(); - if (debugSettings.isLinePreciseReportingOnNewComponentEnabled()) + if (debugSettings.isLinePreciseReportingOnNewComponentEnabled() && debugSettings.getComponentUseCheck()) { setMetaData(CONSTRUCTED_AT_KEY, ComponentStrings.toString(this, new MarkupException("constructed"))); http://git-wip-us.apache.org/repos/asf/wicket/blob/0e719b53/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 96829a9..c7ce9b5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -919,7 +919,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp child.setParent(this); final IDebugSettings debugSettings = Application.get().getDebugSettings(); - if (debugSettings.isLinePreciseReportingOnAddComponentEnabled()) + if (debugSettings.isLinePreciseReportingOnAddComponentEnabled() && debugSettings.getComponentUseCheck()) { child.setMetaData(ADDED_AT_KEY, ComponentStrings.toString(child, new MarkupException("added"))); http://git-wip-us.apache.org/repos/asf/wicket/blob/0e719b53/wicket-core/src/main/java/org/apache/wicket/Page.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java index 8a6a65b..7bd97c8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -615,7 +615,7 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, buffer.append(Integer.toString(unrenderedComponents.size())) .append(". ") .append(component) - .append("\n"); + .append('\n'); String metadata = component.getMetaData(Component.CONSTRUCTED_AT_KEY); if (metadata != null) {
