Repository: wicket Updated Branches: refs/heads/wicket-7.x 4457e505d -> 318b91a06
WICKET-6264 Form: improve error message for disabled/invisible IFormSubmittingComponent and for not rendered components Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/318b91a0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/318b91a0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/318b91a0 Branch: refs/heads/wicket-7.x Commit: 318b91a0679e55c51f925effdf668a02027f52fe Parents: 4457e50 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Oct 31 21:04:46 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Oct 31 21:08:02 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 8 ++++---- wicket-core/src/main/java/org/apache/wicket/Page.java | 8 ++++---- .../java/org/apache/wicket/markup/html/form/Form.java | 10 +++------- 3 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/318b91a0/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 441de32..7fe267e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -3330,11 +3330,11 @@ public abstract class Component else { buffer.append(", page = ") - .append(getPage().getPageClass().getName()) + .append(Classes.name(getPage().getPageClass())) .append(", path = ") - .append(getPath()) - .append('.') - .append(Classes.simpleName(getClass())) + .append(getPageRelativePath()) + .append(", type = ") + .append(Classes.name(getClass())) .append(", isVisible = ") .append((determineVisibility())) .append(", isVersioned = ") http://git-wip-us.apache.org/repos/asf/wicket/blob/318b91a0/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 0935942..6018c3d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -590,17 +590,17 @@ public abstract class Page extends MarkupContainer // Add to explanatory string to buffer buffer.append(Integer.toString(unrenderedComponents.size())) .append(". ") - .append(component) + .append(component.toString(true)) .append('\n'); String metadata = component.getMetaData(Component.CONSTRUCTED_AT_KEY); if (metadata != null) { - buffer.append(metadata); + buffer.append(metadata).append('\n'); } metadata = component.getMetaData(Component.ADDED_AT_KEY); if (metadata != null) { - buffer.append(metadata); + buffer.append(metadata).append('\n'); } } else @@ -664,7 +664,7 @@ public abstract class Page extends MarkupContainer { // Throw exception throw new WicketRuntimeException( - "The component(s) below failed to render. Possible reasons could be that: 1) you have added a component in code but forgot to reference it in the markup (thus the component will never be rendered), 2) if your components were added in a parent container then make sure the markup for the child container includes them in <wicket:extend>.\n\n" + + "The component(s) below failed to render. Possible reasons could be that:\n\t1) you have added a component in code but forgot to reference it in the markup (thus the component will never be rendered),\n\t2) if your components were added in a parent container then make sure the markup for the child container includes them in <wicket:extend>.\n\n" + buffer.toString()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/318b91a0/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index af2e11f..a67304d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -762,21 +762,17 @@ public class Form<T> extends WebMarkupContainer if (!component.isVisibleInHierarchy()) { - Page page = findPage(); throw new WicketRuntimeException("Submit Button " + - submittingComponent.getInputName() + " (path=" + - component.getPath() + ", pageClass=" + - (page == null ? "<unknown>" : page.getPageClass().getName()) + + submittingComponent.getInputName() + " (" + + component.toString(true) + ") is not visible"); } if (!component.isEnabledInHierarchy()) { - Page page = findPage(); throw new WicketRuntimeException("Submit Button " + submittingComponent.getInputName() + " (path=" + - component.getPath() + ", pageClass=" + - (page == null ? "<unknown>" : page.getPageClass().getName()) + + component.toString(true)+ ") is not enabled"); } }
