X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=wicket%2Fcomponents%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fwicket%2Fpage%2FWebApplicationBasePage.java;h=b7173240e5627d8b216ce089afd4a6b685a54f0f;hb=HEAD;hp=de46e9e32ab6ec801405d68e2e50dafef1b4315e;hpb=7e7d1f6f67766d5998d4631cffadb79da06a0acd;p=utils

diff --git a/wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java b/wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java
index de46e9e3..b7173240 100644
--- a/wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java
+++ b/wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java
@@ -16,7 +16,6 @@
 package org.wamblee.wicket.page;
 
 import javax.persistence.EntityManager;
-import javax.transaction.UserTransaction;
 
 import org.apache.wicket.IPageMap;
 import org.apache.wicket.PageParameters;
@@ -42,33 +41,35 @@ public class WebApplicationBasePage extends WebPage {
 
     protected WebApplicationBasePage() {
         super();
+
+        setEnabled(false);
         init();
     }
 
-    protected WebApplicationBasePage(final IModel<?> model) {
-        super(model);
+    protected WebApplicationBasePage(final IModel<?> aModel) {
+        super(aModel);
         init();
     }
 
-    protected WebApplicationBasePage(final IPageMap pageMap) {
-        super(pageMap);
+    protected WebApplicationBasePage(final IPageMap aPageMap) {
+        super(aPageMap);
         init();
     }
 
-    protected WebApplicationBasePage(final IPageMap pageMap,
-        final IModel<?> model) {
-        super(pageMap, model);
+    protected WebApplicationBasePage(final IPageMap aPageMap,
+        final IModel<?> aModel) {
+        super(aPageMap, aModel);
         init();
     }
 
-    protected WebApplicationBasePage(final PageParameters parameters) {
-        super(parameters);
+    protected WebApplicationBasePage(final PageParameters aParameters) {
+        super(aParameters);
         init();
     }
 
-    protected WebApplicationBasePage(final IPageMap pageMap,
-        final PageParameters parameters) {
-        super(pageMap, parameters);
+    protected WebApplicationBasePage(final IPageMap aPageMap,
+        final PageParameters aParameters) {
+        super(aPageMap, aParameters);
         init();
     }
 
@@ -91,17 +92,6 @@ public class WebApplicationBasePage extends WebPage {
         addBehavior(new ExpirePageImmediatelyBehavior());
     }
 
-    /**
-     * Flushes the entitymanager immedately after rendering to make sure that
-     * errors are caught early.
-     * 
-     * @param aEntityManager
-     *            Contextual reference to an entity manager.
-     */
-    protected void flushEntityManagerAfterRender(EntityManager aEntityManager) {
-        addBehavior(new FlushEntityManagerBehavior(aEntityManager));
-    }
-
     /**
      * Adds a specific behavior to the page.
      * 
@@ -129,4 +119,10 @@ public class WebApplicationBasePage extends WebPage {
         super.onAfterRender();
         behaviors.onAfterRender(this);
     }
+
+    @Override
+    protected void onDetach() {
+        super.onDetach();
+        behaviors.onDetach(this);
+    }
 }