Author: jonl
Date: Thu Mar 6 11:24:05 2008
New Revision: 634384
URL: http://svn.apache.org/viewvc?rev=634384&view=rev
Log:
changed getMarkupType() to return getPage().getMarkupType() and added
serialVersionUID for ChildList
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=634384&r1=634383&r2=634384&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
Thu Mar 6 11:24:05 2008
@@ -383,8 +383,7 @@
*/
public String getMarkupType()
{
- throw new IllegalStateException(
- exceptionMessage("You cannot directly subclass Page or
MarkupContainer. Instead, subclass a markup-specific class, such as WebPage or
WebMarkupContainer"));
+ return getPage().getMarkupType();
}
/**
@@ -1638,6 +1637,7 @@
private static class ChildList extends AbstractList implements
IClusterable
{
+ private static final long serialVersionUID =
-7861580911447631127L;
private int size;
private Object[] childs;
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java?rev=634384&r1=634383&r2=634384&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainer.java
Thu Mar 6 11:24:05 2008
@@ -54,7 +54,7 @@
*/
public String getMarkupType()
{
- return "html";
+ return getPage().getMarkupType();
}
/**
