Repository: wicket Updated Branches: refs/heads/master eabc9bd44 -> 7006771da
Optimize imports and code formatting. It seems Eclipse code formatting is totally broken at the moment. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7006771d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7006771d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7006771d Branch: refs/heads/master Commit: 7006771da8b535ffed35154e258fb6fe9dc20485 Parents: eabc9bd Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Feb 26 11:31:40 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Feb 26 11:31:40 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/DequeueContext.java | 1 - .../wicket/markup/html/form/FormComponent.java | 30 ++++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7006771d/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java b/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java index 11327bf..837c5f6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java +++ b/wicket-core/src/main/java/org/apache/wicket/DequeueContext.java @@ -20,7 +20,6 @@ import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupFragment; import org.apache.wicket.markup.MarkupElement; import org.apache.wicket.util.collections.ArrayListStack; -import org.apache.wicket.util.lang.Args; /** * Context for component dequeueing. Keeps track of markup position and container stack. http://git-wip-us.apache.org/repos/asf/wicket/blob/7006771d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java index ece95f1..d5eea24 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java @@ -1621,23 +1621,30 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme if (collection == null) { collection = new ArrayList<>(convertedInput); - formComponent.setDefaultModelObject(collection); + formComponent.setModelObject(collection); } else { boolean modified = false; formComponent.modelChanging(); - - try { + + try + { collection.clear(); if (convertedInput != null) { collection.addAll(convertedInput); } modified = true; - } catch (UnsupportedOperationException unmodifiable) { - logger.debug("An error occurred while trying to modify the collection attached to " + formComponent, unmodifiable); + } + catch (UnsupportedOperationException unmodifiable) + { + if (logger.isDebugEnabled()) + { + logger.debug("An error occurred while trying to modify the collection attached to " + + formComponent, unmodifiable); + } collection = new ArrayList<>(convertedInput); } @@ -1648,10 +1655,15 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme } catch (Exception noSetter) { - if (modified) { - logger.debug("An error occurred while trying to set the collection attached to " + formComponent, noSetter); - } else { - throw new WicketRuntimeException("An error occurred while trying to set the collection attached to " + formComponent, noSetter); + if (modified && logger.isDebugEnabled()) + { + logger.debug("An error occurred while trying to set the collection attached to " + + formComponent, noSetter); + } + else + { + throw new WicketRuntimeException("An error occurred while trying to set the collection attached to " + + formComponent, noSetter); } }
