You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 23:23:31 UTC
svn commit: r584925 [32/34] - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/ main/java/org/apache/wicket/ajax/ma...
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel.java Mon Oct 15 14:21:25 2007
@@ -25,7 +25,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionMyLabel extends WebMarkupContainerWithAssociatedMarkup
@@ -34,13 +34,14 @@
/**
* Construct.
+ *
* @param id
* @param label
*/
- public HeaderSectionMyLabel(final String id, final String label)
+ public HeaderSectionMyLabel(final String id, final String label)
{
- super(id, new Model(label));
- }
+ super(id, new Model(label));
+ }
/**
* @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
@@ -50,16 +51,16 @@
{
replaceComponentTagBody(markupStream, openTag, getModelObjectAsString());
}
-
- /**
- * This label renders its markup the normal way, and is still able
- * to take and render the header tag from an associated markup file.
- *
- * @see org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer)
- */
- public void renderHead(HtmlHeaderContainer container)
- {
- this.renderHeadFromAssociatedMarkupFile(container);
- super.renderHead(container);
- }
+
+ /**
+ * This label renders its markup the normal way, and is still able to take and render the header
+ * tag from an associated markup file.
+ *
+ * @see org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer)
+ */
+ public void renderHead(HtmlHeaderContainer container)
+ {
+ this.renderHeadFromAssociatedMarkupFile(container);
+ super.renderHead(container);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java Mon Oct 15 14:21:25 2007
@@ -23,7 +23,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionMyLabel2 extends Label
@@ -32,19 +32,20 @@
/**
* Construct.
+ *
* @param id
* @param label
*/
- public HeaderSectionMyLabel2(final String id, final String label)
+ public HeaderSectionMyLabel2(final String id, final String label)
{
- super(id, new Model(label));
- }
+ super(id, new Model(label));
+ }
/**
* @param container
*/
public void renderHead(HtmlHeaderContainer container)
{
- this.getResponse().write("text added by contributor");
+ this.getResponse().write("text added by contributor");
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_1.java Mon Oct 15 14:21:25 2007
@@ -21,17 +21,17 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_1 extends WebPage
+public class HeaderSectionPage_1 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_1()
+ public HeaderSectionPage_1()
{
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_10.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_10 extends WebPage
+public class HeaderSectionPage_10 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_10()
+ public HeaderSectionPage_10()
{
- add(new HeaderSectionPanel_3("panel"));
- }
+ add(new HeaderSectionPanel_3("panel"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_11.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_11 extends WebPage
+public class HeaderSectionPage_11 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_11()
+ public HeaderSectionPage_11()
{
- add(new HeaderSectionMyLabel2("label", "mein Label"));
- }
+ add(new HeaderSectionMyLabel2("label", "mein Label"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_13.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_13 extends WebPage
+public class HeaderSectionPage_13 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_13()
+ public HeaderSectionPage_13()
{
- add(new HeaderSectionPanel_4("panel"));
- }
+ add(new HeaderSectionPanel_4("panel"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_14.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_14.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_14.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_14.java Mon Oct 15 14:21:25 2007
@@ -17,20 +17,19 @@
package org.apache.wicket.markup.parser.filter;
-
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_14 extends AbstractTest14WebPage
+public class HeaderSectionPage_14 extends AbstractTest14WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_14()
+ public HeaderSectionPage_14()
{
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_15.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_15 extends WebPage
+public class HeaderSectionPage_15 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_15()
+ public HeaderSectionPage_15()
{
add(new HeaderSectionPanel_5("myPanel"));
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_16.java Mon Oct 15 14:21:25 2007
@@ -22,18 +22,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_16 extends WebPage
+public class HeaderSectionPage_16 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_16()
+ public HeaderSectionPage_16()
{
add(new Label("label", "my label text"));
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_17.java Mon Oct 15 14:21:25 2007
@@ -21,19 +21,19 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_17 extends WebPage
+public class HeaderSectionPage_17 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_17()
+ public HeaderSectionPage_17()
{
- // for the test: the panel must the same id as the panels header contribution
+ // for the test: the panel must the same id as the panels header contribution
add(new HeaderSectionPanel_17("foo"));
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_18.java Mon Oct 15 14:21:25 2007
@@ -21,17 +21,17 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_18 extends WebPage
+public class HeaderSectionPage_18 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_18()
+ public HeaderSectionPage_18()
{
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_19.java Mon Oct 15 14:21:25 2007
@@ -21,19 +21,19 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_19 extends WebPage
+public class HeaderSectionPage_19 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_19()
+ public HeaderSectionPage_19()
{
- // for the test: the panel must the same id as the panels header contribution
+ // for the test: the panel must the same id as the panels header contribution
add(new HeaderSectionPanel_19("foo"));
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_2.java Mon Oct 15 14:21:25 2007
@@ -21,17 +21,17 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_2 extends WebPage
+public class HeaderSectionPage_2 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_2()
+ public HeaderSectionPage_2()
{
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_3.java Mon Oct 15 14:21:25 2007
@@ -21,17 +21,17 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_3 extends WebPage
+public class HeaderSectionPage_3 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_3()
+ public HeaderSectionPage_3()
{
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_4.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_4 extends WebPage
+public class HeaderSectionPage_4 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_4()
+ public HeaderSectionPage_4()
{
- add(new HeaderSectionPanel("panel"));
- }
+ add(new HeaderSectionPanel("panel"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_5.java Mon Oct 15 14:21:25 2007
@@ -21,18 +21,18 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_5 extends WebPage
+public class HeaderSectionPage_5 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_5()
+ public HeaderSectionPage_5()
{
- add(new HeaderSectionBorder("border"));
- }
+ add(new HeaderSectionBorder("border"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_8.java Mon Oct 15 14:21:25 2007
@@ -22,19 +22,19 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_8 extends WebPage
+public class HeaderSectionPage_8 extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_8()
+ public HeaderSectionPage_8()
{
- add(new HeaderSectionPanel("panel"));
- add(new ExternalLink("cssHref", "myStyle.css"));
- }
+ add(new HeaderSectionPanel("panel"));
+ add(new ExternalLink("cssHref", "myStyle.css"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java Mon Oct 15 14:21:25 2007
@@ -23,19 +23,19 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class HeaderSectionPage_9a extends WebPage
+public class HeaderSectionPage_9a extends WebPage
{
private static final long serialVersionUID = 1L;
/**
* Construct.
*/
- public HeaderSectionPage_9a()
+ public HeaderSectionPage_9a()
{
- add(new HeaderSectionPanel_2("panel"));
- ((MarkupContainer)get("panel")).get("cssHref").setVisible(false);
- }
+ add(new HeaderSectionPanel_2("panel"));
+ ((MarkupContainer)get("panel")).get("cssHref").setVisible(false);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel.java Mon Oct 15 14:21:25 2007
@@ -21,7 +21,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel extends Panel
@@ -30,10 +30,11 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel(final String id)
+ public HeaderSectionPanel(final String id)
{
- super(id);
- }
+ super(id);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_17.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_17.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_17.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_17.java Mon Oct 15 14:21:25 2007
@@ -22,7 +22,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel_17 extends Panel
@@ -31,13 +31,14 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel_17(final String id)
+ public HeaderSectionPanel_17(final String id)
{
- super(id);
-
- // for the test: the label must the same id as the panel
- add(new Label("foo", "Mein Test"));
- }
+ super(id);
+
+ // for the test: the label must the same id as the panel
+ add(new Label("foo", "Mein Test"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_19.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_19.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_19.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_19.java Mon Oct 15 14:21:25 2007
@@ -22,7 +22,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel_19 extends Panel
@@ -31,13 +31,14 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel_19(final String id)
+ public HeaderSectionPanel_19(final String id)
{
- super(id);
-
- add(new Label("foo1", "1111"));
- add(new Label("foo2", "2222"));
- }
+ super(id);
+
+ add(new Label("foo1", "1111"));
+ add(new Label("foo2", "2222"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_2.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_2.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_2.java Mon Oct 15 14:21:25 2007
@@ -22,7 +22,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel_2 extends Panel
@@ -31,11 +31,12 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel_2(final String id)
+ public HeaderSectionPanel_2(final String id)
{
- super(id);
- add(new ExternalLink("cssHref", "myStyle.css"));
- }
+ super(id);
+ add(new ExternalLink("cssHref", "myStyle.css"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_3.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_3.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_3.java Mon Oct 15 14:21:25 2007
@@ -21,7 +21,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel_3 extends Panel
@@ -30,10 +30,11 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel_3(final String id)
+ public HeaderSectionPanel_3(final String id)
{
- super(id);
- }
+ super(id);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_4.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_4.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_4.java Mon Oct 15 14:21:25 2007
@@ -21,7 +21,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel_4 extends Panel
@@ -30,10 +30,11 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel_4(final String id)
+ public HeaderSectionPanel_4(final String id)
{
- super(id);
- }
+ super(id);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_5.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_5.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPanel_5.java Mon Oct 15 14:21:25 2007
@@ -23,7 +23,7 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
public class HeaderSectionPanel_5 extends Panel
@@ -32,15 +32,16 @@
/**
* Construct.
+ *
* @param id
*/
- public HeaderSectionPanel_5(final String id)
+ public HeaderSectionPanel_5(final String id)
{
- super(id);
-
- WebMarkupContainer container = new WebMarkupContainer("aContainer");
- add(container);
-
- container.add(new Label("aLabel", "Mein Test"));
- }
+ super(id);
+
+ WebMarkupContainer container = new WebMarkupContainer("aContainer");
+ add(container);
+
+ container.add(new Label("aLabel", "Mein Test"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java Mon Oct 15 14:21:25 2007
@@ -25,15 +25,15 @@
/**
- * Simple application that demonstrates the mock http application code (and
- * checks that it is working)
+ * Simple application that demonstrates the mock http application code (and checks that it is
+ * working)
*
* @author Chris Turner
*/
public class HeaderSectionTest extends WicketTestCase
{
private static final Logger log = LoggerFactory.getLogger(HeaderSectionTest.class);
-
+
/**
* Create the test.
*
@@ -50,7 +50,7 @@
*/
public void testRenderHomePage_1() throws Exception
{
- executeTest(HeaderSectionPage_1.class, "HeaderSectionPageExpectedResult_1.html");
+ executeTest(HeaderSectionPage_1.class, "HeaderSectionPageExpectedResult_1.html");
}
/**
@@ -58,7 +58,7 @@
*/
public void testRenderHomePage_2() throws Exception
{
- executeTest(HeaderSectionPage_2.class, "HeaderSectionPageExpectedResult_2.html");
+ executeTest(HeaderSectionPage_2.class, "HeaderSectionPageExpectedResult_2.html");
}
/**
@@ -66,7 +66,7 @@
*/
public void testRenderHomePage_3() throws Exception
{
- executeTest(HeaderSectionPage_3.class, "HeaderSectionPageExpectedResult_3.html");
+ executeTest(HeaderSectionPage_3.class, "HeaderSectionPageExpectedResult_3.html");
}
/**
@@ -74,7 +74,7 @@
*/
public void testRenderHomePage_4() throws Exception
{
- executeTest(HeaderSectionPage_4.class, "HeaderSectionPageExpectedResult_4.html");
+ executeTest(HeaderSectionPage_4.class, "HeaderSectionPageExpectedResult_4.html");
}
/**
@@ -82,7 +82,7 @@
*/
public void testRenderHomePage_5() throws Exception
{
- executeTest(HeaderSectionPage_5.class, "HeaderSectionPageExpectedResult_5.html");
+ executeTest(HeaderSectionPage_5.class, "HeaderSectionPageExpectedResult_5.html");
}
/**
@@ -90,7 +90,7 @@
*/
public void testRenderHomePage_6() throws Exception
{
- executeTest(HeaderSectionPage_6.class, "HeaderSectionPageExpectedResult_6.html");
+ executeTest(HeaderSectionPage_6.class, "HeaderSectionPageExpectedResult_6.html");
}
/**
@@ -98,7 +98,7 @@
*/
public void testRenderHomePage_7() throws Exception
{
- executeTest(HeaderSectionPage_7.class, "HeaderSectionPageExpectedResult_7.html");
+ executeTest(HeaderSectionPage_7.class, "HeaderSectionPageExpectedResult_7.html");
}
/**
@@ -106,7 +106,7 @@
*/
public void testRenderHomePage_8() throws Exception
{
- executeTest(HeaderSectionPage_8.class, "HeaderSectionPageExpectedResult_8.html");
+ executeTest(HeaderSectionPage_8.class, "HeaderSectionPageExpectedResult_8.html");
}
/**
@@ -114,7 +114,7 @@
*/
public void testRenderHomePage_9() throws Exception
{
- executeTest(HeaderSectionPage_9.class, "HeaderSectionPageExpectedResult_9.html");
+ executeTest(HeaderSectionPage_9.class, "HeaderSectionPageExpectedResult_9.html");
}
/**
@@ -122,7 +122,7 @@
*/
public void testRenderHomePage_9a() throws Exception
{
- executeTest(HeaderSectionPage_9a.class, "HeaderSectionPageExpectedResult_9a.html");
+ executeTest(HeaderSectionPage_9a.class, "HeaderSectionPageExpectedResult_9a.html");
}
/**
@@ -130,7 +130,7 @@
*/
public void testRenderHomePage_10() throws Exception
{
- executeTest(HeaderSectionPage_10.class, "HeaderSectionPageExpectedResult_10.html");
+ executeTest(HeaderSectionPage_10.class, "HeaderSectionPageExpectedResult_10.html");
}
/**
@@ -138,7 +138,7 @@
*/
public void testRenderHomePage_11() throws Exception
{
- executeTest(HeaderSectionPage_11.class, "HeaderSectionPageExpectedResult_11.html");
+ executeTest(HeaderSectionPage_11.class, "HeaderSectionPageExpectedResult_11.html");
}
/**
@@ -146,13 +146,14 @@
*/
public void testRenderHomePage_12() throws Exception
{
- executeTest(HeaderSectionPage_12.class, "HeaderSectionPageExpectedResult_12.html");
- PackageResource res = (PackageResource) tester.getApplication().getSharedResources().get("org.apache.wicket.markup.parser.filter.sub.HeaderSectionBorder/cborder.css");
- assertNotNull(res);
- String absPath = res.getAbsolutePath();
- assertNotNull(absPath);
- IResourceStream stream = res.getResourceStream();
- assertNotNull(stream);
+ executeTest(HeaderSectionPage_12.class, "HeaderSectionPageExpectedResult_12.html");
+ PackageResource res = (PackageResource)tester.getApplication().getSharedResources().get(
+ "org.apache.wicket.markup.parser.filter.sub.HeaderSectionBorder/cborder.css");
+ assertNotNull(res);
+ String absPath = res.getAbsolutePath();
+ assertNotNull(absPath);
+ IResourceStream stream = res.getResourceStream();
+ assertNotNull(stream);
}
/**
@@ -177,7 +178,7 @@
*/
public void testRenderHomePage_14() throws Exception
{
- executeTest(HeaderSectionPage_14.class, "HeaderSectionPageExpectedResult_14.html");
+ executeTest(HeaderSectionPage_14.class, "HeaderSectionPageExpectedResult_14.html");
}
/**
@@ -185,7 +186,7 @@
*/
public void testRenderHomePage_15() throws Exception
{
- executeTest(HeaderSectionPage_15.class, "HeaderSectionPageExpectedResult_15.html");
+ executeTest(HeaderSectionPage_15.class, "HeaderSectionPageExpectedResult_15.html");
}
/**
@@ -193,7 +194,7 @@
*/
public void testRenderHomePage_16() throws Exception
{
- executeTest(HeaderSectionPage_16.class, "HeaderSectionPageExpectedResult_16.html");
+ executeTest(HeaderSectionPage_16.class, "HeaderSectionPageExpectedResult_16.html");
}
/**
@@ -201,7 +202,7 @@
*/
public void testRenderHomePage_17() throws Exception
{
- executeTest(HeaderSectionPage_17.class, "HeaderSectionPageExpectedResult_17.html");
+ executeTest(HeaderSectionPage_17.class, "HeaderSectionPageExpectedResult_17.html");
}
/**
@@ -209,7 +210,7 @@
*/
public void testRenderHomePage_18() throws Exception
{
- executeTest(HeaderSectionPage_18.class, "HeaderSectionPageExpectedResult_18.html");
+ executeTest(HeaderSectionPage_18.class, "HeaderSectionPageExpectedResult_18.html");
}
/**
@@ -217,6 +218,6 @@
*/
public void testRenderHomePage_19() throws Exception
{
- executeTest(HeaderSectionPage_19.class, "HeaderSectionPageExpectedResult_19.html");
+ executeTest(HeaderSectionPage_19.class, "HeaderSectionPageExpectedResult_19.html");
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java Mon Oct 15 14:21:25 2007
@@ -23,7 +23,7 @@
/**
* @author jcompagner
- *
+ *
*/
public class PanelWithHeaderPart extends Panel
{
@@ -35,11 +35,11 @@
public PanelWithHeaderPart(String id)
{
super(id);
-
+
add(new Label("body"));
- add(new StyleSheetReference("testlink", PanelWithHeaderPart.class,"test.css"));
+ add(new StyleSheetReference("testlink", PanelWithHeaderPart.class, "test.css"));
add(new JavaScriptReference("testscript", PanelWithHeaderPart.class, "test.js"));
-
+
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/sub/HeaderSectionBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/sub/HeaderSectionBorder.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/sub/HeaderSectionBorder.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/sub/HeaderSectionBorder.java Mon Oct 15 14:21:25 2007
@@ -20,6 +20,7 @@
/**
* Border component.
+ *
* @author Jonathan Locke
*/
public class HeaderSectionBorder extends Border
@@ -27,13 +28,13 @@
private static final long serialVersionUID = 1L;
/**
- * Constructor
- * @param id The id of this component
- */
- public HeaderSectionBorder(final String id)
- {
- super(id);
- }
+ * Constructor
+ *
+ * @param id
+ * The id of this component
+ */
+ public HeaderSectionBorder(final String id)
+ {
+ super(id);
+ }
}
-
-
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java Mon Oct 15 14:21:25 2007
@@ -27,8 +27,7 @@
public class InheritedModelTest extends WicketTestCase
{
/**
- * Tests the CPM inheritance by setting a different root model using a
- * rendered scenario.
+ * Tests the CPM inheritance by setting a different root model using a rendered scenario.
*/
public void testCompoundPropertyModelRendered()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/InheritedTestPage.java Mon Oct 15 14:21:25 2007
@@ -27,8 +27,7 @@
private static final long serialVersionUID = 1L;
/**
- * public for querying in test case. Is the only component on this page,
- * rendered in a h1 tag.
+ * public for querying in test case. Is the only component on this page, rendered in a h1 tag.
*/
public final Label label = new Label("label");
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
import junit.framework.TestCase;
/**
- * Tests the detach behavior for compatibility with IDetachable nested objects,
- * ensuring that the detach method is called for those nested objects.
+ * Tests the detach behavior for compatibility with IDetachable nested objects, ensuring that the
+ * detach method is called for those nested objects.
*/
public class ModelDetachTest extends TestCase
{
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Mon Oct 15 14:21:25 2007
@@ -108,14 +108,16 @@
InnerPOJO innerPOJO = new InnerPOJO();
BoundCompoundPropertyModel pojoProperty = new BoundCompoundPropertyModel(innerPOJO);
- expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=["
- + innerPOJO + "]:bindings=[]";
+ expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" +
+ innerPOJO + "]:bindings=[]";
assertEquals(expected, pojoProperty.toString());
Component component1 = pojoProperty.bind(new Label("label"));
- expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=["
- + innerPOJO + "]:bindings=[Binding(:component=[" + component1
- + "]:expression=[label])]";
+ expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" +
+ innerPOJO +
+ "]:bindings=[Binding(:component=[" +
+ component1 +
+ "]:expression=[label])]";
assertEquals(expected, pojoProperty.toString());
}
@@ -142,8 +144,8 @@
InnerPOJO innerPOJO = new InnerPOJO();
CompoundPropertyModel pojoProperty = new CompoundPropertyModel(innerPOJO);
- expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[" + innerPOJO
- + "]";
+ expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[" +
+ innerPOJO + "]";
assertEquals(expected, pojoProperty.toString());
}
@@ -153,18 +155,18 @@
public void testLoadableDetachableModel()
{
LoadableDetachableModel model = new MyLoadableDetachableModel();
- String expected = "Model:classname=[" + model.getClass().getName() + "]"
- + ":attached=false" + ":tempModelObject=[null]";
+ String expected = "Model:classname=[" + model.getClass().getName() + "]" +
+ ":attached=false" + ":tempModelObject=[null]";
assertEquals(expected, model.toString());
model.getObject();
- expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=true"
- + ":tempModelObject=[foo]";
+ expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=true" +
+ ":tempModelObject=[foo]";
assertEquals(expected, model.toString());
model.detach();
- expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=false"
- + ":tempModelObject=[null]";
+ expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=false" +
+ ":tempModelObject=[null]";
assertEquals(expected, model.toString());
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/model/PropertyModelTest.java Mon Oct 15 14:21:25 2007
@@ -27,16 +27,15 @@
public class PropertyModelTest extends WicketTestCase
{
/**
- * Interface for testing the property assignment with an <code>null</code>
- * interface property.
+ * Interface for testing the property assignment with an <code>null</code> interface property.
*/
public static interface IAddress
{
}
/**
- * Abstract class for testing the property assignment with an
- * <code>null</code> abstract class property.
+ * Abstract class for testing the property assignment with an <code>null</code> abstract class
+ * property.
*/
public static abstract class AbstractAddress implements IAddress
{
@@ -45,16 +44,15 @@
}
/**
- * Concrete class for testing the property assignment with an
- * <code>null</code> concrete class property.
+ * Concrete class for testing the property assignment with an <code>null</code> concrete class
+ * property.
*/
public static class ConcreteAddress extends AbstractAddress
{
}
/**
- * Person class for keeping the various different references for use in the
- * test cases.
+ * Person class for keeping the various different references for use in the test cases.
*/
public static class Person
{
@@ -69,10 +67,9 @@
}
/**
- * Tests setting a value on a {@link PropertyModel} when a property is
- * <code>null</code> and an interface type. This should end in an
- * exception because Wicket can't decide what to instantiate on behalf of
- * the program.
+ * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and
+ * an interface type. This should end in an exception because Wicket can't decide what to
+ * instantiate on behalf of the program.
*/
public void testSetWithNullPathInterface()
{
@@ -90,10 +87,9 @@
}
/**
- * Tests setting a value on a {@link PropertyModel} when a property is
- * <code>null</code> and an abstract class type. This should end in an
- * exception because Wicket can't decide what to instantiate on behalf of
- * the program.
+ * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and
+ * an abstract class type. This should end in an exception because Wicket can't decide what to
+ * instantiate on behalf of the program.
*/
public void testSetWithNullPathAbstract()
{
@@ -111,10 +107,9 @@
}
/**
- * Tests setting a value on a {@link PropertyModel} when a property is
- * <code>null</code> and a concrete type. This should work because Wicket
- * can decide what to instantiate on behalf of the program: the concrete
- * class.
+ * Tests setting a value on a {@link PropertyModel} when a property is <code>null</code> and a
+ * concrete type. This should work because Wicket can decide what to instantiate on behalf of
+ * the program: the concrete class.
*/
public void testSetWithNullPathConcrete()
{
@@ -127,13 +122,12 @@
}
/**
- * Tests setting a value on a {@link PropertyModel} when a final (constant!)
- * property is <code>null</code> and a concrete type. This should end in
- * an exception because Wicket can't assign to the property, since it is
- * final.
+ * Tests setting a value on a {@link PropertyModel} when a final (constant!) property is
+ * <code>null</code> and a concrete type. This should end in an exception because Wicket can't
+ * assign to the property, since it is final.
*
- * This test has been disabled as it doesn't work on Mac OS X's 1.4 jdk
- * (assignment doesn't fail).
+ * This test has been disabled as it doesn't work on Mac OS X's 1.4 jdk (assignment doesn't
+ * fail).
*/
// public void testSetWithNullPathFinalJdk14()
// {
@@ -151,9 +145,8 @@
// }
// }
/**
- * Tests setting a value on a null, final property using a
- * {@link PropertyModel}. This test should pass when run using JDK 1.5 or
- * newer.
+ * Tests setting a value on a null, final property using a {@link PropertyModel}. This test
+ * should pass when run using JDK 1.5 or newer.
*
* TODO/FIXME enable test when Wicket is JDK 1.5 based.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java Mon Oct 15 14:21:25 2007
@@ -32,12 +32,12 @@
{
return null;
}
-
+
protected void outputDevelopmentModeWarning()
{
// Do nothing.
}
-
+
/**
* @see org.apache.wicket.protocol.http.WebApplication#newSessionStore()
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Mon Oct 15 14:21:25 2007
@@ -32,15 +32,15 @@
{
return null;
}
-
+
protected void outputDevelopmentModeWarning()
{
// Do nothing.
}
-
- protected ISessionStore newSessionStore()
- {
- // Don't use a filestore, or we spawn lots of threads, which makes things slow.
- return new HttpSessionStore(this);
- }
+
+ protected ISessionStore newSessionStore()
+ {
+ // Don't use a filestore, or we spawn lots of threads, which makes things slow.
+ return new HttpSessionStore(this);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestForm.java Mon Oct 15 14:21:25 2007
@@ -28,6 +28,7 @@
/**
* Construct.
+ *
* @param id
*/
public TestForm(final String id)
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/properties/TestPanel.java Mon Oct 15 14:21:25 2007
@@ -28,6 +28,7 @@
/**
* Construct.
+ *
* @param id
*/
public TestPanel(final String id)
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/FilePageStoreTest.java Mon Oct 15 14:21:25 2007
@@ -36,18 +36,18 @@
PageB b = new PageB("test");
PageA a = new PageA(b);
b.setA(a);
-
+
tester.setupRequestAndResponse();
-
+
Session session = Session.get();
-
+
a.getPageMap().put(a);
a.getPageMap().put(b);
-
+
PageA a2 = (PageA)a.getPageMap().get(a.getNumericId(), a.getCurrentVersionNumber());
-
+
Assert.assertEquals(a, a2);
-
+
Assert.assertSame(a2, a2.getB().getA());
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockPage.java Mon Oct 15 14:21:25 2007
@@ -24,10 +24,11 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class MockPage extends WebPage {
+public class MockPage extends WebPage
+{
private static final long serialVersionUID = 1L;
@@ -35,32 +36,38 @@
* Construct.
*
*/
- public MockPage() {
- // Action link counts link clicks
- final Link actionLink = new Link("actionLink") {
+ public MockPage()
+ {
+ // Action link counts link clicks
+ final Link actionLink = new Link("actionLink")
+ {
private static final long serialVersionUID = 1L;
- public void onClick() {
- linkClickCount++;
- }
- };
- actionLink.add(new Label("linkClickCount", new PropertyModel(this, "linkClickCount")));
- add(actionLink);
- }
-
- /**
- * @return Returns the linkClickCount.
- */
- public int getLinkClickCount() {
- return linkClickCount;
- }
-
- /**
- * @param linkClickCount The linkClickCount to set.
- */
- public void setLinkClickCount(final int linkClickCount) {
- this.linkClickCount = linkClickCount;
- }
+ public void onClick()
+ {
+ linkClickCount++;
+ }
+ };
+ actionLink.add(new Label("linkClickCount", new PropertyModel(this, "linkClickCount")));
+ add(actionLink);
+ }
- private int linkClickCount = 0;
+ /**
+ * @return Returns the linkClickCount.
+ */
+ public int getLinkClickCount()
+ {
+ return linkClickCount;
+ }
+
+ /**
+ * @param linkClickCount
+ * The linkClickCount to set.
+ */
+ public void setLinkClickCount(final int linkClickCount)
+ {
+ this.linkClickCount = linkClickCount;
+ }
+
+ private int linkClickCount = 0;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java Mon Oct 15 14:21:25 2007
@@ -30,8 +30,8 @@
import org.apache.wicket.util.tester.WicketTester;
/**
- * Simple application that demonstrates the mock http application code (and
- * checks that it is working)
+ * Simple application that demonstrates the mock http application code (and checks that it is
+ * working)
*
* @author Chris Turner
*/
@@ -90,8 +90,7 @@
}
/**
- * Tests the clean up of flash messages put into the session when they are
- * rendered.
+ * Tests the clean up of flash messages put into the session when they are rendered.
*/
public void testSessionFeedbackMessagesCleanUp()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java Mon Oct 15 14:21:25 2007
@@ -20,23 +20,32 @@
public class RequestUtilsTest extends TestCase
{
- public void testDoubleDotsMiddle() {
+ public void testDoubleDotsMiddle()
+ {
assertEquals("/a/b", RequestUtils.removeDoubleDots("/a/b/../b"));
assertEquals("a/b", RequestUtils.removeDoubleDots("a/b/../b"));
assertEquals("a/b/", RequestUtils.removeDoubleDots("a/b/../b/"));
}
- public void testDoubleDotsEnd() {
+
+ public void testDoubleDotsEnd()
+ {
assertEquals("/a/b", RequestUtils.removeDoubleDots("/a/b/c/.."));
assertEquals("a/b", RequestUtils.removeDoubleDots("a/b/c/.."));
}
- public void testDoubleDotsStart() {
+
+ public void testDoubleDotsStart()
+ {
assertEquals("/../a/b", RequestUtils.removeDoubleDots("/../a/b"));
assertEquals("../a/b", RequestUtils.removeDoubleDots("../a/b"));
}
- public void testEmptyDoubleDots() {
+
+ public void testEmptyDoubleDots()
+ {
assertEquals("", RequestUtils.removeDoubleDots(""));
}
- public void testOneDoubleDots() {
+
+ public void testOneDoubleDots()
+ {
assertEquals("..", RequestUtils.removeDoubleDots(".."));
assertEquals("../", RequestUtils.removeDoubleDots("../"));
assertEquals("/..", RequestUtils.removeDoubleDots("/.."));
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebExternalResourceTest.java Mon Oct 15 14:21:25 2007
@@ -47,7 +47,8 @@
out.close();
tester = new WicketTester(new DummyWebApplication(), tempDir.getPath());
tester.setupRequestAndResponse();
- // We fake the browser URL, otherwise Wicket doesn't know the requested URL and cannot guess the Content-Type
+ // We fake the browser URL, otherwise Wicket doesn't know the requested URL and cannot guess
+ // the Content-Type
tester.getServletRequest().setPath("/index.html");
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java Mon Oct 15 14:21:25 2007
@@ -45,7 +45,9 @@
MockPage.class, params);
app.setupRequestAndResponse();
CharSequence cs = wrcs.encode(app.createRequestCycle(), requestTarget);
- assertEquals("?wicket:bookmarkablePage=%3Aorg.apache.wicket.protocol.http.MockPage&a=1&a=2", cs.toString());
+ assertEquals(
+ "?wicket:bookmarkablePage=%3Aorg.apache.wicket.protocol.http.MockPage&a=1&a=2", cs
+ .toString());
app.destroy();
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java Mon Oct 15 14:21:25 2007
@@ -22,8 +22,8 @@
import junit.framework.TestCase;
/**
- *
- *
+ *
+ *
* @author Frank Bille (billen)
*/
public class WebResponseTest extends TestCase
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java Mon Oct 15 14:21:25 2007
@@ -25,19 +25,20 @@
/**
* @author Timo Rantalaiho
*/
-public class WebSessionTest extends TestCase {
- public void testReadsLocaleFromRequestOnConstruction()
- {
- final Locale locale = Locale.TRADITIONAL_CHINESE;
- HttpServletRequest request = new MockHttpServletRequest(null, null, null)
- {
- public Locale getLocale()
- {
- return locale;
- }
- };
+public class WebSessionTest extends TestCase
+{
+ public void testReadsLocaleFromRequestOnConstruction()
+ {
+ final Locale locale = Locale.TRADITIONAL_CHINESE;
+ HttpServletRequest request = new MockHttpServletRequest(null, null, null)
+ {
+ public Locale getLocale()
+ {
+ return locale;
+ }
+ };
- WebSession session = new WebSession(new ServletWebRequest(request));
- assertEquals(locale, session.getLocale());
- }
+ WebSession session = new WebSession(new ServletWebRequest(request));
+ assertEquals(locale, session.getLocale());
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java Mon Oct 15 14:21:25 2007
@@ -24,25 +24,28 @@
public class WicketFilterTest extends TestCase
{
- public void testFilterPath1() {
- InputStream in = WicketFilterTest.class.getResourceAsStream("web1.xml");
- String filterPath = getFilterPath("FilterTestApplication", in);
- assertEquals("filtertest/", filterPath);
+ public void testFilterPath1()
+ {
+ InputStream in = WicketFilterTest.class.getResourceAsStream("web1.xml");
+ String filterPath = getFilterPath("FilterTestApplication", in);
+ assertEquals("filtertest/", filterPath);
}
- public void testFilterPath2() {
+ public void testFilterPath2()
+ {
InputStream in = WicketFilterTest.class.getResourceAsStream("web2.xml");
String filterPath = getFilterPath("FilterTestApplication", in);
assertEquals("filtertest/", filterPath);
-}
+ }
private String getFilterPath(String string, InputStream in)
{
try
{
- Method method = WicketFilter.class.getDeclaredMethod("getFilterPath", new Class[] {String.class, InputStream.class});
+ Method method = WicketFilter.class.getDeclaredMethod("getFilterPath", new Class[] {
+ String.class, InputStream.class });
method.setAccessible(true);
- return method.invoke(new WicketFilter(), new Object[] {string, in}).toString();
+ return method.invoke(new WicketFilter(), new Object[] { string, in }).toString();
}
catch (SecurityException e)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanel.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanel.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanel.java Mon Oct 15 14:21:25 2007
@@ -21,19 +21,20 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class WicketPanel extends Panel
+public class WicketPanel extends Panel
{
private static final long serialVersionUID = 1L;
/**
* Construct.
+ *
* @param id
*/
- public WicketPanel(final String id)
+ public WicketPanel(final String id)
{
- super(id);
- }
+ super(id);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketPanelPage.java Mon Oct 15 14:21:25 2007
@@ -21,10 +21,10 @@
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class WicketPanelPage extends WebPage
+public class WicketPanelPage extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -32,8 +32,8 @@
* Construct.
*
*/
- public WicketPanelPage()
+ public WicketPanelPage()
{
- add(new WicketPanel("myPanel"));
- }
+ add(new WicketPanel("myPanel"));
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java Mon Oct 15 14:21:25 2007
@@ -27,8 +27,8 @@
/**
- * Simple application that demonstrates the mock http application code (and
- * checks that it is working)
+ * Simple application that demonstrates the mock http application code (and checks that it is
+ * working)
*
* @author Chris Turner
*/
@@ -54,6 +54,7 @@
super.setUp();
application = new WicketTester();
}
+
protected void tearDown() throws Exception
{
application.destroy();
@@ -73,7 +74,9 @@
/**
* Validate page 2 of the paged table.
- * @param document The document
+ *
+ * @param document
+ * The document
* @return The validation result
*/
private boolean validatePage1(String document)
@@ -111,7 +114,9 @@
/**
* Validate page 2 of the paged table.
- * @param document The document
+ *
+ * @param document
+ * The document
* @return The validation result
*/
private boolean validatePage2(String document)
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/LoginPage.java Mon Oct 15 14:21:25 2007
@@ -25,7 +25,8 @@
*/
private static final long serialVersionUID = 1L;
- public LoginPage() {
+ public LoginPage()
+ {
}
-
+
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/ProtectedPage.java Mon Oct 15 14:21:25 2007
@@ -20,18 +20,18 @@
import org.apache.wicket.markup.html.WebPage;
/**
- * The page that is protected and needs to redirect to the login page.
- */
+ * The page that is protected and needs to redirect to the login page.
+ */
public class ProtectedPage extends WebPage
{
- /**
+ /**
*
*/
private static final long serialVersionUID = 1L;
public ProtectedPage()
- {
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
- }
+ {
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java Mon Oct 15 14:21:25 2007
@@ -22,7 +22,7 @@
public class RestartWithMountedPageTest extends WicketTestCase
{
- /**
+ /**
* Construct.
*/
public RestartWithMountedPageTest()
@@ -32,7 +32,7 @@
/**
* Construct.
- *
+ *
* @param name
*/
public RestartWithMountedPageTest(String name)
@@ -40,21 +40,24 @@
super(name);
}
- /**
- * Tests that a protected page can redirect to a login page from a mounted package.
- */
- public void testWithMountedPackage() {
- tester.getApplication().mount("/test", PackageName.forPackage(ProtectedPage.class.getPackage()));
- tester.startPage(ProtectedPage.class);
- tester.assertRenderedPage(LoginPage.class);
- }
+ /**
+ * Tests that a protected page can redirect to a login page from a mounted package.
+ */
+ public void testWithMountedPackage()
+ {
+ tester.getApplication().mount("/test",
+ PackageName.forPackage(ProtectedPage.class.getPackage()));
+ tester.startPage(ProtectedPage.class);
+ tester.assertRenderedPage(LoginPage.class);
+ }
- /**
- * Tests that a protected page can redirect to a login page from mounted pages.
- */
- public void testWithMountedLoginPage() {
- tester.getApplication().mountBookmarkablePage("/login", LoginPage.class);
- tester.startPage(ProtectedPage.class);
- tester.assertRenderedPage(LoginPage.class);
- }
+ /**
+ * Tests that a protected page can redirect to a login page from mounted pages.
+ */
+ public void testWithMountedLoginPage()
+ {
+ tester.getApplication().mountBookmarkablePage("/login", LoginPage.class);
+ tester.startPage(ProtectedPage.class);
+ tester.assertRenderedPage(LoginPage.class);
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/MixedParamUrlCodingStrategyTest.java Mon Oct 15 14:21:25 2007
@@ -315,10 +315,12 @@
tester = new WicketTester();
tester.getApplication().getRequestCycleSettings().setResponseRequestEncoding("UTF-8");
}
+
protected void tearDown() throws Exception
{
tester.destroy();
}
+
/**
* @param parameterMap
* a map
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategyTest.java Mon Oct 15 14:21:25 2007
@@ -30,14 +30,16 @@
*/
public class QueryStringUrlCodingStrategyTest extends WicketTestCase
{
- private static final Logger log = LoggerFactory.getLogger(QueryStringUrlCodingStrategyTest.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(QueryStringUrlCodingStrategyTest.class);
/**
* Tests mounting.
*/
public void testQS()
{
- IRequestTargetUrlCodingStrategy ucs = new QueryStringUrlCodingStrategy("/mount/point", TestPage.class);
+ IRequestTargetUrlCodingStrategy ucs = new QueryStringUrlCodingStrategy("/mount/point",
+ TestPage.class);
PageParameters params = new PageParameters();
params.add("a", "1");
params.add("a", "2");
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java Mon Oct 15 14:21:25 2007
@@ -89,16 +89,17 @@
}
/**
- * Test direct access (with wicket parameters) to a mounted page that should
- * be allowed. By default, enforcement is not turned on, so we don't set it
- * as a setting here.
+ * Test direct access (with wicket parameters) to a mounted page that should be allowed. By
+ * default, enforcement is not turned on, so we don't set it as a setting here.
*/
public void testDirectAccessToMountedPageAllowed()
{
tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:"
- + TestPage.class.getName() + "");
+ tester
+ .getServletRequest()
+ .setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:" +
+ TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -112,9 +113,8 @@
}
/**
- * Test direct access (with wicket parameters) to a mounted page that should
- * NOT be allowed due to the {@link ISecuritySettings#getEnforceMounts()}
- * setting being set to true.
+ * Test direct access (with wicket parameters) to a mounted page that should NOT be allowed due
+ * to the {@link ISecuritySettings#getEnforceMounts()} setting being set to true.
*/
public void testDirectAccessToMountedPageNotAllowed()
{
@@ -136,12 +136,11 @@
}
/**
- * Test direct access (with wicket parameters) to a mounted page including
- * (part of the) mount path.
+ * Test direct access (with wicket parameters) to a mounted page including (part of the) mount
+ * path.
*
* @see WebRequestCycleProcessor#resolve(org.apache.wicket.RequestCycle,
- * org.apache.wicket.request.RequestParameters) for an explanation of
- * this test
+ * org.apache.wicket.request.RequestParameters) for an explanation of this test
*/
public void testDirectAccessToMountedPageWithExtraPath()
{
@@ -149,8 +148,8 @@
tester
.getServletRequest()
.setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:"
- + TestPage.class.getName() + "");
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:" +
+ TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ApplicationStringResourceLoaderTest.java Mon Oct 15 14:21:25 2007
@@ -27,6 +27,7 @@
/**
* Tests for the <code>ApplicationStringResourceLoader</code> class.
+ *
* @author Chris Turner
*/
public class ApplicationStringResourceLoaderTest extends StringResourceLoaderTestBase
@@ -34,7 +35,9 @@
/**
* Create the test case.
- * @param message The test name
+ *
+ * @param message
+ * The test name
*/
public ApplicationStringResourceLoaderTest(String message)
{
@@ -43,6 +46,7 @@
/**
* Return the loader instance
+ *
* @return The loader instance to test
*/
protected IStringResourceLoader createLoader()
@@ -58,8 +62,8 @@
WicketTester tester = new WicketTester();
WebApplication app = tester.getApplication();
IStringResourceLoader loader = new ClassStringResourceLoader(app.getClass());
- Assert.assertNull("Unknown resource should return null", loader.loadStringResource(component.getClass(),
- "test.string", Locale.getDefault(), null));
+ Assert.assertNull("Unknown resource should return null", loader.loadStringResource(
+ component.getClass(), "test.string", Locale.getDefault(), null));
tester.destroy();
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/BundleStringResourceLoaderTest.java Mon Oct 15 14:21:25 2007
@@ -25,6 +25,7 @@
/**
* Test case for the <code>BundleStringResourceLoader</code> class.
+ *
* @author Chris Turner
*/
public class BundleStringResourceLoaderTest extends StringResourceLoaderTestBase
@@ -32,7 +33,9 @@
/**
* Create the test case.
- * @param message The test name
+ *
+ * @param message
+ * The test name
*/
public BundleStringResourceLoaderTest(String message)
{
@@ -41,6 +44,7 @@
/**
* Create and return the loader instance.
+ *
* @return The loader instance to test
*/
protected IStringResourceLoader createLoader()
@@ -63,8 +67,8 @@
public void testLoaderUnknownResources()
{
IStringResourceLoader loader = new BundleStringResourceLoader("unknown.resource");
- Assert.assertNull("Unknown resource should return null", loader.loadStringResource(component.getClass(),
- "test.string", Locale.getDefault(), null));
+ Assert.assertNull("Unknown resource should return null", loader.loadStringResource(
+ component.getClass(), "test.string", Locale.getDefault(), null));
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java Mon Oct 15 14:21:25 2007
@@ -27,13 +27,16 @@
/**
* Test case for the <code>ComponentStringResourceLoader</code> class.
+ *
* @author Chris Turner
*/
public class ComponentStringResourceLoaderTest extends StringResourceLoaderTestBase
{
/**
* Create the test case.
- * @param message The test name
+ *
+ * @param message
+ * The test name
*/
public ComponentStringResourceLoaderTest(String message)
{
@@ -42,6 +45,7 @@
/**
* Create and return the loader instance
+ *
* @return The loader instance to test
*/
protected IStringResourceLoader createLoader()
@@ -61,55 +65,54 @@
DummyPage page = new DummyPage();
page.add(c);
IStringResourceLoader loader = new ComponentStringResourceLoader();
- Assert.assertNull("Missing resource should return null", loader.loadStringResource(c.getClass(), "test.string.bad",
- Locale.getDefault(), null));
+ Assert.assertNull("Missing resource should return null", loader.loadStringResource(c
+ .getClass(), "test.string.bad", Locale.getDefault(), null));
}
/**
- *
+ *
*/
public void testNullComponent()
{
- Assert.assertNull("Null component should skip resource load", loader.loadStringResource(null,
- "test.string", Locale.getDefault(), null));
+ Assert.assertNull("Null component should skip resource load", loader.loadStringResource(
+ null, "test.string", Locale.getDefault(), null));
}
/**
- *
+ *
*/
-// public void testNonPageComponent()
-// {
-// Component c = new DummyComponent("hello", application)
-// {
-// private static final long serialVersionUID = 1L;
-// };
-// IStringResourceLoader loader = new ComponentStringResourceLoader(tester.getApplication());
-// try
-// {
-// loader.loadStringResource(c.getClass(), "test.string", Locale.getDefault(), null);
-// Assert.fail("IllegalStateException should be thrown");
-// }
-// catch (IllegalStateException e)
-// {
-// // Expected result since component is not attached to a Page
-// }
-// }
-
-// /**
-// *
-// */
-// public void testPageEmbeddedComponentLoadFromPage()
-// {
-// DummyPage p = new DummyPage();
-// DummyComponent c = new DummyComponent("hello", application);
-// p.add(c);
-// IStringResourceLoader loader = new ComponentStringResourceLoader(tester.getApplication());
-// Assert.assertEquals("Valid resourse string should be found", "Another string", loader.loadStringResource(
-// c.getClass(), "another.test.string", Locale.getDefault(), null));
-// }
-
+// public void testNonPageComponent()
+// {
+// Component c = new DummyComponent("hello", application)
+// {
+// private static final long serialVersionUID = 1L;
+// };
+// IStringResourceLoader loader = new ComponentStringResourceLoader(tester.getApplication());
+// try
+// {
+// loader.loadStringResource(c.getClass(), "test.string", Locale.getDefault(), null);
+// Assert.fail("IllegalStateException should be thrown");
+// }
+// catch (IllegalStateException e)
+// {
+// // Expected result since component is not attached to a Page
+// }
+// }
+// /**
+// *
+// */
+// public void testPageEmbeddedComponentLoadFromPage()
+// {
+// DummyPage p = new DummyPage();
+// DummyComponent c = new DummyComponent("hello", application);
+// p.add(c);
+// IStringResourceLoader loader = new ComponentStringResourceLoader(tester.getApplication());
+// Assert.assertEquals("Valid resourse string should be found", "Another string",
+// loader.loadStringResource(
+// c.getClass(), "another.test.string", Locale.getDefault(), null));
+// }
/**
- *
+ *
*/
public void testMultiLevelEmbeddedComponentLoadFromComponent()
{
@@ -124,26 +127,31 @@
}
/**
- *
+ *
*/
public void testLoadDirectFromPage()
{
DummyPage p = new DummyPage();
IStringResourceLoader loader = new ComponentStringResourceLoader();
- Assert.assertEquals("Valid resourse string should be found", "Another string", loader.loadStringResource(
- p.getClass(), "another.test.string", Locale.getDefault(), null));
+ Assert
+ .assertEquals("Valid resourse string should be found", "Another string", loader
+ .loadStringResource(p.getClass(), "another.test.string", Locale
+ .getDefault(), null));
}
/**
- *
+ *
*/
public void testSearchClassHierarchyFromPage()
{
DummySubClassPage p = new DummySubClassPage();
IStringResourceLoader loader = new ComponentStringResourceLoader();
Assert.assertEquals("Valid resource string should be found", "SubClass Test String",
- loader.loadStringResource(p.getClass(), "subclass.test.string", Locale.getDefault(), null));
- Assert.assertEquals("Valid resource string should be found", "Another string",
- loader.loadStringResource(p.getClass(), "another.test.string", Locale.getDefault(), null));
+ loader.loadStringResource(p.getClass(), "subclass.test.string",
+ Locale.getDefault(), null));
+ Assert
+ .assertEquals("Valid resource string should be found", "Another string", loader
+ .loadStringResource(p.getClass(), "another.test.string", Locale
+ .getDefault(), null));
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Mon Oct 15 14:21:25 2007
@@ -40,12 +40,12 @@
{
return new WebResponse(servletResponse);
}
-
+
protected void outputDevelopmentModeWarning()
{
// Do nothing.
}
-
+
/**
* @see org.apache.wicket.protocol.http.WebApplication#newSessionStore()
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummyPage.java Mon Oct 15 14:21:25 2007
@@ -20,6 +20,7 @@
/**
* Dummy page used for resource testing.
+ *
* @author Chris Turner
*/
public class DummyPage extends WebPage
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummySubClassPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummySubClassPage.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummySubClassPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/resource/DummySubClassPage.java Mon Oct 15 14:21:25 2007
@@ -18,6 +18,7 @@
/**
* Dummy subclass page used for resource testing.
+ *
* @author Chris Turner
*/
public class DummySubClassPage extends DummyPage