Skip to content

Commit

Permalink
merge destroyer into initializer, cleanup javadoc and methods
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/wicket/trunk@1205376 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Sven Meier committed Nov 23, 2011
1 parent 0184f43 commit b191dd5
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions wicket-core/src/main/java/org/apache/wicket/Application.java
Expand Up @@ -516,7 +516,7 @@ public final void initializeComponents()
}

// now call any initializers we read
callInitializers();
initInitializers();
}

/**
Expand Down Expand Up @@ -586,10 +586,10 @@ private void addInitializer(final String className)
}

/**
* Iterate initializers list, calling any {@link org.apache.wicket.IDestroyer} instances found
* in it.
* Iterate initializers list, calling {@link IInitializer#destroy(Application)} on any instances
* found in it.
*/
private void callDestroyers()
private void destroyInitializers()
{
for (IInitializer initializer : initializers)
{
Expand All @@ -599,9 +599,10 @@ private void callDestroyers()
}

/**
* Iterate initializers list, calling any instances found in it.
* Iterate initializers list, calling {@link IInitializer#init(Application)} on any instances
* found in it.
*/
private void callInitializers()
private void initInitializers()
{
for (IInitializer initializer : initializers)
{
Expand Down Expand Up @@ -661,7 +662,7 @@ public void internalDestroy()

onDestroy();

callDestroyers();
destroyInitializers();

internalGetPageManager().destroy();
getSessionStore().destroy();
Expand Down

0 comments on commit b191dd5

Please sign in to comment.