git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c3dd171
)
(no commit message)
author
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 31 Jul 2010 17:33:54 +0000
(17:33 +0000)
committer
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Sat, 31 Jul 2010 17:33:54 +0000
(17:33 +0000)
wicket/components/src/main/java/org/wamblee/wicket/page/AbstractPageBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/CompositePageBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/DisableCachingBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/ExpireBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/ExpirePageImmediatelyBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/FlushEntityManagerBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/LoggingPageBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/PageBehavior.java
patch
|
blob
|
history
wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java
patch
|
blob
|
history
wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
patch
|
blob
|
history
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/AbstractPageBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/AbstractPageBehavior.java
index bf9262e46889b18cc61da10b0092eff3c3312c02..7759caa0cf2475488e175d44e6e0f9aca6a66b01 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/AbstractPageBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/AbstractPageBehavior.java
@@
-42,15
+42,15
@@
public abstract class AbstractPageBehavior implements PageBehavior {
public void setHeaders(WebPage aPage, WebResponse aResponse) {
// Empty
}
public void setHeaders(WebPage aPage, WebResponse aResponse) {
// Empty
}
-
+
@Override
public void onAfterRender(WebPage aPage) {
// Empty
}
@Override
public void onAfterRender(WebPage aPage) {
// Empty
}
-
+
@Override
public void onDetach(WebPage aPage) {
@Override
public void onDetach(WebPage aPage) {
- // Empty
+ // Empty
}
}
}
}
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/CompositePageBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/CompositePageBehavior.java
index 367fc8b4b9004f4a538c14ea69bad93e60d79635..05f96321f3bae274cbec5cf4206a76fdee7fabaf 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/CompositePageBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/CompositePageBehavior.java
@@
-65,14
+65,14
@@
public class CompositePageBehavior implements PageBehavior {
behavior.setHeaders(aPage, aResponse);
}
}
behavior.setHeaders(aPage, aResponse);
}
}
-
+
@Override
public void onAfterRender(WebPage aPage) {
for (PageBehavior behavior : behaviors) {
behavior.onAfterRender(aPage);
}
}
@Override
public void onAfterRender(WebPage aPage) {
for (PageBehavior behavior : behaviors) {
behavior.onAfterRender(aPage);
}
}
-
+
@Override
public void onDetach(WebPage aPage) {
for (PageBehavior behavior : behaviors) {
@Override
public void onDetach(WebPage aPage) {
for (PageBehavior behavior : behaviors) {
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/DisableCachingBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/DisableCachingBehavior.java
index b9bf3e62a779a968ddbc802a59af3a7a61a963b4..9b96cc2a0e487057fbbd0de2840c31333b2c02d2 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/DisableCachingBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/DisableCachingBehavior.java
@@
-20,7
+20,7
@@
import org.apache.wicket.protocol.http.WebResponse;
/**
* <p>
/**
* <p>
- * Behavior to disable browser caching.
+ * Behavior to disable browser caching.
* </p>
*
* <p>
* </p>
*
* <p>
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/ExpireBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/ExpireBehavior.java
index 10a65541cd6fb715d51b43d87a2613eaf7cc9911..08fe1351d07fd3dd971f1ffa1f41b164148aed7e 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/ExpireBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/ExpireBehavior.java
@@
-20,19
+20,20
@@
import java.util.logging.Logger;
import org.apache.wicket.markup.html.WebPage;
/**
import org.apache.wicket.markup.html.WebPage;
/**
- * Bahevior that will expire a page when the page is disabled.
- *
Implementations should implemnet
+ * Bahevior that will expire a page when the page is disabled.
Implementations
+ *
should implemnet
*
* @author Erik Brakkee
*
*/
public abstract class ExpireBehavior extends AbstractPageBehavior {
*
* @author Erik Brakkee
*
*/
public abstract class ExpireBehavior extends AbstractPageBehavior {
- private static final Logger LOGGER = Logger.getLogger(ExpireBehavior.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ExpireBehavior.class
+ .getName());
/**
* Constructs the behavior.
*/
/**
* Constructs the behavior.
*/
- public ExpireBehavior() {
+ public ExpireBehavior() {
super();
}
super();
}
@@
-42,13
+43,16
@@
public abstract class ExpireBehavior extends AbstractPageBehavior {
aPage.getPageMap().remove(aPage);
}
}
aPage.getPageMap().remove(aPage);
}
}
-
+
/**
* Must be implemented to determine if a page is expired.
/**
* Must be implemented to determine if a page is expired.
- * @param aPage Page to check. If a behavior instance is only used on one page then this
- * argument is always that page so it can bne ignored in that case.
+ *
+ * @param aPage
+ * Page to check. If a behavior instance is only used on one page
+ * then this argument is always that page so it can bne ignored
+ * in that case.
* @return
*/
* @return
*/
- protected abstract boolean isExpired(WebPage aPage);
-
+ protected abstract boolean isExpired(WebPage aPage);
+
}
}
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/ExpirePageImmediatelyBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/ExpirePageImmediatelyBehavior.java
index efc170a24df202b0bdb5358ff30599a7f641dd97..945e35929a6bce6bb328c7bb0fd90761d78358c3 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/ExpirePageImmediatelyBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/ExpirePageImmediatelyBehavior.java
@@
-19,7
+19,7
@@
import org.apache.wicket.markup.html.WebPage;
/**
* Page which will be removed from the page map after rendering so it can be
/**
* Page which will be removed from the page map after rendering so it can be
- * viewed only once. Even a refresh of the page will fail.
+ * viewed only once. Even a refresh of the page will fail.
*
* @author Erik Brakkee
*
*
* @author Erik Brakkee
*
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/FlushEntityManagerBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/FlushEntityManagerBehavior.java
index a8cf15d735bdcd3905c15b1ed43581dba44fa203..6525dbfd470bf79e13f4bc4950837a92962168c9 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/FlushEntityManagerBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/FlushEntityManagerBehavior.java
@@
-60,9
+60,10
@@
public abstract class FlushEntityManagerBehavior extends AbstractPageBehavior {
LOGGER.log(Level.WARNING, "Could not flush entitymanager", e);
}
}
LOGGER.log(Level.WARNING, "Could not flush entitymanager", e);
}
}
-
+
/**
* Gets the entity mmanager to flush.
/**
* Gets the entity mmanager to flush.
+ *
* @return Entity manager.
*/
public abstract EntityManager getEntityManager();
* @return Entity manager.
*/
public abstract EntityManager getEntityManager();
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/LoggingPageBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/LoggingPageBehavior.java
index 6d9a3691673115575114d1b6393c30e34880f024..2fa47e757006febcef05d69eec61f7016784621c 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/LoggingPageBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/LoggingPageBehavior.java
@@
-22,42
+22,42
@@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebResponse;
/**
import org.apache.wicket.protocol.http.WebResponse;
/**
- * Logs page events.
+ * Logs page events.
*
* @author Erik Brakkee
*/
public class LoggingPageBehavior implements PageBehavior {
*
* @author Erik Brakkee
*/
public class LoggingPageBehavior implements PageBehavior {
-
- private static final Logger LOG = Logger.getLogger(LoggingPageBehavior.class.getName());
-
- private Level level;
-
+
+ private static final Logger LOG = Logger
+ .getLogger(LoggingPageBehavior.class.getName());
+
+ private Level level;
+
/**
* Constructs the behavior.
*/
/**
* Constructs the behavior.
*/
- public LoggingPageBehavior(Level aLevel) {
+ public LoggingPageBehavior(Level aLevel) {
level = aLevel;
}
@Override
public void onBeforeRender(WebPage aPage) {
level = aLevel;
}
@Override
public void onBeforeRender(WebPage aPage) {
- LOG.log(level, "onbeforeRender: " + aPage);
+ LOG.log(level, "onbeforeRender: " + aPage);
}
@Override
public void setHeaders(WebPage aPage, WebResponse aResponse) {
}
@Override
public void setHeaders(WebPage aPage, WebResponse aResponse) {
- LOG.log(level,"setHeaders: " + aPage + " " + aResponse);
+ LOG.log(level,
"setHeaders: " + aPage + " " + aResponse);
}
}
-
+
@Override
public void onAfterRender(WebPage aPage) {
LOG.log(level, "onAfterRender: " + aPage);
}
@Override
public void onAfterRender(WebPage aPage) {
LOG.log(level, "onAfterRender: " + aPage);
}
-
+
@Override
public void onDetach(WebPage aPage) {
LOG.log(level, "onDetach: " + aPage);
}
@Override
public void onDetach(WebPage aPage) {
LOG.log(level, "onDetach: " + aPage);
}
-
}
}
diff --git
a/wicket/components/src/main/java/org/wamblee/wicket/page/PageBehavior.java
b/wicket/components/src/main/java/org/wamblee/wicket/page/PageBehavior.java
index a8d4f9317f3fbad585502efb8db9008aeed68ca9..c91d433a337f553a67eb3d91cd32424cf3d169d7 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/PageBehavior.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/PageBehavior.java
@@
-22,7
+22,8
@@
import org.apache.wicket.protocol.http.WebResponse;
/**
* Page behavior interface. This provides a mechanism to extend page behavior
/**
* Page behavior interface. This provides a mechanism to extend page behavior
- * without subclassing. Implementations of this interface should be serializable.
+ * without subclassing. Implementations of this interface should be
+ * serializable.
*
* @author Erik Brakkee
*/
*
* @author Erik Brakkee
*/
@@
-53,9
+54,10
@@
public interface PageBehavior extends Serializable {
* Page this is called for.
*/
void onAfterRender(WebPage aPage);
* Page this is called for.
*/
void onAfterRender(WebPage aPage);
-
+
/**
* To be called in the {@link Page#onDetach
/**
* To be called in the {@link Page#onDetach
+
*/
void onDetach(WebPage aPage);
}
*/
void onDetach(WebPage aPage);
}
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 b0ac386d13351b747faa4f604279dbb316fc9c01..b7173240e5627d8b216ce089afd4a6b685a54f0f 100644
(file)
--- a/
wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java
+++ b/
wicket/components/src/main/java/org/wamblee/wicket/page/WebApplicationBasePage.java
@@
-46,30
+46,30
@@
public class WebApplicationBasePage extends WebPage {
init();
}
init();
}
- protected WebApplicationBasePage(final IModel<?>
m
odel) {
- super(
m
odel);
+ protected WebApplicationBasePage(final IModel<?>
aM
odel) {
+ super(
aM
odel);
init();
}
init();
}
- protected WebApplicationBasePage(final IPageMap
p
ageMap) {
- super(
p
ageMap);
+ protected WebApplicationBasePage(final IPageMap
aP
ageMap) {
+ super(
aP
ageMap);
init();
}
init();
}
- protected WebApplicationBasePage(final IPageMap
p
ageMap,
- final IModel<?>
m
odel) {
- super(
pageMap, m
odel);
+ protected WebApplicationBasePage(final IPageMap
aP
ageMap,
+ final IModel<?>
aM
odel) {
+ super(
aPageMap, aM
odel);
init();
}
init();
}
- protected WebApplicationBasePage(final PageParameters
p
arameters) {
- super(
p
arameters);
+ protected WebApplicationBasePage(final PageParameters
aP
arameters) {
+ super(
aP
arameters);
init();
}
init();
}
- protected WebApplicationBasePage(final IPageMap
p
ageMap,
- final PageParameters
p
arameters) {
- super(
pageMap, p
arameters);
+ protected WebApplicationBasePage(final IPageMap
aP
ageMap,
+ final PageParameters
aP
arameters) {
+ super(
aPageMap, aP
arameters);
init();
}
init();
}
diff --git
a/wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
b/wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
index 1ee8cef883e192fbbe9c2d8cbdf3a10b2c2bab2b..2285f7f4f9f77b1ed614d4958b531e3a168a5b54 100644
(file)
--- a/
wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
+++ b/
wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
@@
-112,7
+112,7
@@
public class WebApplicationBasePageTest {
public static final class TestPage extends WebApplicationBasePage {
public static final class TestPage extends WebApplicationBasePage {
- private WebResponse response;
+ private
transient
WebResponse response;
public TestPage(WebResponse aResponse) {
response = aResponse;
public TestPage(WebResponse aResponse) {
response = aResponse;
@@
-201,8
+201,10
@@
public class WebApplicationBasePageTest {
mock(IPageMap.class), new PageParameters());
final EntityManager entityManager = mock(EntityManager.class);
when(entityManager.isOpen()).thenReturn(true);
mock(IPageMap.class), new PageParameters());
final EntityManager entityManager = mock(EntityManager.class);
when(entityManager.isOpen()).thenReturn(true);
- PageBehavior behavior = new FlushEntityManagerBehavior() {
- public EntityManager getEntityManager() { return entityManager; }
+ PageBehavior behavior = new FlushEntityManagerBehavior() {
+ public EntityManager getEntityManager() {
+ return entityManager;
+ }
};
page.addBehavior(behavior);
wicket.startPage(page);
};
page.addBehavior(behavior);
wicket.startPage(page);