Updated Branches: refs/heads/master 7effdc8c0 -> 2746e87a4
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/2746e87a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2746e87a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2746e87a Branch: refs/heads/master Commit: 2746e87a40aa35cf70f4dd316d2245d74438f2a9 Parents: 7effdc8 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:43:10 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/2746e87a/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 57d472d..e70f934 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -683,7 +683,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/2746e87a/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 d2927eb..aafda67 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -920,7 +920,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/2746e87a/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 01b2190..f7109ec 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -590,7 +590,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) {
