Author: ehillenius
Date: Thu Mar 22 20:32:17 2007
New Revision: 521567
URL: http://svn.apache.org/viewvc?view=rev&rev=521567
Log:
some fixes for internalOnAttach/Detach
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ComponentTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/TestDetachPage.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java?view=diff&rev=521567&r1=521566&r2=521567
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
Thu Mar 22 20:32:17 2007
@@ -2669,25 +2669,6 @@
}
/**
- * @deprecated
- *
- */
- private void internalAttach()
- {
-
- }
-
- /**
- * @deprecated
- *
- */
- private void internalDetach()
- {
-
- }
-
-
- /**
* Attaches the component.
*/
public final void attach()
@@ -3184,4 +3165,22 @@
private static final long serialVersionUID = 1L;
};
+
+ /**
+ * @deprecated
+ */
+ // TODO remove after deprecation release
+ public final void internalAttach()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @deprecated
+ */
+ // TODO remove after deprecation release
+ public final void internalDetach()
+ {
+ throw new UnsupportedOperationException();
+ }
}
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ComponentTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ComponentTest.java?view=diff&rev=521567&r1=521566&r2=521567
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ComponentTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ComponentTest.java
Thu Mar 22 20:32:17 2007
@@ -36,14 +36,6 @@
}
/**
- * @throws Exception
- */
- public void testRenderHomePage_1() throws Exception
- {
- executeTest(TestPage_1.class, "TestPageExpectedResult_1.html");
- }
-
- /**
* Tests the number of detach calls on a Page, Component, Behavior and
Model
* during a normal request.
*
@@ -55,11 +47,9 @@
TestDetachPage page =
(TestDetachPage)tester.getLastRenderedPage();
assertEquals(1, page.getNrComponentDetachModelCalls());
assertEquals(1, page.getNrComponentDetachModelsCalls());
- assertEquals(1, page.getNrComponentInternalDetachCalls());
assertEquals(1, page.getNrComponentOnDetachCalls());
assertEquals(1, page.getNrPageDetachModelCalls());
assertEquals(1, page.getNrPageDetachModelsCalls());
- assertEquals(1, page.getNrPageInternalDetachCalls());
assertEquals(1, page.getNrPageOnDetachCalls());
assertEquals(1, page.getNrModelDetachCalls());
assertEquals(1, page.getNrAjaxBehaviorDetachModelCalls());
@@ -78,26 +68,30 @@
assertEquals(1, page.getNrComponentDetachModelCalls());
assertEquals(1, page.getNrComponentDetachModelsCalls());
- assertEquals(1, page.getNrComponentInternalDetachCalls());
assertEquals(1, page.getNrComponentOnDetachCalls());
assertEquals(1, page.getNrPageDetachModelCalls());
assertEquals(1, page.getNrPageDetachModelsCalls());
- assertEquals(1, page.getNrPageInternalDetachCalls());
assertEquals(1, page.getNrPageOnDetachCalls());
assertEquals(1, page.getNrModelDetachCalls());
assertEquals(1, page.getNrAjaxBehaviorDetachModelCalls());
AjaxEventBehavior behavior = page.getAjaxBehavior();
executedBehavior(TestDetachPage.class, behavior,
"TestDetachPageAjaxResult.html");
- assertTrue(1<page.getNrComponentDetachModelCalls());
- assertTrue(1<page.getNrComponentDetachModelsCalls());
- assertTrue(1<page.getNrComponentInternalDetachCalls());
- assertTrue(1<page.getNrComponentOnDetachCalls());
- assertTrue(1<page.getNrPageDetachModelCalls());
- assertTrue(1<page.getNrPageDetachModelsCalls());
- assertTrue(1<page.getNrPageInternalDetachCalls());
- assertTrue(1<page.getNrPageOnDetachCalls());
- assertTrue(1<page.getNrModelDetachCalls());
- assertTrue(1<page.getNrAjaxBehaviorDetachModelCalls());
+ assertTrue(1 < page.getNrComponentDetachModelCalls());
+ assertTrue(1 < page.getNrComponentDetachModelsCalls());
+ assertTrue(1 < page.getNrComponentOnDetachCalls());
+ assertTrue(1 < page.getNrPageDetachModelCalls());
+ assertTrue(1 < page.getNrPageDetachModelsCalls());
+ assertTrue(1 < page.getNrPageOnDetachCalls());
+ assertTrue(1 < page.getNrModelDetachCalls());
+ assertTrue(1 < page.getNrAjaxBehaviorDetachModelCalls());
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderHomePage_1() throws Exception
+ {
+ executeTest(TestPage_1.class, "TestPageExpectedResult_1.html");
}
}
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/TestDetachPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/TestDetachPage.java?view=diff&rev=521567&r1=521566&r2=521567
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/TestDetachPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/TestDetachPage.java
Thu Mar 22 20:32:17 2007
@@ -32,12 +32,10 @@
/** For serialization. */
private static final long serialVersionUID = 1L;
- private int nrPageInternalDetachCalls = 0;
private int nrPageOnDetachCalls = 0;
private int nrPageDetachModelCalls = 0;
private int nrPageDetachModelsCalls = 0;
- private int nrComponentInternalDetachCalls = 0;
private int nrComponentOnDetachCalls = 0;
private int nrComponentDetachModelCalls = 0;
private int nrComponentDetachModelsCalls = 0;
@@ -83,12 +81,6 @@
/** For serialization */
private static final long serialVersionUID = 1L;
- public void internalDetach()
- {
- nrComponentInternalDetachCalls++;
- super.detach();
- }
-
protected void onDetach()
{
nrComponentOnDetachCalls++;
@@ -128,12 +120,6 @@
add(label);
}
- public void internalDetach()
- {
- nrPageInternalDetachCalls++;
- super.detach();
- }
-
protected void onDetach()
{
nrPageOnDetachCalls++;
@@ -169,14 +155,6 @@
}
/**
- * @return nrComponentInternalDetachCalls
- */
- public int getNrComponentInternalDetachCalls()
- {
- return nrComponentInternalDetachCalls;
- }
-
- /**
* @return nrComponentOnDetachCalls
*/
public int getNrComponentOnDetachCalls()
@@ -198,14 +176,6 @@
public int getNrPageDetachModelsCalls()
{
return nrPageDetachModelsCalls;
- }
-
- /**
- * @return nrPageInternalDetachCalls
- */
- public int getNrPageInternalDetachCalls()
- {
- return nrPageInternalDetachCalls;
}
/**
