You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/18 10:46:42 UTC

git commit: Rename Application.getHeaderContributorListenerCollection() to getHeaderContributorListeners() to be consistent with the other listeners

Updated Branches:
  refs/heads/master d3d432578 -> f583754f9


Rename Application.getHeaderContributorListenerCollection() to getHeaderContributorListeners() to be consistent with the other listeners


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f583754f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f583754f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f583754f

Branch: refs/heads/master
Commit: f583754f9deb35d98ec1229e565ea39cee0e296b
Parents: d3d4325
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jun 18 10:43:22 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jun 18 10:44:24 2013 +0200

----------------------------------------------------------------------
 wicket-core/src/main/java/org/apache/wicket/Application.java   | 6 +++---
 .../java/org/apache/wicket/markup/html/IHeaderContributor.java | 2 +-
 .../markup/renderStrategy/AbstractHeaderRenderStrategy.java    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/f583754f/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index bb39537..5cbbdde 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -918,16 +918,16 @@ public abstract class Application implements UnboundListener, IEventSink
 	private final ComponentInitializationListenerCollection componentInitializationListeners = new ComponentInitializationListenerCollection();
 
 	/** list of {@link IHeaderContributor}s. */
-	private final HeaderContributorListenerCollection headerContributorListenerCollection = new HeaderContributorListenerCollection();
+	private final HeaderContributorListenerCollection headerContributorListeners = new HeaderContributorListenerCollection();
 
 	private final BehaviorInstantiationListenerCollection behaviorInstantiationListeners = new BehaviorInstantiationListenerCollection();
 
 	/**
 	 * @return Gets the application's {@link HeaderContributorListenerCollection}
 	 */
-	public final HeaderContributorListenerCollection getHeaderContributorListenerCollection()
+	public final HeaderContributorListenerCollection getHeaderContributorListeners()
 	{
-		return headerContributorListenerCollection;
+		return headerContributorListeners;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/wicket/blob/f583754f/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
index cf762d4..778ba3c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
@@ -45,7 +45,7 @@ import org.apache.wicket.util.io.IClusterable;
  * 
  * @see IHeaderResponse
  * @see HeaderItem
- * @see Application#getHeaderContributorListenerCollection()
+ * @see Application#getHeaderContributorListeners()
  * 
  * @author Juergen Donnerstag
  * @author Matej Knopp

http://git-wip-us.apache.org/repos/asf/wicket/blob/f583754f/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
index ada6b2f..3f5c17a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
@@ -148,7 +148,7 @@ public abstract class AbstractHeaderRenderStrategy implements IHeaderRenderStrat
 		if (Application.exists())
 		{
 			HeaderContributorListenerCollection headerContributorListenerCollection =
-					Application.get().getHeaderContributorListenerCollection();
+					Application.get().getHeaderContributorListeners();
 			IHeaderResponse headerResponse = headerContainer.getHeaderResponse();
 
 			for (IHeaderContributor listener : headerContributorListenerCollection)