You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/06/20 22:58:37 UTC
svn commit: r549232 -
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
Author: ivaynberg
Date: Wed Jun 20 13:58:36 2007
New Revision: 549232
URL: http://svn.apache.org/viewvc?view=rev&rev=549232
Log:
destroy()->ondestroy()
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java?view=diff&rev=549232&r1=549231&r2=549232
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java Wed Jun 20 13:58:36 2007
@@ -779,13 +779,24 @@
/**
* Called when wicket servlet is destroyed. Overrides do not have to call
* super.
+ *
+ * @deprecated use {@link #onDestroy()} instead
*/
- protected void destroy()
+ protected final void destroy()
{
-
+
}
/**
+ * Called when wicket servlet is destroyed. Overrides do not have to call
+ * super.
+ */
+ protected void onDestroy()
+ {
+ }
+
+
+ /**
* @return Request cycle factory for this kind of session.
*/
protected abstract IRequestCycleFactory getRequestCycleFactory();
@@ -812,8 +823,8 @@
{
// Clear property resolver cache of Class keys.
PropertyResolver.destroy(this);
-
- destroy();
+
+ onDestroy();
callDestroyers();
applicationKeyToApplication.remove(getApplicationKey());
}
@@ -828,7 +839,7 @@
{
settingsAccessible = true;
IPageSettings pageSettings = getPageSettings();
-
+
// Set up the property resolver with a new cache instance for this app.
PropertyResolver.init(this);
@@ -901,34 +912,36 @@
componentInstantiationListeners[i].onInstantiation(component);
}
}
-
+
private List componentOnBeforeRenderListeners = null;
-
+
/**
- * Adds an {@link IComponentOnBeforeRenderListener}. This method should typicaly only
- * be called during application startup; it is not thread safe.
+ * Adds an {@link IComponentOnBeforeRenderListener}. This method should
+ * typicaly only be called during application startup; it is not thread
+ * safe.
*
* @param listener
*/
- final public void addComponentOnBeforeRenderListener(IComponentOnBeforeRenderListener listener)
+ final public void addComponentOnBeforeRenderListener(IComponentOnBeforeRenderListener listener)
{
if (componentOnBeforeRenderListeners == null)
{
componentOnBeforeRenderListeners = new ArrayList();
}
-
+
if (componentOnBeforeRenderListeners.contains(listener) == false)
{
componentOnBeforeRenderListeners.add(listener);
}
}
-
+
/**
* Removes an {@link IComponentOnBeforeRenderListener}.
- *
+ *
* @param listener
*/
- final public void removeComponentOnBeforeRenderListener(IComponentOnBeforeRenderListener listener)
+ final public void removeComponentOnBeforeRenderListener(
+ IComponentOnBeforeRenderListener listener)
{
if (componentOnBeforeRenderListeners != null)
{
@@ -939,48 +952,50 @@
}
}
}
-
+
/**
* Notifies the {@link IComponentOnBeforeRenderListener}s.
*
* @param component
*/
- final void notifyComponentOnBeforeRenderListeners(Component component)
+ final void notifyComponentOnBeforeRenderListeners(Component component)
{
if (componentOnBeforeRenderListeners != null)
{
for (Iterator i = componentOnBeforeRenderListeners.iterator(); i.hasNext();)
{
- IComponentOnBeforeRenderListener listener = (IComponentOnBeforeRenderListener) i.next();
+ IComponentOnBeforeRenderListener listener = (IComponentOnBeforeRenderListener)i
+ .next();
listener.onBeforeRender(component);
}
}
}
-
+
private List componentOnAfterRenderListeners = null;
-
+
/**
- * Adds an {@link IComponentOnAfterRenderListener}. This method should typicaly only
- * be called during application startup; it is not thread safe.
+ * Adds an {@link IComponentOnAfterRenderListener}. This method should
+ * typicaly only be called during application startup; it is not thread
+ * safe.
*
* @param listener
*/
- final public void addComponentOnAfterRenderListener(IComponentOnAfterRenderListener listener)
+ final public void addComponentOnAfterRenderListener(IComponentOnAfterRenderListener listener)
{
if (componentOnAfterRenderListeners == null)
{
componentOnAfterRenderListeners = new ArrayList();
}
-
+
if (componentOnAfterRenderListeners.contains(listener) == false)
{
componentOnAfterRenderListeners.add(listener);
}
}
-
+
/**
* Removes an {@link IComponentOnAfterRenderListener}.
- *
+ *
* @param listener
*/
final public void removeComponentOnAfterRenderListener(IComponentOnAfterRenderListener listener)
@@ -994,19 +1009,20 @@
}
}
}
-
+
/**
* Notifies the {@link IComponentOnAfterRenderListener}s.
*
* @param component
*/
- final void notifyComponentOnAfterRenderListeners(Component component)
+ final void notifyComponentOnAfterRenderListeners(Component component)
{
if (componentOnAfterRenderListeners != null)
{
for (Iterator i = componentOnAfterRenderListeners.iterator(); i.hasNext();)
{
- IComponentOnAfterRenderListener listener = (IComponentOnAfterRenderListener) i.next();
+ IComponentOnAfterRenderListener listener = (IComponentOnAfterRenderListener)i
+ .next();
listener.onAfterRender(component);
}
}