You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wicket.apache.org by Igor Vaynberg <ig...@gmail.com> on 2012/01/09 17:18:27 UTC
Re: [2/2] git commit: WICKET-4329 Optimize consequent usages of
MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
why not remove hasAssociatedMarkup()?
-igor
On Mon, Jan 9, 2012 at 1:18 AM, <mg...@apache.org> wrote:
> WICKET-4329
> Optimize consequent usages of MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
>
>
> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/666b26c6
> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/666b26c6
> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/666b26c6
>
> Branch: refs/heads/master
> Commit: 666b26c6026c620dab25c768c1969aafdcfb7935
> Parents: 77749d8
> Author: martin-g <mg...@apache.org>
> Authored: Mon Jan 9 11:17:32 2012 +0200
> Committer: martin-g <mg...@apache.org>
> Committed: Mon Jan 9 11:17:32 2012 +0200
>
> ----------------------------------------------------------------------
> .../src/main/java/org/apache/wicket/Component.java | 6 ++++--
> .../html/panel/FragmentMarkupSourcingStrategy.java | 6 ++++--
> 2 files changed, 8 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/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 8725706..05c7822 100644
> --- a/wicket-core/src/main/java/org/apache/wicket/Component.java
> +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
> @@ -39,6 +39,7 @@ import org.apache.wicket.feedback.FeedbackMessage;
> import org.apache.wicket.feedback.IFeedback;
> import org.apache.wicket.markup.ComponentTag;
> import org.apache.wicket.markup.IMarkupFragment;
> +import org.apache.wicket.markup.Markup;
> import org.apache.wicket.markup.MarkupCache;
> import org.apache.wicket.markup.MarkupElement;
> import org.apache.wicket.markup.MarkupException;
> @@ -714,9 +715,10 @@ public abstract class Component
> if (this instanceof MarkupContainer)
> {
> MarkupContainer container = (MarkupContainer)this;
> - if (container.hasAssociatedMarkup())
> + Markup associatedMarkup = container.getAssociatedMarkup();
> + if (associatedMarkup != null)
> {
> - markup = container.getAssociatedMarkup();
> + markup = associatedMarkup;
> return markup;
> }
> }
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
> ----------------------------------------------------------------------
> diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
> index 07f4075..8a6cd94 100644
> --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
> +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
> @@ -20,6 +20,7 @@ import org.apache.wicket.Component;
> import org.apache.wicket.MarkupContainer;
> import org.apache.wicket.markup.ComponentTag;
> import org.apache.wicket.markup.IMarkupFragment;
> +import org.apache.wicket.markup.Markup;
> import org.apache.wicket.markup.MarkupException;
> import org.apache.wicket.markup.MarkupNotFoundException;
> import org.apache.wicket.markup.MarkupStream;
> @@ -126,9 +127,10 @@ public class FragmentMarkupSourcingStrategy extends AbstractMarkupSourcingStrate
> {
> // There is one more option if the markup provider has associated markup
> MarkupContainer markupProvider = getMarkupProvider(container);
> - if (markupProvider.hasAssociatedMarkup())
> + Markup associatedMarkup = markupProvider.getAssociatedMarkup();
> + if (associatedMarkup != null)
> {
> - markup = markupProvider.getAssociatedMarkup();
> + markup = associatedMarkup;
> if (markup != null)
> {
> childMarkup = markup.find(markupId);
>
Re: [2/2] git commit: WICKET-4329 Optimize consequent usages of
MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
Posted by Martin Grigorov <mg...@apache.org>.
Done
On Mon, Jan 9, 2012 at 6:54 PM, Igor Vaynberg <ig...@gmail.com> wrote:
> yep
>
> -igor
>
> On Mon, Jan 9, 2012 at 8:25 AM, Martin Grigorov <mg...@apache.org> wrote:
>> On Mon, Jan 9, 2012 at 6:18 PM, Igor Vaynberg <ig...@gmail.com> wrote:
>>> why not remove hasAssociatedMarkup()?
>>
>> it is used in one more place only as "has"...
>> I guess we can replace it too with : if (getAM() != null), deprecate
>> it in 1.5 and remove it in 6.0
>>
>>>
>>> -igor
>>>
>>> On Mon, Jan 9, 2012 at 1:18 AM, <mg...@apache.org> wrote:
>>>> WICKET-4329
>>>> Optimize consequent usages of MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
>>>>
>>>>
>>>> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
>>>> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/666b26c6
>>>> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/666b26c6
>>>> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/666b26c6
>>>>
>>>> Branch: refs/heads/master
>>>> Commit: 666b26c6026c620dab25c768c1969aafdcfb7935
>>>> Parents: 77749d8
>>>> Author: martin-g <mg...@apache.org>
>>>> Authored: Mon Jan 9 11:17:32 2012 +0200
>>>> Committer: martin-g <mg...@apache.org>
>>>> Committed: Mon Jan 9 11:17:32 2012 +0200
>>>>
>>>> ----------------------------------------------------------------------
>>>> .../src/main/java/org/apache/wicket/Component.java | 6 ++++--
>>>> .../html/panel/FragmentMarkupSourcingStrategy.java | 6 ++++--
>>>> 2 files changed, 8 insertions(+), 4 deletions(-)
>>>> ----------------------------------------------------------------------
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/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 8725706..05c7822 100644
>>>> --- a/wicket-core/src/main/java/org/apache/wicket/Component.java
>>>> +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
>>>> @@ -39,6 +39,7 @@ import org.apache.wicket.feedback.FeedbackMessage;
>>>> import org.apache.wicket.feedback.IFeedback;
>>>> import org.apache.wicket.markup.ComponentTag;
>>>> import org.apache.wicket.markup.IMarkupFragment;
>>>> +import org.apache.wicket.markup.Markup;
>>>> import org.apache.wicket.markup.MarkupCache;
>>>> import org.apache.wicket.markup.MarkupElement;
>>>> import org.apache.wicket.markup.MarkupException;
>>>> @@ -714,9 +715,10 @@ public abstract class Component
>>>> if (this instanceof MarkupContainer)
>>>> {
>>>> MarkupContainer container = (MarkupContainer)this;
>>>> - if (container.hasAssociatedMarkup())
>>>> + Markup associatedMarkup = container.getAssociatedMarkup();
>>>> + if (associatedMarkup != null)
>>>> {
>>>> - markup = container.getAssociatedMarkup();
>>>> + markup = associatedMarkup;
>>>> return markup;
>>>> }
>>>> }
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>>> ----------------------------------------------------------------------
>>>> diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>>> index 07f4075..8a6cd94 100644
>>>> --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>>> +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>>> @@ -20,6 +20,7 @@ import org.apache.wicket.Component;
>>>> import org.apache.wicket.MarkupContainer;
>>>> import org.apache.wicket.markup.ComponentTag;
>>>> import org.apache.wicket.markup.IMarkupFragment;
>>>> +import org.apache.wicket.markup.Markup;
>>>> import org.apache.wicket.markup.MarkupException;
>>>> import org.apache.wicket.markup.MarkupNotFoundException;
>>>> import org.apache.wicket.markup.MarkupStream;
>>>> @@ -126,9 +127,10 @@ public class FragmentMarkupSourcingStrategy extends AbstractMarkupSourcingStrate
>>>> {
>>>> // There is one more option if the markup provider has associated markup
>>>> MarkupContainer markupProvider = getMarkupProvider(container);
>>>> - if (markupProvider.hasAssociatedMarkup())
>>>> + Markup associatedMarkup = markupProvider.getAssociatedMarkup();
>>>> + if (associatedMarkup != null)
>>>> {
>>>> - markup = markupProvider.getAssociatedMarkup();
>>>> + markup = associatedMarkup;
>>>> if (markup != null)
>>>> {
>>>> childMarkup = markup.find(markupId);
>>>>
>>
>>
>>
>> --
>> Martin Grigorov
>> jWeekend
>> Training, Consulting, Development
>> http://jWeekend.com
--
Martin Grigorov
jWeekend
Training, Consulting, Development
http://jWeekend.com
Re: [2/2] git commit: WICKET-4329 Optimize consequent usages of
MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
Posted by Igor Vaynberg <ig...@gmail.com>.
yep
-igor
On Mon, Jan 9, 2012 at 8:25 AM, Martin Grigorov <mg...@apache.org> wrote:
> On Mon, Jan 9, 2012 at 6:18 PM, Igor Vaynberg <ig...@gmail.com> wrote:
>> why not remove hasAssociatedMarkup()?
>
> it is used in one more place only as "has"...
> I guess we can replace it too with : if (getAM() != null), deprecate
> it in 1.5 and remove it in 6.0
>
>>
>> -igor
>>
>> On Mon, Jan 9, 2012 at 1:18 AM, <mg...@apache.org> wrote:
>>> WICKET-4329
>>> Optimize consequent usages of MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/666b26c6
>>> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/666b26c6
>>> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/666b26c6
>>>
>>> Branch: refs/heads/master
>>> Commit: 666b26c6026c620dab25c768c1969aafdcfb7935
>>> Parents: 77749d8
>>> Author: martin-g <mg...@apache.org>
>>> Authored: Mon Jan 9 11:17:32 2012 +0200
>>> Committer: martin-g <mg...@apache.org>
>>> Committed: Mon Jan 9 11:17:32 2012 +0200
>>>
>>> ----------------------------------------------------------------------
>>> .../src/main/java/org/apache/wicket/Component.java | 6 ++++--
>>> .../html/panel/FragmentMarkupSourcingStrategy.java | 6 ++++--
>>> 2 files changed, 8 insertions(+), 4 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/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 8725706..05c7822 100644
>>> --- a/wicket-core/src/main/java/org/apache/wicket/Component.java
>>> +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
>>> @@ -39,6 +39,7 @@ import org.apache.wicket.feedback.FeedbackMessage;
>>> import org.apache.wicket.feedback.IFeedback;
>>> import org.apache.wicket.markup.ComponentTag;
>>> import org.apache.wicket.markup.IMarkupFragment;
>>> +import org.apache.wicket.markup.Markup;
>>> import org.apache.wicket.markup.MarkupCache;
>>> import org.apache.wicket.markup.MarkupElement;
>>> import org.apache.wicket.markup.MarkupException;
>>> @@ -714,9 +715,10 @@ public abstract class Component
>>> if (this instanceof MarkupContainer)
>>> {
>>> MarkupContainer container = (MarkupContainer)this;
>>> - if (container.hasAssociatedMarkup())
>>> + Markup associatedMarkup = container.getAssociatedMarkup();
>>> + if (associatedMarkup != null)
>>> {
>>> - markup = container.getAssociatedMarkup();
>>> + markup = associatedMarkup;
>>> return markup;
>>> }
>>> }
>>>
>>> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>> ----------------------------------------------------------------------
>>> diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>> index 07f4075..8a6cd94 100644
>>> --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>> +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>>> @@ -20,6 +20,7 @@ import org.apache.wicket.Component;
>>> import org.apache.wicket.MarkupContainer;
>>> import org.apache.wicket.markup.ComponentTag;
>>> import org.apache.wicket.markup.IMarkupFragment;
>>> +import org.apache.wicket.markup.Markup;
>>> import org.apache.wicket.markup.MarkupException;
>>> import org.apache.wicket.markup.MarkupNotFoundException;
>>> import org.apache.wicket.markup.MarkupStream;
>>> @@ -126,9 +127,10 @@ public class FragmentMarkupSourcingStrategy extends AbstractMarkupSourcingStrate
>>> {
>>> // There is one more option if the markup provider has associated markup
>>> MarkupContainer markupProvider = getMarkupProvider(container);
>>> - if (markupProvider.hasAssociatedMarkup())
>>> + Markup associatedMarkup = markupProvider.getAssociatedMarkup();
>>> + if (associatedMarkup != null)
>>> {
>>> - markup = markupProvider.getAssociatedMarkup();
>>> + markup = associatedMarkup;
>>> if (markup != null)
>>> {
>>> childMarkup = markup.find(markupId);
>>>
>
>
>
> --
> Martin Grigorov
> jWeekend
> Training, Consulting, Development
> http://jWeekend.com
Re: [2/2] git commit: WICKET-4329 Optimize consequent usages of
MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
Posted by Martin Grigorov <mg...@apache.org>.
On Mon, Jan 9, 2012 at 6:18 PM, Igor Vaynberg <ig...@gmail.com> wrote:
> why not remove hasAssociatedMarkup()?
it is used in one more place only as "has"...
I guess we can replace it too with : if (getAM() != null), deprecate
it in 1.5 and remove it in 6.0
>
> -igor
>
> On Mon, Jan 9, 2012 at 1:18 AM, <mg...@apache.org> wrote:
>> WICKET-4329
>> Optimize consequent usages of MarkupContainer# hasAssociatedMarkup() and #getAssociatedMapkup()
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/666b26c6
>> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/666b26c6
>> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/666b26c6
>>
>> Branch: refs/heads/master
>> Commit: 666b26c6026c620dab25c768c1969aafdcfb7935
>> Parents: 77749d8
>> Author: martin-g <mg...@apache.org>
>> Authored: Mon Jan 9 11:17:32 2012 +0200
>> Committer: martin-g <mg...@apache.org>
>> Committed: Mon Jan 9 11:17:32 2012 +0200
>>
>> ----------------------------------------------------------------------
>> .../src/main/java/org/apache/wicket/Component.java | 6 ++++--
>> .../html/panel/FragmentMarkupSourcingStrategy.java | 6 ++++--
>> 2 files changed, 8 insertions(+), 4 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/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 8725706..05c7822 100644
>> --- a/wicket-core/src/main/java/org/apache/wicket/Component.java
>> +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
>> @@ -39,6 +39,7 @@ import org.apache.wicket.feedback.FeedbackMessage;
>> import org.apache.wicket.feedback.IFeedback;
>> import org.apache.wicket.markup.ComponentTag;
>> import org.apache.wicket.markup.IMarkupFragment;
>> +import org.apache.wicket.markup.Markup;
>> import org.apache.wicket.markup.MarkupCache;
>> import org.apache.wicket.markup.MarkupElement;
>> import org.apache.wicket.markup.MarkupException;
>> @@ -714,9 +715,10 @@ public abstract class Component
>> if (this instanceof MarkupContainer)
>> {
>> MarkupContainer container = (MarkupContainer)this;
>> - if (container.hasAssociatedMarkup())
>> + Markup associatedMarkup = container.getAssociatedMarkup();
>> + if (associatedMarkup != null)
>> {
>> - markup = container.getAssociatedMarkup();
>> + markup = associatedMarkup;
>> return markup;
>> }
>> }
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/666b26c6/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>> ----------------------------------------------------------------------
>> diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>> index 07f4075..8a6cd94 100644
>> --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>> +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FragmentMarkupSourcingStrategy.java
>> @@ -20,6 +20,7 @@ import org.apache.wicket.Component;
>> import org.apache.wicket.MarkupContainer;
>> import org.apache.wicket.markup.ComponentTag;
>> import org.apache.wicket.markup.IMarkupFragment;
>> +import org.apache.wicket.markup.Markup;
>> import org.apache.wicket.markup.MarkupException;
>> import org.apache.wicket.markup.MarkupNotFoundException;
>> import org.apache.wicket.markup.MarkupStream;
>> @@ -126,9 +127,10 @@ public class FragmentMarkupSourcingStrategy extends AbstractMarkupSourcingStrate
>> {
>> // There is one more option if the markup provider has associated markup
>> MarkupContainer markupProvider = getMarkupProvider(container);
>> - if (markupProvider.hasAssociatedMarkup())
>> + Markup associatedMarkup = markupProvider.getAssociatedMarkup();
>> + if (associatedMarkup != null)
>> {
>> - markup = markupProvider.getAssociatedMarkup();
>> + markup = associatedMarkup;
>> if (markup != null)
>> {
>> childMarkup = markup.find(markupId);
>>
--
Martin Grigorov
jWeekend
Training, Consulting, Development
http://jWeekend.com