You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/05/04 21:52:24 UTC
svn commit: r535365 - in /incubator/wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/markup/html/form/
main/java/org/apache/wicket/markup/html/list/ main/java/org/apache/wicket/...
Author: ehillenius
Date: Fri May 4 12:52:23 2007
New Revision: 535365
URL: http://svn.apache.org/viewvc?view=rev&rev=535365
Log:
fixed a couple of TODO after 1.2 ... issues
Removed:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestWithCryptedUrl.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java Fri May 4 12:52:23 2007
@@ -141,9 +141,6 @@
dirty();
}
- // TODO Post 1.2: We should encode the page id of the current page into the
- // URL for truly stateless pages so we can adjust the stack correctly
-
/**
* Returns a stack of PageMap.Access entries pushed in the order that the
* pages and versions were accessed.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Fri May 4 12:52:23 2007
@@ -679,11 +679,14 @@
* @param str
* @return encoded string
*/
- protected String encode(String str)
+ protected String encode(String s)
{
- // TODO Post 1.2: Java5: we can use str.replace(charseq, charseq) for
- // more efficient replacement
- return str.replaceAll("]", "]^");
+ if (s == null)
+ {
+ return null;
+ }
+
+ return Strings.replaceAll(s, "]", "]^").toString();
}
/**
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Fri May 4 12:52:23 2007
@@ -311,8 +311,6 @@
*
* @return The value in the request for this component
*/
- // TODO Post 1.2: make this final, if the users want to override this they
- // should really be overriding #getInputAsArray()
public String getInput()
{
String[] input = getInputAsArray();
@@ -933,18 +931,6 @@
return ints;
}
return null;
- }
-
- /**
- * Gets the request parameters for this component as strings.
- *
- * @return The values in the request for this component
- * @deprecated Use {@link #getInputAsArray()} instead
- */
- // TODO Post 1.2: remove
- protected final String[] inputAsStringArray()
- {
- return getInputAsArray();
}
/**
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java Fri May 4 12:52:23 2007
@@ -188,23 +188,6 @@
* validation will not work properly.
*
* @return Whether to reuse items
- * @deprecated Use {@link #getReuseItems()} instead
- */
- // TODO Post 1.2: Remove
- public boolean getOptimizeItemRemoval()
- {
- return getReuseItems();
- }
-
- /**
- * If true re-rendering the list view is more efficient if the windows
- * doesn't get changed at all or if it gets scrolled (compared to paging).
- * But if you modify the listView model object, than you must manually call
- * listView.removeAll() in order to rebuild the ListItems. If you nest a
- * ListView in a Form, ALLWAYS set this property to true, as otherwise
- * validation will not work properly.
- *
- * @return Whether to reuse items
*/
public boolean getReuseItems()
{
@@ -278,19 +261,6 @@
private static final long serialVersionUID = 1L;
/**
- * @see org.apache.wicket.Component#onBeforeRender()
- */
- protected void onBeforeRender()
- {
- super.onBeforeRender();
- setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == (getList().size() - 1))
- {
- setEnabled(false);
- }
- }
-
- /**
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
public void onClick()
@@ -316,6 +286,19 @@
ListView.this.removeAll();
}
}
+
+ /**
+ * @see org.apache.wicket.Component#onBeforeRender()
+ */
+ protected void onBeforeRender()
+ {
+ super.onBeforeRender();
+ setAutoEnable(false);
+ if (getList().indexOf(item.getModelObject()) == (getList().size() - 1))
+ {
+ setEnabled(false);
+ }
+ }
};
}
@@ -335,19 +318,6 @@
private static final long serialVersionUID = 1L;
/**
- * @see org.apache.wicket.Component#onBeforeRender()
- */
- protected void onBeforeRender()
- {
- super.onBeforeRender();
- setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == 0)
- {
- setEnabled(false);
- }
- }
-
- /**
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
public void onClick()
@@ -374,6 +344,19 @@
ListView.this.removeAll();
}
}
+
+ /**
+ * @see org.apache.wicket.Component#onBeforeRender()
+ */
+ protected void onBeforeRender()
+ {
+ super.onBeforeRender();
+ setAutoEnable(false);
+ if (getList().indexOf(item.getModelObject()) == 0)
+ {
+ setEnabled(false);
+ }
+ }
};
}
@@ -401,8 +384,8 @@
{
private static final long serialVersionUID = 1L;
- final Object removedObject = item.getModelObject();
final int oldIndex = getList().indexOf(item.getModelObject());
+ final Object removedObject = item.getModelObject();
public void undo()
{
@@ -423,22 +406,32 @@
}
/**
- * If true re-rendering the list view is more efficient if the windows
- * doesn't get changed at all or if it gets scrolled (compared to paging).
- * But if you modify the listView model object, than you must manually call
- * listView.removeAll() in order to rebuild the ListItems. If you nest a
- * ListView in a Form, ALLWAYS set this property to true, as otherwise
- * validation will not work properly.
+ * Sets the model as the provided list and removes all children, so that the
+ * next render will be using the contents of the model.
*
- * @param reuseItems
- * Whether to reuse items
- * @return this
- * @deprecated Use {@link #setReuseItems(boolean)} instead
+ * @param list
+ * The list for the new model. The list must implement
+ * {@link Serializable}.
+ * @return This for chaining
*/
- // TODO Post 1.2: Remove
- public ListView setOptimizeItemRemoval(boolean reuseItems)
+ public Component setList(List list)
{
- return setReuseItems(reuseItems);
+ return setModel(new Model((Serializable)list));
+ }
+
+ /**
+ * Sets the model and removes all current children, so that the next render
+ * will be using the contents of the model.
+ *
+ * @param model
+ * The new model
+ * @return This for chaining
+ *
+ * @see org.apache.wicket.MarkupContainer#setModel(org.apache.wicket.model.IModel)
+ */
+ public Component setModel(IModel model)
+ {
+ return super.setModel(model);
}
/**
@@ -502,35 +495,6 @@
}
/**
- * Sets the model as the provided list and removes all children, so that the
- * next render will be using the contents of the model.
- *
- * @param list
- * The list for the new model. The list must implement
- * {@link Serializable}.
- * @return This for chaining
- */
- public Component setList(List list)
- {
- return setModel(new Model((Serializable)list));
- }
-
- /**
- * Sets the model and removes all current children, so that the next render
- * will be using the contents of the model.
- *
- * @param model
- * The new model
- * @return This for chaining
- *
- * @see org.apache.wicket.MarkupContainer#setModel(org.apache.wicket.model.IModel)
- */
- public Component setModel(IModel model)
- {
- return super.setModel(model);
- }
-
- /**
* Subclasses may provide their own ListItemModel with extended
* functionality. The default ListItemModel works fine with mostly static
* lists where index remains valid. In cases where the underlying list
@@ -551,6 +515,17 @@
}
/**
+ * Create a new ListItem for list item at index.
+ *
+ * @param index
+ * @return ListItem
+ */
+ protected ListItem newItem(final int index)
+ {
+ return new ListItem(index, getListItemModel(getModel(), index));
+ }
+
+ /**
* @see org.apache.wicket.MarkupContainer#onBeforeRender()
*/
protected void onBeforeRender()
@@ -618,17 +593,6 @@
}
/**
- * Create a new ListItem for list item at index.
- *
- * @param index
- * @return ListItem
- */
- protected ListItem newItem(final int index)
- {
- return new ListItem(index, getListItemModel(getModel(), index));
- }
-
- /**
* Comes handy for ready made ListView based components which must implement
* populateItem() but you don't want to lose compile time error checking
* reminding the user to implement abstract populateItem().
@@ -640,31 +604,6 @@
}
/**
- * @see org.apache.wicket.markup.repeater.AbstractRepeater#renderIterator()
- */
- protected Iterator renderIterator()
- {
-
- final int size = getViewSize();
- return new ReadOnlyIterator()
- {
- private int index = 0;
-
- public boolean hasNext()
- {
- return index < size;
- }
-
- public Object next()
- {
- final String id = Integer.toString(firstIndex + index);
- index++;
- return get(id);
- }
- };
- }
-
- /**
* Populate a given item.
* <p>
* <b>be carefull</b> to add any components to the list item. So, don't do:
@@ -686,7 +625,6 @@
*/
protected abstract void populateItem(final ListItem item);
-
/**
* @see org.apache.wicket.markup.repeater.AbstractRepeater#renderChild(org.apache.wicket.Component)
*/
@@ -695,6 +633,7 @@
renderItem((ListItem)child);
}
+
/**
* Render a single item.
*
@@ -704,5 +643,30 @@
protected void renderItem(final ListItem item)
{
item.render(getMarkupStream());
+ }
+
+ /**
+ * @see org.apache.wicket.markup.repeater.AbstractRepeater#renderIterator()
+ */
+ protected Iterator renderIterator()
+ {
+
+ final int size = getViewSize();
+ return new ReadOnlyIterator()
+ {
+ private int index = 0;
+
+ public boolean hasNext()
+ {
+ return index < size;
+ }
+
+ public Object next()
+ {
+ final String id = Integer.toString(firstIndex + index);
+ index++;
+ return get(id);
+ }
+ };
}
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java Fri May 4 12:52:23 2007
@@ -93,9 +93,9 @@
/**
*
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
- * java.lang.String)
+ * CharSequence)
*/
- public abstract CharSequence transform(final Component component, final String output)
+ public abstract CharSequence transform(final Component component, final CharSequence output)
throws Exception;
/**
@@ -171,7 +171,6 @@
try
{
// Tranform the data
- // TODO post 1.2 transform also just charsequence, is this 1.2 or 1.1??
CharSequence output = transform(this, response.toString());
webResponse.write(output);
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Fri May 4 12:52:23 2007
@@ -92,7 +92,6 @@
Response response = requestCycle.getResponse();
// Tranform the data
- // TODO post 1.2 transform also just use a CharSequence param instead of string
CharSequence output = transform(component, response.toString());
this.webResponse.write(output);
}
@@ -130,8 +129,8 @@
/**
*
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
- * java.lang.String)
+ * CharSequence)
*/
- public abstract CharSequence transform(final Component component, final String output)
+ public abstract CharSequence transform(final Component component, final CharSequence output)
throws Exception;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java Fri May 4 12:52:23 2007
@@ -37,5 +37,5 @@
* @return The output which will be appended to the orginal response
* @throws Exception
*/
- CharSequence transform(final Component component, final String output) throws Exception;
+ CharSequence transform(final Component component, final CharSequence output) throws Exception;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java Fri May 4 12:52:23 2007
@@ -51,9 +51,9 @@
/**
*
- * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component, java.lang.String)
+ * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component, CharSequence)
*/
- public CharSequence transform(final Component component, final String output)
+ public CharSequence transform(final Component component, final CharSequence output)
{
return output;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java Fri May 4 12:52:23 2007
@@ -106,9 +106,9 @@
/**
*
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
- * java.lang.String)
+ * CharSequence)
*/
- public CharSequence transform(final Component component, final String output) throws Exception
+ public CharSequence transform(final Component component, final CharSequence output) throws Exception
{
return new XsltTransformer(this.xslFile).transform(component, output);
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java Fri May 4 12:52:23 2007
@@ -84,9 +84,10 @@
* component's id.
*
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
- * java.lang.String)
+ * CharSequence)
*/
- public CharSequence transform(final Component component, final String output) throws Exception
+ public CharSequence transform(final Component component, final CharSequence output)
+ throws Exception
{
IResourceStream resourceStream = getResourceStream(component);
@@ -110,8 +111,8 @@
// 3. Use the Transformer to transform an XML Source and send the
// output to a Result object.
StringWriter writer = new StringWriter();
- transformer.transform(new StreamSource(new StringReader(output)), new StreamResult(
- writer));
+ transformer.transform(new StreamSource(new StringReader(output.toString())),
+ new StreamResult(writer));
return writer.getBuffer();
}
@@ -135,15 +136,15 @@
String filePath = this.xslFile;
if (filePath == null)
{
- filePath = component.findParentWithAssociatedMarkup().getClass()
- .getPackage().getName().replace('.', '/')
- + "/" + component.getId();
+ filePath = component.findParentWithAssociatedMarkup().getClass().getPackage().getName()
+ .replace('.', '/')
+ + "/" + component.getId();
}
-
- resourceStream = Application.get().getResourceSettings().getResourceStreamLocator()
- .locate(getClass(), filePath, component.getStyle(), component.getLocale(),
- XsltTransformer.extension);
-
+
+ resourceStream = Application.get().getResourceSettings().getResourceStreamLocator().locate(
+ getClass(), filePath, component.getStyle(), component.getLocale(),
+ XsltTransformer.extension);
+
return resourceStream;
}
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java Fri May 4 12:52:23 2007
@@ -83,9 +83,9 @@
/**
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
- * java.lang.String)
+ * CharSequence)
*/
- public CharSequence transform(final Component component, final String output) throws Exception
+ public CharSequence transform(final Component component, final CharSequence output) throws Exception
{
return new XsltTransformer(this.xslFile).transform(component, output);
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java Fri May 4 12:52:23 2007
@@ -57,7 +57,7 @@
{
private static final long serialVersionUID = 1L;
- public CharSequence transform(Component component, String output)
+ public CharSequence transform(Component component, CharSequence output)
{
// replace the generated String
return "Whatever";
@@ -73,10 +73,10 @@
{
private static final long serialVersionUID = 1L;
- public CharSequence transform(Component component, String output)
+ public CharSequence transform(Component component, CharSequence output)
{
// Convert all text to uppercase
- return output.toUpperCase();
+ return output.toString().toUpperCase();
}
};
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java?view=diff&rev=535365&r1=535364&r2=535365
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java Fri May 4 12:52:23 2007
@@ -30,13 +30,12 @@
import org.apache.wicket.model.Model;
-
/**
* Mock page for testing.
- *
+ *
* @author Chris Turner
*/
-public class Page_2 extends WebPage
+public class Page_2 extends WebPage
{
private static final long serialVersionUID = 1L;
@@ -44,51 +43,51 @@
* Construct.
*
*/
- public Page_2()
+ public Page_2()
{
add(new Label("myLabel", "Test Label"));
-
- MarkupContainer container = new NoopOutputTransformerContainer("test");
-
- add(container);
- container.add(new Label("myLabel2", "Test Label2"));
- MarkupContainer panelContainer = new AbstractOutputTransformerContainer("test2")
- {
+ MarkupContainer container = new NoopOutputTransformerContainer("test");
+
+ add(container);
+ container.add(new Label("myLabel2", "Test Label2"));
+
+ MarkupContainer panelContainer = new AbstractOutputTransformerContainer("test2")
+ {
private static final long serialVersionUID = 1L;
- public CharSequence transform(Component component, String output)
+ public CharSequence transform(Component component, CharSequence output)
{
// replace the generated String
return "Whatever";
}
- };
+ };
- add(panelContainer);
- Panel panel = new Panel_1("myPanel");
- panel.setRenderBodyOnly(true);
- panelContainer.add(panel);
+ add(panelContainer);
+ Panel panel = new Panel_1("myPanel");
+ panel.setRenderBodyOnly(true);
+ panelContainer.add(panel);
- MarkupContainer borderContainer = new AbstractOutputTransformerContainer("test3")
- {
+ MarkupContainer borderContainer = new AbstractOutputTransformerContainer("test3")
+ {
private static final long serialVersionUID = 1L;
- public CharSequence transform(Component component, String output)
+ public CharSequence transform(Component component, CharSequence output)
{
// Convert all text to uppercase
- return output.toUpperCase();
+ return output.toString().toUpperCase();
}
- };
+ };
+
+ add(borderContainer);
+ Border border = new SimpleBorder("myBorder");
+ borderContainer.add(border);
+
+ Border border2 = new SimpleBorder("myBorder2");
+ border2.setRenderBodyOnly(false);
+ border2.add(new AttributeModifier("testAttr", true, new Model("myValue")));
+ add(border2);
- add(borderContainer);
- Border border = new SimpleBorder("myBorder");
- borderContainer.add(border);
-
- Border border2 = new SimpleBorder("myBorder2");
- border2.setRenderBodyOnly(false);
- border2.add(new AttributeModifier("testAttr", true, new Model("myValue")));
- add(border2);
-
- border2.add(new XsltTransformerBehavior());
- }
+ border2.add(new XsltTransformerBehavior());
+ }
}