You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/06/10 21:28:01 UTC

svn commit: r545920 - in /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: Component.java MarkupContainer.java

Author: almaw
Date: Sun Jun 10 12:28:00 2007
New Revision: 545920

URL: http://svn.apache.org/viewvc?view=rev&rev=545920
Log:
Back out WICKET-627 semi-fix for the moment.

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=545920&r1=545919&r2=545920
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Sun Jun 10 12:28:00 2007
@@ -3523,14 +3523,12 @@
 	}
 
 	/**
-	 * This method is here primarily for {@link MarkupContainer}. It is broken out
-	 * of {@link #onBeforeRender()} so we can guarantee that it executes as the
+	 * This method is here for {@link MarkupContainer}. It is broken out of
+	 * {@link #onBeforeRender()} so we can guarantee that it executes as the
 	 * last in onBeforeRender() chain no matter where user places the
 	 * <code>super.onBeforeRender()</code> call.
-	 * 
-	 * See WICKET-627 for why this is now protected.
 	 */
-	protected void onBeforeRenderChildren()
+	void onBeforeRenderChildren()
 	{
 	}
 

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?view=diff&rev=545920&r1=545919&r2=545920
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Sun Jun 10 12:28:00 2007
@@ -1433,7 +1433,7 @@
 		super.detachChildren();
 	}
 
-	protected void onBeforeRenderChildren()
+	void onBeforeRenderChildren()
 	{
 		super.onBeforeRenderChildren();
 		try