Author: ivaynberg
Date: Fri Oct 16 16:16:57 2009
New Revision: 825978
URL: http://svn.apache.org/viewvc?rev=825978&view=rev
Log:
made panel abstract
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java?rev=825978&r1=825977&r2=825978&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Panel.java
Fri Oct 16 16:16:57 2009
@@ -59,7 +59,7 @@
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
-public class Panel extends WebMarkupContainerWithAssociatedMarkup
+public abstract class Panel extends WebMarkupContainerWithAssociatedMarkup
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java?rev=825978&r1=825977&r2=825978&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPage.java
Fri Oct 16 16:16:57 2009
@@ -20,6 +20,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
/**
@@ -47,7 +48,7 @@
Form form2 = new TestForm("form2");
add(form2);
- Panel panel1 = new Panel("panel1");
+ Panel panel1 = new EmptyPanel("panel1");
form2.add(panel1);
panel1.add(new MyTextField("text3", "input-3"));
panel1.add(new MyTextField("text4", "input-4"));
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java?rev=825978&r1=825977&r2=825978&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/ComponentStringResourceLoaderTest.java
Fri Oct 16 16:16:57 2009
@@ -21,6 +21,7 @@
import junit.framework.Assert;
import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
import org.apache.wicket.resource.loader.IStringResourceLoader;
@@ -86,7 +87,7 @@
public void testMultiLevelEmbeddedComponentLoadFromComponent()
{
DummyPage p = new DummyPage();
- Panel panel = new Panel("panel");
+ Panel panel = new EmptyPanel("panel");
p.add(panel);
DummyComponent c = new DummyComponent("hello", application);
panel.add(c);