/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.wicket.feedback;

import org.apache.wicket.MarkupContainer;

/**
 * Filter for child-of relationship
 * 
 * @author Jonathan Locke
 * @author Johan Compagner
 */
public class ContainerFeedbackMessageFilter implements IFeedbackMessageFilter
{
	private static final long serialVersionUID = 1L;

	private final MarkupContainer container;

	/**
	 * Constructor
	 * 
	 * @param container
	 *            The container that message reporters must be a child of
	 */
	public ContainerFeedbackMessageFilter(MarkupContainer container)
	{
		if (container == null)
		{
			throw new IllegalArgumentException("container must be not null");
		}
		this.container = container;
	}

	/**
	 * @see org.apache.wicket.feedback.IFeedbackMessageFilter#accept(org.apache.wicket.feedback.FeedbackMessage)
	 */
	public boolean accept(FeedbackMessage message)
	{
		if (message.getReporter() == null)
		{
			return false;
		}
		else
		{
			return container.contains(message.getReporter(), true) ||
				container == message.getReporter();
		}
	}
}

@@ -858,31 +858,111 @@
 .wicket.
-MarkupContainer
+Component;%0Aimport org.apache.wicket.MarkupContainer;%0Aimport org.apache.wicket.util.lang.Objects
 ;%0A%0A/**%0A 
@@ -1736,89 +1736,99 @@
 %7B%0A%09%09
-if (message.getReporter() == null)%0A%09%09%7B%0A%09%09%09return false;%0A%09%09%7D%0A%09%09else%0A%09%09%7B%0A%09%09%09return 
+final Component reporter = message.getReporter();%0A%0A%09%09return reporter != null && %0A%09%09       (
 cont
@@ -1842,37 +1842,24 @@
 ontains(
-message.getR
+r
 eporter
-()
 , true) 
@@ -1864,53 +1864,46 @@
 ) %7C%7C
-%0A%09%09%09%09container == message.getR
+ Objects.equal(container, r
 eporter
-(
+)
 );%0A
-%09%09%7D%0A
 %09%7D%0A%7D

use Objects.equal instead of == for object comparison