Author: ivaynberg
Date: Mon Jan 26 16:58:11 2009
New Revision: 737748
URL: http://svn.apache.org/viewvc?rev=737748&view=rev
Log:
WICKET-2020 component detach listener
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/IDetachListener.java
(with props)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=737748&r1=737747&r2=737748&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Mon
Jan 26 16:58:11 2009
@@ -928,6 +928,13 @@
*/
protected void internalDestroy()
{
+ // destroy detach listener
+ final IDetachListener detachListener =
getFrameworkSettings().getDetachListener();
+ if (detachListener != null)
+ {
+ detachListener.onDestroyListener();
+ }
+
// Clear caches of Class keys so the classloader can be garbage
// collected (WICKET-625)
PropertyResolver.destroy(this);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=737748&r1=737747&r2=737748&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Mon Jan
26 16:58:11 2009
@@ -1137,6 +1137,9 @@
// children component's getmodelobject is called
detachModels();
+ // detach any behaviors
+ detachBehaviors();
+
// always detach children because components can be attached
// independently of their parents
detachChildren();
@@ -1152,6 +1155,14 @@
// clear out enabled state metadata
setMetaData(ENABLED_IN_HIERARCHY_CACHE_KEY, null);
+
+ // notify any detach listener
+ IDetachListener detachListener =
getApplication().getFrameworkSettings()
+ .getDetachListener();
+ if (detachListener != null)
+ {
+ detachListener.onDetach(this);
+ }
}
/**
@@ -1193,9 +1204,6 @@
{
// Detach any detachable model from this component
detachModel();
-
- // detach any behaviors
- detachBehaviors();
}
/**
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/IDetachListener.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IDetachListener.java?rev=737748&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IDetachListener.java
(added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IDetachListener.java
Mon Jan 26 16:58:11 2009
@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+/**
+ * Listens to {...@link Component#detach()} calls.
+ *
+ * Detach listeners are called as the last step in the process of detaching a
component; this means
+ * the component is in a fully detached state when the listener is invoked.
+ *
+ * @author igor.vaynberg
+ */
+public interface IDetachListener
+{
+ /**
+ * Called when component is being detached via a call to {...@link
Component#detach()}
+ *
+ * @param component
+ * component being detached
+ */
+ void onDetach(Component component);
+
+ /**
+ * Called when the application is being destroyed. Useful for cleaning
up listener caches, etc.
+ */
+ void onDestroyListener();
+}
Propchange:
wicket/trunk/wicket/src/main/java/org/apache/wicket/IDetachListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java?rev=737748&r1=737747&r2=737748&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java
Mon Jan 26 16:58:11 2009
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.settings;
+import org.apache.wicket.IDetachListener;
+
/**
* Framework settings for retrieving and configuring framework settings.
*
@@ -37,4 +39,17 @@
* @return the Wicket version
*/
public String getVersion();
+
+ /**
+ * @return detach listener or <code>null</code> if none
+ */
+ public IDetachListener getDetachListener();
+
+ /**
+ * Sets detach listener
+ *
+ * @param listener
+ * listener or <code>null</code> to remove
+ */
+ public void setDetachListener(IDetachListener listener);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=737748&r1=737747&r2=737748&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Mon Jan 26 16:58:11 2009
@@ -25,6 +25,7 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
+import org.apache.wicket.IDetachListener;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.IResourceFactory;
import org.apache.wicket.IResponseFilter;
@@ -94,6 +95,8 @@
IFrameworkSettings,
IRequestLoggerSettings
{
+ private IDetachListener detachListener;
+
private boolean outputComponentPath = false;
/** Class of access denied page. */
@@ -1478,4 +1481,22 @@
javascriptCompressor = compressor;
return old;
}
+
+ /**
+ * @see
org.apache.wicket.settings.IFrameworkSettings#getDetachListener()
+ */
+ public IDetachListener getDetachListener()
+ {
+ return detachListener;
+ }
+
+ /**
+ * @see
org.apache.wicket.settings.IFrameworkSettings#setDetachListener(org.apache.wicket.IDetachListener)
+ */
+ public void setDetachListener(IDetachListener detachListener)
+ {
+ this.detachListener = detachListener;
+ }
+
+
}
