Author: jdonnerstag
Date: Fri Sep 18 19:54:11 2009
New Revision: 816760
URL: http://svn.apache.org/viewvc?rev=816760&view=rev
Log:
fixed: Remove IComponentBorder in favor of IBehavior
Issue: WICKET-2280
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/IComponentBorder.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=816760&r1=816759&r2=816760&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Fri Sep
18 19:54:11 2009
@@ -316,38 +316,6 @@
}
/**
- * Undo change for component border property
- *
- * @author ivaynberg
- * @deprecated since 1.4 please use IBehavior renderBefore and
renderAfter instead
- */
- @Deprecated
- private class ComponentBorderChange extends Change
- {
- private static final long serialVersionUID = 1L;
-
- private final IComponentBorder old = getComponentBorder();
-
- /**
- * @see org.apache.wicket.version.undo.Change#undo()
- */
- @Override
- public void undo()
- {
- setComponentBorder(old);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return getClass().getSimpleName() + "[component: " +
getPath() + ",border:" + old + "]";
- }
- }
-
- /**
* Change object for undoing removal of behavior
*
* @author Igor Vaynberg (ivaynberg)
@@ -528,17 +496,6 @@
*/
public static final Action RENDER = new Action(Action.RENDER);
- /**
- * meta data key for missing body tags logging.
- *
- * @deprecated since 1.4 please use IBehavior renderBefore and
renderAfter instead
- */
- @Deprecated
- private static final MetaDataKey<IComponentBorder> BORDER_KEY = new
MetaDataKey<IComponentBorder>()
- {
- private static final long serialVersionUID = 1L;
- };
-
/** meta data for user specified markup id */
private static final MetaDataKey<String> MARKUP_ID_KEY = new
MetaDataKey<String>()
{
@@ -1387,16 +1344,6 @@
}
/**
- * @return component border assigned to this component, or null if none
- * @deprecated since 1.4 please use IBehavior renderBefore and
renderAfter instead
- */
- @Deprecated
- public final IComponentBorder getComponentBorder()
- {
- return getMetaData(BORDER_KEY);
- }
-
- /**
* Gets the converter that should be used by this component.
*
* @param type
@@ -2457,19 +2404,10 @@
try
{
- // Call implementation to render component
- final IComponentBorder border =
getComponentBorder();
- if (border != null)
- {
- border.renderBefore(this);
- }
notifyBehaviorsComponentBeforeRender();
onRender(markupStream);
notifyBehaviorsComponentRendered();
- if (border != null)
- {
- border.renderAfter(this);
- }
+
// Component has been rendered
rendered();
}
@@ -2788,26 +2726,6 @@
}
/**
- * Assigns a component border to this component. If called with
<code>null</code> any previous
- * border will be cleared.
- *
- * @param border
- * component border to assign, or <code>null</code> to clear
any previous
- * @return component for chaining
- * @deprecated since 1.4 please use IBehavior renderBefore and
renderAfter instead
- */
- @Deprecated
- public final Component setComponentBorder(final IComponentBorder border)
- {
- if (!Objects.equal(getComponentBorder(), border))
- {
- addStateChange(new ComponentBorderChange());
- }
- setMetaData(BORDER_KEY, border);
- return this;
- }
-
- /**
* Sets whether this component is enabled. Specific components may
decide to implement special
* behavior that uses this property, like web form components that add
a disabled='disabled'
* attribute when enabled is false. If it is not enabled, it will not
be allowed to call any
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java?rev=816760&r1=816759&r2=816760&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/PageParameters.java Fri
Sep 18 19:54:11 2009
@@ -58,7 +58,9 @@
*
* @param parameterMap
* The map to copy
- * @see ValueMap#ValueMap(java.util.Map)
+ *
+ * @see RequestUtils#decodeParameters(String, ValueMap)
+ * @see ValueMap#ValueMap(String, String)
*/
public PageParameters(final Map<String, ?> parameterMap)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java?rev=816760&r1=816759&r2=816760&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
Fri Sep 18 19:54:11 2009
@@ -21,11 +21,11 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.IComponentBorder;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.ContainerInfo;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupElement;
@@ -43,7 +43,7 @@
*
* @author jcompagner
*/
-public class MarkupComponentBorder implements IComponentBorder
+public class MarkupComponentBorder extends AbstractBehavior
{
static
{
@@ -60,10 +60,10 @@
private transient MarkupStream markupStream;
/**
- *
- * @see
org.apache.wicket.IComponentBorder#renderBefore(org.apache.wicket.Component)
+ * @see
org.apache.wicket.behavior.AbstractBehavior#beforeRender(org.apache.wicket.Component)
*/
- public void renderBefore(Component component)
+ @Override
+ public void beforeRender(final Component component)
{
final MarkupStream stream = getMarkupStream(component);
final Response response = component.getResponse();
@@ -121,10 +121,10 @@
}
/**
- *
- * @see IComponentBorder#renderAfter(org.apache.wicket.Component)
+ * @see
org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
- public void renderAfter(Component component)
+ @Override
+ public void onRendered(final Component component)
{
final MarkupStream stream = getMarkupStream(component);
final Response response = component.getResponse();
@@ -157,7 +157,7 @@
* @param component
* @return markup stream
*/
- private MarkupStream getMarkupStream(Component component)
+ private MarkupStream getMarkupStream(final Component component)
{
if (markupStream == null)
{
@@ -171,7 +171,7 @@
* @param owner
* @return markup stream
*/
- private MarkupStream findMarkupStream(Component owner)
+ private MarkupStream findMarkupStream(final Component owner)
{
final String markupType = getMarkupType(owner);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=816760&r1=816759&r2=816760&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
Fri Sep 18 19:54:11 2009
@@ -20,9 +20,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.IComponentBorder;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.Response;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -105,7 +103,7 @@
// add junction link
Object node = item.getDefaultModelObject();
Component junctionLink = newJunctionLink(item,
JUNCTION_LINK_ID, node);
- junctionLink.setComponentBorder(new JunctionBorder(node,
level));
+ junctionLink.add(new JunctionBorder(node, level));
item.add(junctionLink);
// add node component
@@ -197,7 +195,7 @@
*
* @author Matej Knopp
*/
- private class JunctionBorder implements IComponentBorder
+ private class JunctionBorder extends AbstractBehavior
{
private static final long serialVersionUID = 1L;
@@ -216,14 +214,22 @@
this.level = level;
}
- public void renderAfter(Component component)
+ /**
+ * @see
org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
+ */
+ @Override
+ public void onRendered(final Component component)
{
- RequestCycle.get().getResponse().write("</td>");
+ component.getResponse().write("</td>");
}
- public void renderBefore(Component component)
+ /**
+ * @see
org.apache.wicket.behavior.AbstractBehavior#beforeRender(org.apache.wicket.Component)
+ */
+ @Override
+ public void beforeRender(final Component component)
{
- Response response = RequestCycle.get().getResponse();
+ Response response = component.getResponse();
Object parent = getParentNode(node);
CharSequence classes[] = new CharSequence[level];
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java?rev=816760&r1=816759&r2=816760&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
Fri Sep 18 19:54:11 2009
@@ -36,7 +36,7 @@
*/
public MarkupComponentBorderTestPage()
{
- add(new Label("label", "label").setComponentBorder(new
BeforeAndAfterBorder()));
- add(new Label("label2", "label2").setComponentBorder(new
BeforeAndAfterBorder2()));
+ add(new Label("label", "label").add(new
BeforeAndAfterBorder()));
+ add(new Label("label2", "label2").add(new
BeforeAndAfterBorder2()));
}
}
