Author: jdonnerstag
Date: Fri Oct 23 10:16:33 2009
New Revision: 828987
URL: http://svn.apache.org/viewvc?rev=828987&view=rev
Log:
a) changed all components to use render() instead of render(MarkupStream).
b) changed onRender(MarkupStream) to onRender()
c) the component is no longer responsible to forward the markupstream index
after rendering, only while rendering. Which means that whatever
component.getMarkup() returns is what the component renders. The parent
component makes sure that the parent markup is moved forward appropriately.
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java?rev=828987&r1=828986&r2=828987&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
Fri Oct 23 10:16:33 2009
@@ -29,7 +29,6 @@
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
-import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.response.NullResponse;
@@ -52,7 +51,7 @@
private final List<IRenderable> renderables = new
ArrayList<IRenderable>();
- private boolean treeHasLeftColumn;
+ private final boolean treeHasLeftColumn;
/**
* Constructor.
@@ -189,21 +188,14 @@
}
/**
- * Renders all columns.
- *
- * @param markupStream
- * The markup stream of this component
+ * @see org.apache.wicket.MarkupContainer#onRender()
*/
@Override
- protected void onRender(final MarkupStream markupStream)
+ protected void onRender()
{
- final int markupStart = markupStream.getCurrentIndex();
Response response = RequestCycle.get().getResponse();
double widths[] = computeColumnWidths();
- boolean rendered = false; // has been at least one column
(component,
- // not renderable) rendered?
-
NumberFormat nf =
NumberFormat.getNumberInstance(Locale.ENGLISH);
nf.setMaximumFractionDigits(0);
nf.setMaximumFractionDigits(2);
@@ -226,9 +218,7 @@
if (component != null) // is there a component for
current column?
{
// render the component
- markupStream.setCurrentIndex(markupStart);
- component.render(markupStream);
- rendered = true;
+ component.render();
}
else if (renderable != null) // no component - try to
render
// renderable
@@ -260,20 +250,11 @@
if (components.get(i) != null)
{
Response old =
RequestCycle.get().setResponse(NullResponse.getInstance());
-
markupStream.setCurrentIndex(markupStart);
-
(components.get(i)).render(markupStream);
+ (components.get(i)).render();
RequestCycle.get().setResponse(old);
- rendered = true;
}
-
}
}
}
-
- // if no component was rendered just advance in the markup
stream
- if (rendered == false)
- {
- markupStream.skipComponent();
- }
}
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java?rev=828987&r1=828986&r2=828987&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
Fri Oct 23 10:16:33 2009
@@ -26,7 +26,6 @@
import org.apache.wicket.Response;
import
org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
-import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -97,20 +96,15 @@
}
/**
- * Renders the columns.
- *
- * @param markupStream
- * The markup stream of this component
+ * @see org.apache.wicket.MarkupContainer#onRender()
*/
@Override
- protected void onRender(final MarkupStream markupStream)
+ protected void onRender()
{
- final int markupStart = markupStream.getCurrentIndex();
Response response = RequestCycle.get().getResponse();
boolean firstLeft = true; // whether there was no left column
rendered
// yet
- boolean rendered = false;
for (int i = 0; i < columns.size(); ++i)
{
@@ -134,9 +128,7 @@
if (component != null)
{
- markupStream.setCurrentIndex(markupStart);
- component.render(markupStream);
- rendered = true;
+ component.render();
}
else if (renderable != null)
{
@@ -150,12 +142,6 @@
response.write("</span></span>\n");
}
-
- // if no component was rendered just advance in the markup
stream
- if (rendered == false)
- {
- markupStream.skipComponent();
- }
}
/**
Modified:
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java?rev=828987&r1=828986&r2=828987&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
(original)
+++
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
Fri Oct 23 10:16:33 2009
@@ -19,7 +19,6 @@
import java.util.Map;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.MarkupStream;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -152,7 +151,7 @@
}
@Override
- protected void onRender(MarkupStream markupStream)
+ protected void onRender()
{
// Do nothing.
}
