You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/12/04 09:41:12 UTC
svn commit: r1042116 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket: ./ markup/
markup/html/basic/ markup/html/body/ markup/html/panel/ markup/resolver/
Author: jdonnerstag
Date: Sat Dec 4 08:41:11 2010
New Revision: 1042116
URL: http://svn.apache.org/viewvc?rev=1042116&view=rev
Log:
- javadoc
- removed BodyTagAttributeModifier (heritage)
- eliminated some code duplication
Issue: WICKET-3221
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/body/
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnumLabel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.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=1042116&r1=1042115&r2=1042116&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 Sat Dec 4 08:41:11 2010
@@ -3851,9 +3851,7 @@ public abstract class Component
{
// Get what tag was in the markup; not what the user it might
// have changed it to.
- markupStream.setCurrentIndex(markupStream.getCurrentIndex() - 1);
- markupOpenTag = markupStream.getTag();
- markupStream.next();
+ markupOpenTag = markupStream.getPreviousTag();
// If it was an open tag in the markup as well, than ...
if (markupOpenTag.isOpen())
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Sat Dec 4 08:41:11 2010
@@ -506,6 +506,22 @@ public class MarkupStream
}
/**
+ * Sometime its necessary to get the previous markup element versus the current one.
+ *
+ * @return The previous element (currentIndex - 1)
+ */
+ public final ComponentTag getPreviousTag()
+ {
+ MarkupElement elem = get(currentIndex - 1);
+ if ((elem instanceof ComponentTag) == false)
+ {
+ throwMarkupException("Tag expected");
+ }
+
+ return (ComponentTag)elem;
+ }
+
+ /**
* Throws a new markup exception
*
* @param message
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java Sat Dec 4 08:41:11 2010
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.ba
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.util.lang.Args;
/**
@@ -62,10 +63,7 @@ public class EnclosureContainer extends
{
super(id);
- if (child == null)
- {
- throw new NullPointerException("Parameter 'child' must not be null");
- }
+ Args.notNull(child, "child");
this.child = child;
@@ -73,9 +71,6 @@ public class EnclosureContainer extends
setRenderBodyOnly(true);
}
- /**
- * @see org.apache.wicket.Component#isVisible()
- */
@Override
public boolean isVisible()
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnumLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnumLabel.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnumLabel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/EnumLabel.java Sat Dec 4 08:41:11 2010
@@ -73,10 +73,6 @@ public class EnumLabel<T extends Enum<T>
super(id, model);
}
- /**
- * @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
- * org.apache.wicket.markup.ComponentTag)
- */
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
@@ -115,9 +111,6 @@ public class EnumLabel<T extends Enum<T>
return "";
}
- /**
- * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected void onComponentTag(ComponentTag tag)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/Label.java Sat Dec 4 08:41:11 2010
@@ -104,23 +104,17 @@ public class Label extends WebComponent
super(id, model);
}
- /**
- * @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
- * org.apache.wicket.markup.ComponentTag)
- */
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
replaceComponentTagBody(markupStream, openTag, getDefaultModelObjectAsString());
}
- /**
- * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
+
// always transform the tag to <span></span> so even labels defined as <span/> render
tag.setType(TagType.OPEN);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java Sat Dec 4 08:41:11 2010
@@ -72,23 +72,18 @@ public class MultiLineLabel extends WebC
super(id, model);
}
- /**
- * @see org.apache.wicket.Component#onComponentTagBody(MarkupStream, ComponentTag)
- */
@Override
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
- final CharSequence body = Strings.toMultilineMarkup(getDefaultModelObjectAsString());
+ CharSequence body = Strings.toMultilineMarkup(getDefaultModelObjectAsString());
replaceComponentTagBody(markupStream, openTag, body);
}
- /**
- * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
- */
@Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
+
// always transform the tag to <span></span> so even labels defined as <span/> render
tag.setType(TagType.OPEN);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java Sat Dec 4 08:41:11 2010
@@ -148,7 +148,7 @@ public class Fragment extends WebMarkupC
protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
// Skip the components body. It will be replaced by the fragment
- if (((ComponentTag)markupStream.get(markupStream.getCurrentIndex() - 1)).isOpen())
+ if (markupStream.getPreviousTag().isOpen())
{
markupStream.skipRawMarkup();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=1042116&r1=1042115&r2=1042116&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Sat Dec 4 08:41:11 2010
@@ -363,9 +363,7 @@ public class WicketMessageResolver imple
Map<String, CharSequence> childTags = new HashMap<String, CharSequence>();
// get original tag from markup because we modified openTag to always be open
- markupStream.setCurrentIndex(markupStream.getCurrentIndex() - 1);
- ComponentTag tag = markupStream.getTag();
- markupStream.next();
+ ComponentTag tag = markupStream.getPreviousTag();
// if the tag is of form <wicket:message>{foo}</wicket:message> then scan for any
// child component and save their tag index