You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 23:23:31 UTC
svn commit: r584925 [9/34] - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/
main/java/org/apache/wicket/ajax/mar...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java Mon Oct 15 14:21:25 2007
@@ -26,16 +26,14 @@
/**
- * Handler that sets unique tag id for every inline script and style element in
- * <wicket:head>, unless the element already has one. <br/> This is needed
- * to be able to detect multiple ajax header contribution. Tags that are not
- * inline (stript with src attribute set and link with href attribute set) do
- * not require id, because the detection is done by comparing URLs.
+ * Handler that sets unique tag id for every inline script and style element in <wicket:head>,
+ * unless the element already has one. <br/> This is needed to be able to detect multiple ajax
+ * header contribution. Tags that are not inline (stript with src attribute set and link with href
+ * attribute set) do not require id, because the detection is done by comparing URLs.
* <p>
- * Tags with wicket:id are <strong>not processed</strong>. To
- * setOutputWicketId(true) on attached component is developer's responsibility.
- * FIXME: Really? And if so, document properly
- *
+ * Tags with wicket:id are <strong>not processed</strong>. To setOutputWicketId(true) on attached
+ * component is developer's responsibility. FIXME: Really? And if so, document properly
+ *
* @author Matej Knopp
*/
public class HeadForceTagIdHandler extends AbstractMarkupFilter
@@ -51,8 +49,9 @@
/**
* Construct.
- *
- * @param markupFileClass Used to generated the a common prefix for the id
+ *
+ * @param markupFileClass
+ * Used to generated the a common prefix for the id
*/
public HeadForceTagIdHandler(final Class markupFileClass)
{
@@ -88,8 +87,8 @@
else if (inHead == true)
{
// is the tag open and has empty wicket:id?
- if ((tag instanceof WicketTag == false) && (tag.getId() == null)
- && (tag.isOpen() || tag.isOpenClose()) && needId(tag))
+ if ((tag instanceof WicketTag == false) && (tag.getId() == null) &&
+ (tag.isOpen() || tag.isOpenClose()) && needId(tag))
{
if (tag.getAttributes().get("id") == null)
{
@@ -104,7 +103,7 @@
}
/**
- *
+ *
* @param tag
* @return true, if id is needed
*/
@@ -124,7 +123,7 @@
}
/**
- *
+ *
* @return The next value
*/
private final int nextValue()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java Mon Oct 15 14:21:25 2007
@@ -29,9 +29,8 @@
/**
- * This is a markup inline filter. It identifies HTML specific issues which make
- * HTML not 100% xml compliant. E.g. tags like <p> often are missing the
- * corresponding close tag.
+ * This is a markup inline filter. It identifies HTML specific issues which make HTML not 100% xml
+ * compliant. E.g. tags like <p> often are missing the corresponding close tag.
*
* @author Juergen Donnerstag
*/
@@ -66,10 +65,9 @@
}
/**
- * Get the next MarkupElement from the parent MarkupFilter and handle it if
- * the specific filter criteria are met. Depending on the filter, it may
- * return the MarkupElement unchanged, modified or it remove by asking the
- * parent handler for the next tag.
+ * Get the next MarkupElement from the parent MarkupFilter and handle it if the specific filter
+ * criteria are met. Depending on the filter, it may return the MarkupElement unchanged,
+ * modified or it remove by asking the parent handler for the next tag.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
* @return Return the next eligible MarkupElement
@@ -92,8 +90,8 @@
}
else
{
- throw new ParseException("Tag " + top + " at " + top.getPos()
- + " did not have a close tag", top.getPos());
+ throw new ParseException("Tag " + top + " at " + top.getPos() +
+ " did not have a close tag", top.getPos());
}
}
@@ -126,7 +124,7 @@
if (mismatch)
{
top.setHasNoCloseTag(true);
-
+
// Pop any simple tags off the top of the stack
while (mismatch && !requiresCloseTag(top.getName()))
{
@@ -143,9 +141,9 @@
// it must be a real mismatch.
if (mismatch)
{
- throw new ParseException("Tag " + top.toUserDebugString()
- + " has a mismatched close tag at " + tag.toUserDebugString(),
- top.getPos());
+ throw new ParseException("Tag " + top.toUserDebugString() +
+ " has a mismatched close tag at " + tag.toUserDebugString(), top
+ .getPos());
}
}
@@ -154,8 +152,8 @@
}
else
{
- throw new ParseException("Tag " + tag.toUserDebugString()
- + " does not have a matching open tag", tag.getPos());
+ throw new ParseException("Tag " + tag.toUserDebugString() +
+ " does not have a matching open tag", tag.getPos());
}
}
else if (tag.isOpenClose())
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java Mon Oct 15 14:21:25 2007
@@ -26,13 +26,11 @@
/**
- * This is a markup inline filter. It assumes that WicketTagIdentifier has been
- * called first and search for a <head> tag (note: not wicket:head).
- * Provided the markup contains a <body> tag it will automatically prepend
- * a <head> tag if missing.
+ * This is a markup inline filter. It assumes that WicketTagIdentifier has been called first and
+ * search for a <head> tag (note: not wicket:head). Provided the markup contains a
+ * <body> tag it will automatically prepend a <head> tag if missing.
* <p>
- * Note: This handler is only relevant for Pages (see
- * MarkupParser.newFilterChain())
+ * Note: This handler is only relevant for Pages (see MarkupParser.newFilterChain())
*
* @see org.apache.wicket.markup.MarkupParser
* @author Juergen Donnerstag
@@ -58,8 +56,7 @@
* Construct.
*
* @param markup
- * The Markup object being filled while reading the markup
- * resource
+ * The Markup object being filled while reading the markup resource
*/
public HtmlHeaderSectionHandler(final Markup markup)
{
@@ -67,13 +64,11 @@
}
/**
- * Get the next tag from the next MarkupFilter in the chain and search for
- * Wicket specific tags.
+ * Get the next tag from the next MarkupFilter in the chain and search for Wicket specific tags.
* <p>
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- * @return The next tag from markup to be processed. If null, no more tags
- * are available
+ * @return The next tag from markup to be processed. If null, no more tags are available
*/
public MarkupElement nextTag() throws ParseException
{
@@ -133,8 +128,7 @@
}
/**
- * Insert <head> open and close tag (with empty body) to the current
- * position.
+ * Insert <head> open and close tag (with empty body) to the current position.
*/
private void insertHeadTag()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java Mon Oct 15 14:21:25 2007
@@ -27,9 +27,8 @@
/**
- * This is a markup inline filter which by default is not added to the list of
- * markup filter. It can be added by means of subclassing
- * Application.newMarkupParser() like
+ * This is a markup inline filter which by default is not added to the list of markup filter. It can
+ * be added by means of subclassing Application.newMarkupParser() like
*
* <pre>
* public class MyApplication extends Application
@@ -41,8 +40,7 @@
* }
* </pre>
*
- * The purpose of the filter is to find possible HTML issues and to log a
- * warning.
+ * The purpose of the filter is to find possible HTML issues and to log a warning.
*
* @author Juergen Donnerstag
*/
@@ -78,10 +76,9 @@
}
/**
- * Get the next MarkupElement from the parent MarkupFilter and handle it if
- * the specific filter criteria are met. Depending on the filter, it may
- * return the MarkupElement unchanged, modified or it remove by asking the
- * parent handler for the next tag.
+ * Get the next MarkupElement from the parent MarkupFilter and handle it if the specific filter
+ * criteria are met. Depending on the filter, it may return the MarkupElement unchanged,
+ * modified or it remove by asking the parent handler for the next tag.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
* @return Return the next eligible MarkupElement
@@ -128,8 +125,8 @@
}
/**
- * Handle the issue. Depending the setting either log a warning, an error,
- * throw an exception or ignore it.
+ * Handle the issue. Depending the setting either log a warning, an error, throw an exception or
+ * ignore it.
*
* @param msg
* The message
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java Mon Oct 15 14:21:25 2007
@@ -28,9 +28,8 @@
/**
- * This is a markup inline filter. It identifies tags which are allowed
- * open-close in the markup, but which for Wicket to be processed correctly
- * must be open-body-close.
+ * This is a markup inline filter. It identifies tags which are allowed open-close in the markup,
+ * but which for Wicket to be processed correctly must be open-body-close.
*
* @author Juergen Donnerstag
*/
@@ -56,10 +55,9 @@
}
/**
- * Get the next MarkupElement from the parent MarkupFilter and handle it if
- * the specific filter criteria are met. Depending on the filter, it may
- * return the MarkupElement unchanged, modified or it remove by asking the
- * parent handler for the next tag.
+ * Get the next MarkupElement from the parent MarkupFilter and handle it if the specific filter
+ * criteria are met. Depending on the filter, it may return the MarkupElement unchanged,
+ * modified or it remove by asking the parent handler for the next tag.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
* @return Return the next eligible MarkupElement
@@ -88,7 +86,7 @@
{
name = tag.getNamespace() + ":" + tag.getName();
}
-
+
// Pop any simple tags off the top of the stack
if (requiresOpenBodyCloseTag(name))
{
@@ -98,7 +96,7 @@
closeTag.setName(tag.getName());
closeTag.setNamespace(tag.getNamespace());
closeTag.closes(tag);
-
+
stack.push(new ComponentTag(closeTag));
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java Mon Oct 15 14:21:25 2007
@@ -31,18 +31,16 @@
/**
- * This is a markup inline filter. It identifies xml tags which include a href
- * attribute and which are not Wicket specific components and flags these tags
- * (ComponentTag) as autolink enabled. A component resolver will later resolve
- * the href and assign a BookmarkablePageLink to it (automatically).
+ * This is a markup inline filter. It identifies xml tags which include a href attribute and which
+ * are not Wicket specific components and flags these tags (ComponentTag) as autolink enabled. A
+ * component resolver will later resolve the href and assign a BookmarkablePageLink to it
+ * (automatically).
* <p>
- * An application setting is used as default value, which might be modified for
- * specific regions. These regions are identified by <wicket:link> tags
- * with an optional 'autolink' attribute. The default value for the attribute is
- * true, thus enabling autolinking. An open-close <wicket:link/> tag will
- * change the autolink status until the end of the markup document or the next
- * <wicket:link> tag respectively. <wicket:link> regions may be
- * nested.
+ * An application setting is used as default value, which might be modified for specific regions.
+ * These regions are identified by <wicket:link> tags with an optional 'autolink' attribute.
+ * The default value for the attribute is true, thus enabling autolinking. An open-close
+ * <wicket:link/> tag will change the autolink status until the end of the markup document or
+ * the next <wicket:link> tag respectively. <wicket:link> regions may be nested.
*
* @author Juergen Donnerstag
*/
@@ -83,10 +81,9 @@
}
/**
- * Get the next MarkupElement from the parent MarkupFilter and handles it if
- * the specific filter criteria are met. Depending on the filter, it may
- * return the MarkupElement unchanged, modified or it remove by asking the
- * parent handler for the next tag.
+ * Get the next MarkupElement from the parent MarkupFilter and handles it if the specific filter
+ * criteria are met. Depending on the filter, it may return the MarkupElement unchanged,
+ * modified or it remove by asking the parent handler for the next tag.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
* @return Return the next eligible MarkupElement
@@ -167,12 +164,10 @@
}
/**
- * Analyze the tag. If return value == true, a autolink component will be
- * created.
+ * Analyze the tag. If return value == true, a autolink component will be created.
* <p>
- * Subclass analyzeAutolinkCondition() to implement you own implementation
- * and register the new tag handler with the markup parser through
- * Application.newMarkupParser().
+ * Subclass analyzeAutolinkCondition() to implement you own implementation and register the new
+ * tag handler with the markup parser through Application.newMarkupParser().
*
* @param tag
* The current tag being parsed
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Mon Oct 15 14:21:25 2007
@@ -34,14 +34,12 @@
/**
- * This is a markup inline filter and a component resolver. It identifies
- * wicket:message attributes and adds an attribute modifier to the component tag
- * that can localize
- * wicket:message="attr-name:i18n-key,attr-name-2:i18n-key-2,..." expressions,
- * replacing values of attributes specified by attr-name with a localizer lookup
- * with key i18n-key. If an attribute being localized has a set value that value
- * will be used as the default value for the localization lookup. This handler
- * also resolves and localizes raw markup with wicket:message attribute.
+ * This is a markup inline filter and a component resolver. It identifies wicket:message attributes
+ * and adds an attribute modifier to the component tag that can localize
+ * wicket:message="attr-name:i18n-key,attr-name-2:i18n-key-2,..." expressions, replacing values of
+ * attributes specified by attr-name with a localizer lookup with key i18n-key. If an attribute
+ * being localized has a set value that value will be used as the default value for the localization
+ * lookup. This handler also resolves and localizes raw markup with wicket:message attribute.
*
* @author Juergen Donnerstag
* @author Igor Vaynberg
@@ -57,8 +55,7 @@
private final static String WICKET_MESSAGE_ATTRIBUTE_NAME = "wicket:message";
/**
- * The id automatically assigned to tags with wicket:message attribute but
- * without id
+ * The id automatically assigned to tags with wicket:message attribute but without id
*/
public final static String WICKET_MESSAGE_CONTAINER_ID = "_message_attr_";
@@ -75,8 +72,7 @@
/**
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- * @return The next tag to be processed. Null, if not more tags are
- * available
+ * @return The next tag to be processed. Null, if not more tags are available
*/
public final MarkupElement nextTag() throws ParseException
{
@@ -110,8 +106,8 @@
}
/**
- * Attribute localizing behavior. See the javadoc of
- * {@link WicketMessageTagHandler} for details.
+ * Attribute localizing behavior. See the javadoc of {@link WicketMessageTagHandler} for
+ * details.
*
* @author Igor Vaynberg (ivaynberg)
*/
@@ -167,8 +163,7 @@
/**
*
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
- * org.apache.wicket.markup.MarkupStream,
- * org.apache.wicket.markup.ComponentTag)
+ * org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
*/
public boolean resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java Mon Oct 15 14:21:25 2007
@@ -29,9 +29,8 @@
/**
- * This is a markup inline filter. It determines the Wicket namespace name from
- * the markup Examples are xmlns:wicket or
- * xmlns:wicket="http://wicket.apache.org".
+ * This is a markup inline filter. It determines the Wicket namespace name from the markup Examples
+ * are xmlns:wicket or xmlns:wicket="http://wicket.apache.org".
*
* @see org.apache.wicket.markup.MarkupParser
* @author Juergen Donnerstag
@@ -45,8 +44,7 @@
private final MarkupResourceData markup;
/**
- * namespace prefix: e.g. <html
- * xmlns:wicket="http://wicket.apache.org">
+ * namespace prefix: e.g. <html xmlns:wicket="http://wicket.apache.org">
*/
private static final String XMLNS = "xmlns:";
@@ -62,12 +60,10 @@
}
/**
- * Get the next tag from the next MarkupFilter in the chain and search for
- * Wicket specific tags.
+ * Get the next tag from the next MarkupFilter in the chain and search for Wicket specific tags.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- * @return The next tag from markup to be processed. If null, no more tags
- * are available
+ * @return The next tag from markup to be processed. If null, no more tags are available
*/
public MarkupElement nextTag() throws ParseException
{
@@ -92,8 +88,7 @@
}
/**
- * Determine wicket namespace from xmlns:wicket or
- * xmlns:wicket="http://wicket.apache.org"
+ * Determine wicket namespace from xmlns:wicket or xmlns:wicket="http://wicket.apache.org"
*
* @param tag
* @return Wicket namespace
@@ -114,8 +109,8 @@
final String xmlnsUrl = (String)entry.getValue();
// If Wicket relevant ...
- if ((xmlnsUrl == null) || (xmlnsUrl.trim().length() == 0)
- || xmlnsUrl.startsWith(WICKET_URI))
+ if ((xmlnsUrl == null) || (xmlnsUrl.trim().length() == 0) ||
+ xmlnsUrl.startsWith(WICKET_URI))
{
// Set the Wicket namespace for wicket tags (e.g.
// <wicket:panel>) and attributes (e.g. wicket:id)
@@ -123,11 +118,11 @@
if (Application.get().getMarkupSettings().getStripWicketTags())
{
attributes.remove(attributeName);
-
+
// Make sure the parser knows it has been changed
tag.setModified(true);
}
-
+
return namespace;
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java Mon Oct 15 14:21:25 2007
@@ -25,10 +25,9 @@
/**
- * This is a markup inline filter. It identifies preview regions useful for HTML
- * designers to design the page. But they must be removed prior to sending the
- * markup to the client. Preview regions are enclosed by <wicket:remove>
- * tags.
+ * This is a markup inline filter. It identifies preview regions useful for HTML designers to design
+ * the page. But they must be removed prior to sending the markup to the client. Preview regions are
+ * enclosed by <wicket:remove> tags.
*
* @author Juergen Donnerstag
*/
@@ -48,12 +47,11 @@
}
/**
- * Removes preview regions enclosed by <wicket:remove> tags. Note that
- * for obvious reasons, nested components are not allowed.
+ * Removes preview regions enclosed by <wicket:remove> tags. Note that for obvious
+ * reasons, nested components are not allowed.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- * @return The next tag to be processed. Null, if not more tags are
- * available
+ * @return The next tag to be processed. Null, if not more tags are available
*/
public final MarkupElement nextTag() throws ParseException
{
@@ -74,8 +72,8 @@
// remove tag must not be open-close tags
if (openTag.isOpenClose())
{
- throw new ParseException("Wicket remove tag must not be an open-close tag: "
- + openTag.toUserDebugString(), openTag.getPos());
+ throw new ParseException("Wicket remove tag must not be an open-close tag: " +
+ openTag.toUserDebugString(), openTag.getPos());
}
// Find the corresponding close tag and remove all tags in between
@@ -100,11 +98,11 @@
}
throw new ParseException(
- "Markup remove regions must not contain Wicket component tags. tag: "
- + closeTag.toUserDebugString(), closeTag.getPos());
+ "Markup remove regions must not contain Wicket component tags. tag: " +
+ closeTag.toUserDebugString(), closeTag.getPos());
}
- throw new ParseException("Did not find close tag for markup remove region. Open tag: "
- + openTag.toUserDebugString(), openTag.getPos());
+ throw new ParseException("Did not find close tag for markup remove region. Open tag: " +
+ openTag.toUserDebugString(), openTag.getPos());
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java Mon Oct 15 14:21:25 2007
@@ -30,9 +30,8 @@
/**
- * This is a markup inline filter. It identifies xml tags which have a special
- * meaning for Wicket. There are two type of tags which have a special meaning
- * for Wicket.
+ * This is a markup inline filter. It identifies xml tags which have a special meaning for Wicket.
+ * There are two type of tags which have a special meaning for Wicket.
* <p>
* <ul>
* <li>All tags with Wicket namespace, e.g. <wicket:remove></li>
@@ -61,18 +60,15 @@
}
/**
- * Get the next tag from the next MarkupFilter in the chain and search for
- * Wicket specific tags.
+ * Get the next tag from the next MarkupFilter in the chain and search for Wicket specific tags.
* <p>
- * Note: The xml parser - the next MarkupFilter in the chain - returns
- * XmlTags which are a subclass of MarkupElement. The implementation of this
- * filter will return either ComponentTags or ComponentWicketTags. Both are
- * subclasses of MarkupElement as well and both maintain a reference to the
- * XmlTag. But no XmlTag is returned.
+ * Note: The xml parser - the next MarkupFilter in the chain - returns XmlTags which are a
+ * subclass of MarkupElement. The implementation of this filter will return either ComponentTags
+ * or ComponentWicketTags. Both are subclasses of MarkupElement as well and both maintain a
+ * reference to the XmlTag. But no XmlTag is returned.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
- * @return The next tag from markup to be processed. If null, no more tags
- * are available
+ * @return The next tag from markup to be processed. If null, no more tags are available
*/
public MarkupElement nextTag() throws ParseException
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java Mon Oct 15 14:21:25 2007
@@ -34,18 +34,18 @@
* container followed by <code>populateItem(Component item)</code> to let the user populate the
* newly created item container with with custom components.
* </p>
- *
+ *
* @see org.apache.wicket.markup.repeater.RefreshingView
* @see org.apache.wicket.markup.html.navigation.paging.IPageable
- *
+ *
* @author Igor Vaynberg (ivaynberg)
- *
+ *
*/
public abstract class AbstractPageableView extends RefreshingView implements IPageable
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -88,7 +88,7 @@
/**
* This method retrieves the subset of models for items in the current page and allows
* RefreshingView to generate items.
- *
+ *
* @return iterator over models for items in the current page
*/
protected Iterator getItemModels()
@@ -111,7 +111,7 @@
/**
* Returns an iterator over models for items in the current page
- *
+ *
* @param offset
* index of first item in this page
* @param size
@@ -164,7 +164,7 @@
/**
* Sets the maximum number of items to show per page. The current page will also be set to zero
- *
+ *
* @param items
*/
protected final void internalSetRowsPerPage(int items)
@@ -343,7 +343,7 @@
/**
* Constructor
- *
+ *
* @param delegate
* delegate iterator
* @param max
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java Mon Oct 15 14:21:25 2007
@@ -23,8 +23,7 @@
/**
- * Implementation of <code>IItemReuseStrategy</code> that returns new items
- * every time.
+ * Implementation of <code>IItemReuseStrategy</code> that returns new items every time.
*
* @see org.apache.wicket.markup.repeater.IItemReuseStrategy
*
@@ -34,7 +33,7 @@
public class DefaultItemReuseStrategy implements IItemReuseStrategy
{
private static final long serialVersionUID = 1L;
-
+
private static final IItemReuseStrategy instance = new DefaultItemReuseStrategy();
/**
@@ -46,7 +45,8 @@
}
/**
- * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(IItemFactory, java.util.Iterator, java.util.Iterator)
+ * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(IItemFactory,
+ * java.util.Iterator, java.util.Iterator)
*/
public Iterator getItems(final IItemFactory factory, final Iterator newModels,
final Iterator existingItems)
@@ -68,9 +68,10 @@
public Object next()
{
Object next = newModels.next();
- if (next != null && ! (next instanceof IModel))
+ if (next != null && !(next instanceof IModel))
{
- throw new WicketRuntimeException("Expecting an instance of " + IModel.class.getName() + ", got " + next.getClass().getName());
+ throw new WicketRuntimeException("Expecting an instance of " +
+ IModel.class.getName() + ", got " + next.getClass().getName());
}
final IModel model = (IModel)next;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemFactory.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemFactory.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,7 @@
import org.apache.wicket.model.IModel;
/**
- * Factory interface for creating new child item containers for
- * <b>AbstractPageableView</b>.
+ * Factory interface for creating new child item containers for <b>AbstractPageableView</b>.
*
* @see org.apache.wicket.markup.repeater.AbstractPageableView
*
@@ -30,8 +29,8 @@
public interface IItemFactory
{
/**
- * Factory method for instances of Item. Each generated item must have a
- * unique id with respect to other generated items.
+ * Factory method for instances of Item. Each generated item must have a unique id with respect
+ * to other generated items.
*
* @param index
* the index of the new data item
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java Mon Oct 15 14:21:25 2007
@@ -24,9 +24,8 @@
/**
* Interface for item reuse strategies.
* <p>
- * <u>Notice:</u> Child items will be rendered in the order they are provided
- * by the returned iterator, so it is important that the strategy preserve this
- * order
+ * <u>Notice:</u> Child items will be rendered in the order they are provided by the returned
+ * iterator, so it is important that the strategy preserve this order
* </p>
*
* @author Igor Vaynberg (ivaynberg)
@@ -36,9 +35,8 @@
{
/**
- * Returns an iterator over items that will be added to the view. The
- * iterator needs to return all the items because the old ones are removed
- * prior to the new ones added.
+ * Returns an iterator over items that will be added to the view. The iterator needs to return
+ * all the items because the old ones are removed prior to the new ones added.
*
* @param factory
* implementation of IItemFactory
@@ -46,8 +44,7 @@
* iterator over models for items
* @param existingItems
* iterator over child items
- * @return iterator over items that will be added after all the old items
- * are moved.
+ * @return iterator over items that will be added after all the old items are moved.
*/
Iterator getItems(IItemFactory factory, Iterator newModels, Iterator existingItems);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java Mon Oct 15 14:21:25 2007
@@ -24,10 +24,9 @@
/**
- * Container that holds components in a RefreshingView. One Item represents one
- * entire row of the view. Users should add all containing components to the
- * Item instead of the view, this is accomplished by implementing
- * refreshingView.populateItem(Item item).
+ * Container that holds components in a RefreshingView. One Item represents one entire row of the
+ * view. Users should add all containing components to the Item instead of the view, this is
+ * accomplished by implementing refreshingView.populateItem(Item item).
*
* @see RefreshingView
*
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java Mon Oct 15 14:21:25 2007
@@ -24,15 +24,14 @@
/**
- * Reuse strategy that will reuse an old item if its model is equal to a model
- * inside the newModels iterator. Useful when state needs to be kept across
- * requests for as long as the item is visible within the view.
+ * Reuse strategy that will reuse an old item if its model is equal to a model inside the newModels
+ * iterator. Useful when state needs to be kept across requests for as long as the item is visible
+ * within the view.
* <p>
- * Notice that the <u>model</u> and not the <u>model object</u> needs to
- * implement the equals method. Most of the time it is a good idea to forward
- * the equals call to the object, however if a detachable model is used it is
- * often enough to compare object ids models point to ( this saves the model
- * from loading the object).
+ * Notice that the <u>model</u> and not the <u>model object</u> needs to implement the equals
+ * method. Most of the time it is a good idea to forward the equals call to the object, however if a
+ * detachable model is used it is often enough to compare object ids models point to ( this saves
+ * the model from loading the object).
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -40,7 +39,7 @@
public class ReuseIfModelsEqualStrategy implements IItemReuseStrategy
{
private static final long serialVersionUID = 1L;
-
+
private static IItemReuseStrategy instance = new ReuseIfModelsEqualStrategy();
/**
@@ -52,7 +51,8 @@
}
/**
- * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(IItemFactory, java.util.Iterator, java.util.Iterator)
+ * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(IItemFactory,
+ * java.util.Iterator, java.util.Iterator)
*/
public Iterator getItems(final IItemFactory factory, final Iterator newModels,
Iterator existingItems)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java Mon Oct 15 14:21:25 2007
@@ -22,9 +22,8 @@
/**
* DataView is a basic implementation of AbstractDataView.
*
- * Data views aim to make it very simple to populate your repeating view from a
- * database by utilizing {@link IDataProvider} to act as an interface between
- * the database and the dataview.
+ * Data views aim to make it very simple to populate your repeating view from a database by
+ * utilizing {@link IDataProvider} to act as an interface between the database and the dataview.
*
*
*
@@ -39,8 +38,8 @@
* </pre>
*
* <p>
- * Though this example is about a HTML table, DataView is not at all limited to
- * HTML tables. Any kind of list can be rendered using DataView.
+ * Though this example is about a HTML table, DataView is not at all limited to HTML tables. Any
+ * kind of list can be rendered using DataView.
* <p>
* And the related Java code:
*
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java Mon Oct 15 14:21:25 2007
@@ -26,9 +26,8 @@
/**
* Base class for data views.
*
- * Data views aim to make it very simple to populate your repeating view from a
- * database by utilizing {@link IDataProvider} to act as an interface between
- * the database and the dataview.
+ * Data views aim to make it very simple to populate your repeating view from a database by
+ * utilizing {@link IDataProvider} to act as an interface between the database and the dataview.
*
* @see IDataProvider
* @see DataView
@@ -77,8 +76,7 @@
}
/**
- * Helper class that converts input from IDataProvider to an iterator over
- * view items.
+ * Helper class that converts input from IDataProvider to an iterator over view items.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java Mon Oct 15 14:21:25 2007
@@ -24,7 +24,7 @@
/**
* A convenience class to represent an empty data provider.
- *
+ *
* @author Phil Kulak
*/
public class EmptyDataProvider implements IDataProvider
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java Mon Oct 15 14:21:25 2007
@@ -25,13 +25,13 @@
/**
- * A pageable DataView which breaks the data in the IDataProvider into a number
- * of data-rows, depending on the column size. A typical use case is to show
- * items in a table with ie 3 columns where the table is filled left to right
- * top-down so that for each third item a new row is created.
+ * A pageable DataView which breaks the data in the IDataProvider into a number of data-rows,
+ * depending on the column size. A typical use case is to show items in a table with ie 3 columns
+ * where the table is filled left to right top-down so that for each third item a new row is
+ * created.
* <p>
* Example
- *
+ *
* <pre>
* <tbody>
* <tr wicket:id="rows" class"even">
@@ -41,22 +41,22 @@
* </tr>
* </tbody>
* </pre>
- *
+ *
* and in java:
- *
+ *
* <pre>
* add(new GridView("rows", dataProvider).setColumns(3));
* </pre>
- *
+ *
* @author Igor Vaynberg
* @author Christian Essl
- *
+ *
*/
public abstract class GridView extends DataViewBase
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private int columns = 1;
@@ -85,7 +85,7 @@
/**
* Sets number of columns
- *
+ *
* @param cols
* number of columns
* @return this for chaining
@@ -114,8 +114,8 @@
public String toString()
{
- return "GridViewColumnsChange[component: " + getPath()
- + ", removed columns: " + old + "]";
+ return "GridViewColumnsChange[component: " + getPath() +
+ ", removed columns: " + old + "]";
}
});
}
@@ -135,7 +135,7 @@
/**
* Sets number of rows per page
- *
+ *
* @param rows
* number of rows
* @return this for chaining
@@ -164,8 +164,8 @@
public String toString()
{
- return "GridViewRowsChange[component: " + getPath() + ", removed rows: "
- + old + "]";
+ return "GridViewRowsChange[component: " + getPath() + ", removed rows: " +
+ old + "]";
}
});
}
@@ -256,18 +256,16 @@
}
/**
- * Add component to an Item for which there is no model anymore and is shown
- * in a cell
- *
+ * Add component to an Item for which there is no model anymore and is shown in a cell
+ *
* @param item
* Item object
*/
abstract protected void populateEmptyItem(Item item);
/**
- * Create a Item which represents an empty cell (there is no model for it in
- * the DataProvider)
- *
+ * Create a Item which represents an empty cell (there is no model for it in the DataProvider)
+ *
* @param id
* @param index
* @return created item
@@ -279,7 +277,7 @@
/**
* Create a new Item which will hold a row.
- *
+ *
* @param id
* @param index
* @return created Item
@@ -291,9 +289,9 @@
/**
* Iterator that iterates over all items in the cells
- *
+ *
* @author igor
- *
+ *
*/
private static class ItemsIterator implements Iterator
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java Mon Oct 15 14:21:25 2007
@@ -24,69 +24,70 @@
/**
* Interface used to provide data to data views.
- *
+ *
* Example:
- *
+ *
* <pre>
- * class UsersProvider implements IDataProvider {
- *
- * public Iterator iterator(int first, int count) {
- * ((MyApplication)Application.get()).getUserDao().iterator(first, count);
- * }
- *
- * public int size() {
- * ((MyApplication)Application.get()).getUserDao().getCount();
- * }
- *
- * public IModel model(Object object) {
- * return new DetachableUserModel((User)object);
- * }
- * }
+ * class UsersProvider implements IDataProvider
+ * {
+ *
+ * public Iterator iterator(int first, int count)
+ * {
+ * ((MyApplication)Application.get()).getUserDao().iterator(first, count);
+ * }
+ *
+ * public int size()
+ * {
+ * ((MyApplication)Application.get()).getUserDao().getCount();
+ * }
+ *
+ * public IModel model(Object object)
+ * {
+ * return new DetachableUserModel((User)object);
+ * }
+ * }
* </pre>
- *
- * You can use the {@link IDetachable#detach()} method for cleaning up your
- * IDataProvider instance. So that you can do one query that returns both
- * the size and the values if your dataset is small enough the be able to
- * do that.
- *
+ *
+ * You can use the {@link IDetachable#detach()} method for cleaning up your IDataProvider instance.
+ * So that you can do one query that returns both the size and the values if your dataset is small
+ * enough the be able to do that.
+ *
* @see IDetachable
* @see DataViewBase
* @see DataView
* @see GridView
- *
+ *
* @author Igor Vaynberg (ivaynberg)
- *
+ *
*/
public interface IDataProvider extends IDetachable
{
/**
* Gets an iterator for the subset of total data
- *
+ *
* @param first
* first row of data
* @param count
* minimum number of elements to retrieve
- *
+ *
* @return iterator capable of iterating over {first, first+count} items
*/
Iterator iterator(int first, int count);
/**
- * Gets total number of items in the collection represented by the
- * DataProvider
- *
+ * Gets total number of items in the collection represented by the DataProvider
+ *
* @return total item count
*/
int size();
/**
- * Callback used by the consumer of this data provider to wrap objects
- * retrieved from {@link #iterator(int, int)} with a model (usually a
- * detachable one).
- *
+ * Callback used by the consumer of this data provider to wrap objects retrieved from
+ * {@link #iterator(int, int)} with a model (usually a detachable one).
+ *
* @param object
* the object that needs to be wrapped
- *
+ *
* @return the model representation of the object
*/
IModel model(Object object);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java Mon Oct 15 14:21:25 2007
@@ -25,9 +25,8 @@
/**
- * Allows the use of lists with dataview. The only requirement is that either
- * list items must be serializable or model(Object) needs to be overridden to
- * provide the proper model implementation.
+ * Allows the use of lists with dataview. The only requirement is that either list items must be
+ * serializable or model(Object) needs to be overridden to provide the proper model implementation.
*
* @author Igor Vaynberg ( ivaynberg )
*
@@ -59,8 +58,8 @@
*/
public Iterator iterator(final int first, final int count)
{
- int toIndex = first+count;
- if(toIndex > list.size())
+ int toIndex = first + count;
+ if (toIndex > list.size())
{
toIndex = list.size();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ArrayIteratorAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ArrayIteratorAdapter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ArrayIteratorAdapter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ArrayIteratorAdapter.java Mon Oct 15 14:21:25 2007
@@ -22,10 +22,9 @@
/**
- * Iterator over an array. Implementation must provide
- * {@link ArrayIteratorAdapter#model(Object) } method to wrap each item in a
- * model before it is returned through {@link ArrayIteratorAdapter#next() }
- * method.
+ * Iterator over an array. Implementation must provide {@link ArrayIteratorAdapter#model(Object) }
+ * method to wrap each item in a model before it is returned through
+ * {@link ArrayIteratorAdapter#next() } method.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -78,9 +77,8 @@
}
/**
- * This method is used to wrap the provided object with an implementation of
- * IModel. The provided object is guaranteed to be returned from the
- * delegate iterator.
+ * This method is used to wrap the provided object with an implementation of IModel. The
+ * provided object is guaranteed to be returned from the delegate iterator.
*
* @param object
* object to be wrapped
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ModelIteratorAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ModelIteratorAdapter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ModelIteratorAdapter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/util/ModelIteratorAdapter.java Mon Oct 15 14:21:25 2007
@@ -23,8 +23,8 @@
/**
- * Iterator adapter that wraps adaptee's elements with a model. Convenient when
- * implementing {@link RefreshingView}.
+ * Iterator adapter that wraps adaptee's elements with a model. Convenient when implementing
+ * {@link RefreshingView}.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -69,9 +69,8 @@
}
/**
- * This method is used to wrap the provided object with an implementation of
- * IModel. The provided object is guaranteed to be returned from the
- * delegate iterator.
+ * This method is used to wrap the provided object with an implementation of IModel. The
+ * provided object is guaranteed to be returned from the delegate iterator.
*
* @param object
* object to be wrapped
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Mon Oct 15 14:21:25 2007
@@ -38,18 +38,15 @@
/**
- * <wicket:component class="myApp.MyTable" key=value> tags may be used to
- * add Wicket components (e.g. a specialized PageableListView) and pass
- * parameters (e.g. the number of rows per list view page). The object is
- * automatically instantiated, initialized and added to the page's component
- * hierarchy.
+ * <wicket:component class="myApp.MyTable" key=value> tags may be used to add Wicket
+ * components (e.g. a specialized PageableListView) and pass parameters (e.g. the number of rows per
+ * list view page). The object is automatically instantiated, initialized and added to the page's
+ * component hierarchy.
* <p>
- * Note: The component must have a constructor with a single String parameter:
- * the component name.
+ * Note: The component must have a constructor with a single String parameter: the component name.
* <p>
- * Note: The component must provide a setter for each key/value attribute
- * provided.
- *
+ * Note: The component must provide a setter for each key/value attribute provided.
+ *
* @author Juergen Donnerstag
*/
public final class AutoComponentResolver implements IComponentResolver
@@ -63,11 +60,10 @@
}
/**
- * Temporary storage for containers currently being rendered. Thus child
- * components can be re-parented. Remember: <wicket:component> are an
- * exception to the rule. Though the markup of the children are nested
- * inside <wicket:component>, their respective Java components are not. They
- * must be added to the parent container of <wicket:component>.
+ * Temporary storage for containers currently being rendered. Thus child components can be
+ * re-parented. Remember: <wicket:component> are an exception to the rule. Though the markup of
+ * the children are nested inside <wicket:component>, their respective Java components are not.
+ * They must be added to the parent container of <wicket:component>.
*/
private final Map nestedComponents = new HashMap();
@@ -150,10 +146,9 @@
/**
* Based on the tag, create and initialize the component.
- *
+ *
* @param container
- * The current container. The new component will be added to that
- * container.
+ * The current container. The new component will be added to that container.
* @param tag
* The tag containing the information about component
* @return The new component
@@ -195,38 +190,38 @@
}
catch (ClassNotFoundException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
catch (NoSuchMethodException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
catch (InvocationTargetException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
catch (IllegalAccessException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
catch (InstantiationException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
catch (ClassCastException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
catch (SecurityException e)
{
- throw new MarkupException("Unable to create Component from wicket tag: Cause: "
- + e.getMessage());
+ throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
+ e.getMessage());
}
// Get all remaining attributes and invoke the component's setters
@@ -251,7 +246,7 @@
/**
* Invoke the setter method for 'name' on object and provide the 'value'
- *
+ *
* @param object
* @param name
* @param value
@@ -282,16 +277,16 @@
if (method == null)
{
- throw new MarkupException("Unable to initialize Component. Method with name "
- + methodName + " not found");
+ throw new MarkupException("Unable to initialize Component. Method with name " +
+ methodName + " not found");
}
// The method must have a single parameter
final Class[] parameterClasses = method.getParameterTypes();
if (parameterClasses.length != 1)
{
- throw new MarkupException("Unable to initialize Component. Method with name "
- + methodName + " must have one and only one parameter");
+ throw new MarkupException("Unable to initialize Component. Method with name " +
+ methodName + " must have one and only one parameter");
}
// Convert the parameter if necessary, depending on the setter's
@@ -304,28 +299,28 @@
final Object param = converter.convertToObject(value, locale);
if (param == null)
{
- throw new MarkupException("Unable to convert value '" + value + "' into "
- + paramClass + ". May be there is no converter for that type registered?");
+ throw new MarkupException("Unable to convert value '" + value + "' into " +
+ paramClass + ". May be there is no converter for that type registered?");
}
method.invoke(object, new Object[] { param });
}
catch (IllegalAccessException ex)
{
throw new MarkupException(
- "Unable to initialize Component. Failure while invoking method " + methodName
- + ". Cause: " + ex);
+ "Unable to initialize Component. Failure while invoking method " + methodName +
+ ". Cause: " + ex);
}
catch (InvocationTargetException ex)
{
throw new MarkupException(
- "Unable to initialize Component. Failure while invoking method " + methodName
- + ". Cause: " + ex);
+ "Unable to initialize Component. Failure while invoking method " + methodName +
+ ". Cause: " + ex);
}
catch (NumberFormatException ex)
{
throw new MarkupException(
- "Unable to initialize Component. Failure while invoking method " + methodName
- + ". Cause: " + ex);
+ "Unable to initialize Component. Failure while invoking method " + methodName +
+ ". Cause: " + ex);
}
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Mon Oct 15 14:21:25 2007
@@ -41,31 +41,29 @@
import org.slf4j.LoggerFactory;
/**
- * The AutoLinkResolver is responsible to handle automatic link resolution. Tags
- * are marked "autolink" by the MarkupParser for all tags with href attribute,
- * such as anchor and link tags with no explicit wicket id. E.g. <a
- * href="Home.html">
+ * The AutoLinkResolver is responsible to handle automatic link resolution. Tags are marked
+ * "autolink" by the MarkupParser for all tags with href attribute, such as anchor and link tags
+ * with no explicit wicket id. E.g. <a href="Home.html">
* <p>
- * If href points to a *.html file, a BookmarkablePageLink will automatically be
- * created, except for absolute paths, where an ExternalLink is created.
+ * If href points to a *.html file, a BookmarkablePageLink will automatically be created, except for
+ * absolute paths, where an ExternalLink is created.
* <p>
- * If href points to a *.html file, it resolves the given URL by searching for a
- * page class, either relative or absolute, specified by the href attribute of
- * the tag. If relative the href URL must be relative to the package containing
- * the associated page. An exception is thrown if no Page class was found.
+ * If href points to a *.html file, it resolves the given URL by searching for a page class, either
+ * relative or absolute, specified by the href attribute of the tag. If relative the href URL must
+ * be relative to the package containing the associated page. An exception is thrown if no Page
+ * class was found.
* <p>
* If href is no *.html file a static reference to the resource is created.
- *
+ *
* @see org.apache.wicket.markup.parser.filter.WicketLinkTagHandler
- *
+ *
* @author Juergen Donnerstag
* @author Eelco Hillenius
*/
public final class AutoLinkResolver implements IComponentResolver
{
/**
- * Abstract implementation that has a helper method for creating a resource
- * reference.
+ * Abstract implementation that has a helper method for creating a resource reference.
*/
public static abstract class AbstractAutolinkResolverDelegate
implements
@@ -73,14 +71,13 @@
{
/**
* Creates a new auto component that references a package resource.
- *
+ *
* @param container
* the parent container
* @param autoId
* the automatically generated id for the auto component
* @param pathInfo
- * the path info object that contains information about the
- * link reference
+ * the path info object that contains information about the link reference
* @param attribute
* the attribute to replace the value of
* @return a new auto component or null if the path was absolute
@@ -129,10 +126,9 @@
}
/**
- * Autolink components delegate component resolution to their parent
- * components. Reason: autolink tags don't have wicket:id and users wouldn't
- * know where to add the component to.
- *
+ * Autolink components delegate component resolution to their parent components. Reason:
+ * autolink tags don't have wicket:id and users wouldn't know where to add the component to.
+ *
* @author Juergen Donnerstag
*/
public final static class AutolinkBookmarkablePageLink extends BookmarkablePageLink
@@ -142,19 +138,17 @@
private final String anchor;
/**
- * When using <wicket:link> to let Wicket lookup for pages and create
- * the related links, it's not possible to change the "setAutoEnable"
- * property, which defaults to true. This affects the prototype because,
- * sometimes designers _want_ links to be enabled.
+ * When using <wicket:link> to let Wicket lookup for pages and create the related links,
+ * it's not possible to change the "setAutoEnable" property, which defaults to true. This
+ * affects the prototype because, sometimes designers _want_ links to be enabled.
*/
public static boolean autoEnable = true;
/**
* Construct
- *
- * @see BookmarkablePageLink#BookmarkablePageLink(String, Class,
- * PageParameters)
- *
+ *
+ * @see BookmarkablePageLink#BookmarkablePageLink(String, Class, PageParameters)
+ *
* @param id
* @param pageClass
* @param parameters
@@ -177,7 +171,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.markup.html.link.BookmarkablePageLink#getURL()
*/
protected CharSequence getURL()
@@ -198,20 +192,18 @@
public static interface IAutolinkResolverDelegate
{
/**
- * Returns a new auto component based on the pathInfo object. The auto
- * component must have the autoId assigned as it's id. Should return
- * null in case the component could not be created as expected and the
- * default resolving should take place.
- *
+ * Returns a new auto component based on the pathInfo object. The auto component must have
+ * the autoId assigned as it's id. Should return null in case the component could not be
+ * created as expected and the default resolving should take place.
+ *
* @param container
* the parent container
* @param autoId
* the automatically generated id for the auto component
* @param pathInfo
- * the path info object that contains information about the
- * link reference
- * @return a new auto component or null in case this method couldn't
- * resolve to a proper auto component
+ * the path info object that contains information about the link reference
+ * @return a new auto component or null in case this method couldn't resolve to a proper
+ * auto component
*/
Component newAutoComponent(final MarkupContainer container, final String autoId,
final PathInfo pathInfo);
@@ -219,9 +211,8 @@
/**
* Encapsulates different aspects of a path. For instance, the path
- * <code>org.apache.wicket.markup.html.tree.Tree/tree.css</code> has
- * extension <code>css</code>, is relative (absolute == true) and has no
- * page parameters.
+ * <code>org.apache.wicket.markup.html.tree.Tree/tree.css</code> has extension
+ * <code>css</code>, is relative (absolute == true) and has no page parameters.
*/
public static final class PathInfo
{
@@ -245,10 +236,9 @@
/**
* Construct.
- *
+ *
* @param reference
- * the original reference (e.g the full value of a href
- * attribute)
+ * the original reference (e.g the full value of a href attribute)
*/
public PathInfo(final String reference)
{
@@ -299,7 +289,7 @@
/**
* Gets the anchor (e.g. #top)
- *
+ *
* @return anchor
*/
public final String getAnchor()
@@ -309,7 +299,7 @@
/**
* Gets extension.
- *
+ *
* @return extension
*/
public final String getExtension()
@@ -319,7 +309,7 @@
/**
* Gets pageParameters.
- *
+ *
* @return pageParameters
*/
public final PageParameters getPageParameters()
@@ -329,7 +319,7 @@
/**
* Gets path.
- *
+ *
* @return path
*/
public final String getPath()
@@ -339,7 +329,7 @@
/**
* Gets reference.
- *
+ *
* @return reference
*/
public final String getReference()
@@ -349,7 +339,7 @@
/**
* Gets absolute.
- *
+ *
* @return absolute
*/
public final boolean isAbsolute()
@@ -367,9 +357,8 @@
private static final String attribute = "href";
/**
- * Set of supported extensions for creating bookmarkable page links.
- * Anything that is not in this list will be handled as a resource
- * reference.
+ * Set of supported extensions for creating bookmarkable page links. Anything that is not in
+ * this list will be handled as a resource reference.
*/
private final Set supportedPageExtensions = new HashSet(4);
@@ -388,8 +377,7 @@
/**
* @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
- * java.lang.String,
- * org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
+ * java.lang.String, org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
*/
public Component newAutoComponent(final MarkupContainer container, final String autoId,
PathInfo pathInfo)
@@ -475,10 +463,9 @@
}
/**
- * Autolink components delegate component resolution to their parent
- * components. Reason: autolink tags don't have wicket:id and users wouldn't
- * know where to add the component to.
- *
+ * Autolink components delegate component resolution to their parent components. Reason:
+ * autolink tags don't have wicket:id and users wouldn't know where to add the component to.
+ *
* @author Juergen Donnerstag
*/
private final static class AutolinkExternalLink extends ExternalLink
@@ -487,7 +474,7 @@
/**
* Construct
- *
+ *
* @param id
* @param href
*/
@@ -506,17 +493,16 @@
}
/**
- * Resolver that returns the proper attribute value from a component tag
- * reflecting a URL reference such as src or href.
+ * Resolver that returns the proper attribute value from a component tag reflecting a URL
+ * reference such as src or href.
*/
private static interface ITagReferenceResolver
{
/**
- * Gets the reference attribute value of the tag depending on the type
- * of the tag. For instance, anchors use the <code>href</code>
- * attribute but script and image references use the <code>src</code>
- * attribute.
- *
+ * Gets the reference attribute value of the tag depending on the type of the tag. For
+ * instance, anchors use the <code>href</code> attribute but script and image references
+ * use the <code>src</code> attribute.
+ *
* @param tag
* The component tag. Not for modification.
* @return the tag value that constitutes the reference
@@ -525,10 +511,9 @@
}
/**
- * Autolink component that points to a {@link ResourceReference}. Autolink
- * component delegate component resolution to their parent components.
- * Reason: autolink tags don't have wicket:id and users wouldn't know where
- * to add the component to.
+ * Autolink component that points to a {@link ResourceReference}. Autolink component delegate
+ * component resolution to their parent components. Reason: autolink tags don't have wicket:id
+ * and users wouldn't know where to add the component to.
*/
private final static class ResourceReferenceAutolink extends WebMarkupContainer
{
@@ -575,7 +560,7 @@
/**
* Handles this link's tag.
- *
+ *
* @param tag
* the component tag
* @see org.apache.wicket.Component#onComponentTag(ComponentTag)
@@ -598,8 +583,8 @@
}
/**
- * Resolves to {@link ResourceReference} link components. Typically used
- * for header contributions like javascript and css files.
+ * Resolves to {@link ResourceReference} link components. Typically used for header
+ * contributions like javascript and css files.
*/
private static final class ResourceReferenceResolverDelegate
extends
@@ -609,7 +594,7 @@
/**
* Construct.
- *
+ *
* @param attribute
*/
public ResourceReferenceResolverDelegate(final String attribute)
@@ -619,8 +604,7 @@
/**
* @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
- * java.lang.String,
- * org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
+ * java.lang.String, org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
*/
public Component newAutoComponent(final MarkupContainer container, final String autoId,
final PathInfo pathInfo)
@@ -630,8 +614,7 @@
}
/**
- * Resolver object that returns the proper attribute value from component
- * tags.
+ * Resolver object that returns the proper attribute value from component tags.
*/
private static final class TagReferenceResolver implements ITagReferenceResolver
{
@@ -640,7 +623,7 @@
/**
* Construct.
- *
+ *
* @param attribute
* the attribute to fetch
*/
@@ -650,11 +633,10 @@
}
/**
- * Gets the reference attribute value of the tag depending on the type
- * of the tag. For instance, anchors use the <code>href</code>
- * attribute but script and image references use the <code>src</code>
- * attribute.
- *
+ * Gets the reference attribute value of the tag depending on the type of the tag. For
+ * instance, anchors use the <code>href</code> attribute but script and image references
+ * use the <code>src</code> attribute.
+ *
* @param tag
* The component tag. Not for modification.
* @return the tag value that constitutes the reference
@@ -666,8 +648,7 @@
}
/**
- * If no specific resolver is found, always use the href attribute for
- * references.
+ * If no specific resolver is found, always use the href attribute for references.
*/
private static final TagReferenceResolver DEFAULT_ATTRIBUTE_RESOLVER = new TagReferenceResolver(
"href");
@@ -678,14 +659,14 @@
private static final long serialVersionUID = 1L;
/**
- * Autolink resolver delegates for constructing new autolinks reference
- * keyed on tag name (such as <script> or <a>.
+ * Autolink resolver delegates for constructing new autolinks reference keyed on tag name (such
+ * as <script> or <a>.
*/
private final Map tagNameToAutolinkResolverDelegates = new HashMap();
/**
- * Resolver objects that know what attribute to read for getting the
- * reference keyed on tag name (such as <script> or <a>.
+ * Resolver objects that know what attribute to read for getting the reference keyed on tag name
+ * (such as <script> or <a>.
*/
private final Map tagNameToTagReferenceResolvers = new HashMap();
@@ -712,10 +693,9 @@
}
/**
- * Register (add or replace) a new resolver with the tagName and
- * attributeName. The resolver will be invoked each time an appropriate tag
- * and attribute is found.
- *
+ * Register (add or replace) a new resolver with the tagName and attributeName. The resolver
+ * will be invoked each time an appropriate tag and attribute is found.
+ *
* @param tagName
* The tag name
* @param attributeName
@@ -734,7 +714,7 @@
/**
* Get the resolver registered for 'tagName'
- *
+ *
* @param tagName
* The tag's name
* @return The resolver found. Null, if none registered
@@ -746,10 +726,10 @@
/**
* Automatically creates a BookmarkablePageLink component.
- *
+ *
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
* MarkupStream, ComponentTag)
- *
+ *
* @param markupStream
* The current markupStream
* @param tag
@@ -786,12 +766,12 @@
}
/**
- * Resolves the given tag's page class and page parameters by parsing the
- * tag component name and then searching for a page class at the absolute or
- * relative URL specified by the href attribute of the tag.
+ * Resolves the given tag's page class and page parameters by parsing the tag component name and
+ * then searching for a page class at the absolute or relative URL specified by the href
+ * attribute of the tag.
* <p>
* None html references are treated similar.
- *
+ *
* @param container
* The container where the link is
* @param id
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BodyContainerResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BodyContainerResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BodyContainerResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BodyContainerResolver.java Mon Oct 15 14:21:25 2007
@@ -22,20 +22,19 @@
import org.apache.wicket.markup.MarkupStream;
/**
- * The <body> tag has always a HtmlBodyContainer associated which is
- * always added to the Page. But it might be that a container has been added to
- * <html> which means that when trying to find the component associated
- * with the BODY_ID, it can not be found.
+ * The <body> tag has always a HtmlBodyContainer associated which is always added to the Page.
+ * But it might be that a container has been added to <html> which means that when trying to
+ * find the component associated with the BODY_ID, it can not be found.
* <p>
- * Someone might want to attach a component to the html tag for example to
- * change the xmlns:lang or lang attribute.
+ * Someone might want to attach a component to the html tag for example to change the xmlns:lang or
+ * lang attribute.
*
* @author Juergen Donnerstag
*/
public class BodyContainerResolver implements IComponentResolver
{
private static final long serialVersionUID = 1L;
-
+
/**
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
* MarkupStream, ComponentTag)
@@ -61,7 +60,7 @@
return true;
}
}
-
+
// We were not able to handle the tag
return false;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java Mon Oct 15 14:21:25 2007
@@ -26,16 +26,14 @@
import org.slf4j.LoggerFactory;
/**
- * In case of Border where the associated markup has a container in between the
- * wicket:border and the wicket:body tag, the wicket:body container can not be
- * resolved easily. Lets assume the container in the middle is a Form container,
- * than this Form container does not know how to resolve the wicket:body. Only
- * the Border component does know how to do it.
+ * In case of Border where the associated markup has a container in between the wicket:border and
+ * the wicket:body tag, the wicket:body container can not be resolved easily. Lets assume the
+ * container in the middle is a Form container, than this Form container does not know how to
+ * resolve the wicket:body. Only the Border component does know how to do it.
* <p>
- * Until 1.3, the original Border implementation, resolved these markup vs
- * component hierarchy mismatches, but the new implementation by purpose no
- * longer does. We want to minimize such mismatches for simplicity and clarity
- * reasons. No magic.
+ * Until 1.3, the original Border implementation, resolved these markup vs component hierarchy
+ * mismatches, but the new implementation by purpose no longer does. We want to minimize such
+ * mismatches for simplicity and clarity reasons. No magic.
*
* NOTE: This resolver will be removed again in Wicket 1.4(!)
*
@@ -85,9 +83,10 @@
{
component.render(markupStream);
- log.warn("Please consider to change your java code to something like: "
- + container.getId()
- + ".add(getBodyContainer()); for the component hierarchy to better reflect the markup hierarchy.");
+ log
+ .warn("Please consider to change your java code to something like: " +
+ container.getId() +
+ ".add(getBodyContainer()); for the component hierarchy to better reflect the markup hierarchy.");
}
return true;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java Mon Oct 15 14:21:25 2007
@@ -23,16 +23,14 @@
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
- * Usually you either have a markup file or a xml tag with
- * wicket:id="myComponent" to associate markup with a component. However in some
- * rare cases, especially when working with small panels it is a bit awkward to
- * maintain tiny pieces of markup in plenty of panel markup files. Use cases are
+ * Usually you either have a markup file or a xml tag with wicket:id="myComponent" to associate
+ * markup with a component. However in some rare cases, especially when working with small panels it
+ * is a bit awkward to maintain tiny pieces of markup in plenty of panel markup files. Use cases are
* for example list views where list items are different depending on a state.
* <p>
- * Inline panels provide a means to maintain the panels tiny piece of markup in
- * the parents markup file. During the render process, when Wicket iterates over
- * the markup file, the markup fragment must be ignored. It is only indirectly
- * referenced by component.
+ * Inline panels provide a means to maintain the panels tiny piece of markup in the parents markup
+ * file. During the render process, when Wicket iterates over the markup file, the markup fragment
+ * must be ignored. It is only indirectly referenced by component.
*
* @author Juergen Donnerstag
*/
@@ -45,7 +43,7 @@
// register "wicket:fragment"
WicketTagIdentifier.registerWellKnownTagName("fragment");
}
-
+
/**
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
* MarkupStream, ComponentTag)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java Mon Oct 15 14:21:25 2007
@@ -29,15 +29,13 @@
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
- * This is a tag resolver which handles <head> and
- * <wicket:head>tags. It must be registered (with the application) and
- * assumes that a ComponentTag respectively a WicketTag has already been created
- * (see HtmlheaderSectionHandler and WicketTagIdentifier).
+ * This is a tag resolver which handles <head> and <wicket:head>tags. It must be
+ * registered (with the application) and assumes that a ComponentTag respectively a WicketTag has
+ * already been created (see HtmlheaderSectionHandler and WicketTagIdentifier).
* <p>
- * Provided the current tag is a <head>, a HtmlHeaderContainer component
- * is created, (auto) added to the component hierarchie and immediately
- * rendered. Please see the javadoc for HtmlHeaderContainer on how it treats the
- * tag.
+ * Provided the current tag is a <head>, a HtmlHeaderContainer component is created, (auto)
+ * added to the component hierarchie and immediately rendered. Please see the javadoc for
+ * HtmlHeaderContainer on how it treats the tag.
* <p>
* In case of <wicket:head> a simple WebMarkupContainer handles the tag.
*
@@ -54,8 +52,7 @@
}
/**
- * Try to resolve the tag, then create a component, add it to the container
- * and render it.
+ * Try to resolve the tag, then create a component, add it to the container and render it.
*
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
* MarkupStream, ComponentTag)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java Mon Oct 15 14:21:25 2007
@@ -22,17 +22,15 @@
import org.apache.wicket.markup.MarkupStream;
/**
- * ApplicationSettings maintains a list of IComponentResolvers.
- * IComponentResolvers are responsible for mapping component names to Wicket
- * components.
+ * ApplicationSettings maintains a list of IComponentResolvers. IComponentResolvers are responsible
+ * for mapping component names to Wicket components.
*
* @author Juergen Donnerstag
*/
public interface IComponentResolver extends IClusterable
{
/**
- * Try to resolve the tag, then create a component, add it to the
- * container and render it.
+ * Try to resolve the tag, then create a component, add it to the container and render it.
*
* @param container
* The container parsing its markup
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java Mon Oct 15 14:21:25 2007
@@ -24,8 +24,8 @@
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
- * Detect <wicket:extend> and <wicket:child> tags, which are
- * silently ignored, because they have already been processed.
+ * Detect <wicket:extend> and <wicket:child> tags, which are silently ignored, because
+ * they have already been processed.
*
* @author Juergen Donnerstag
*/
@@ -79,8 +79,7 @@
}
/**
- * This is a WebMarkupContainer, except that it is transparent for it child
- * components.
+ * This is a WebMarkupContainer, except that it is transparent for it child components.
*/
private static class TransparentWebMarkupContainer extends WebMarkupContainer
{