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 [3/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/authorization/IAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java Mon Oct 15 14:21:25 2007
@@ -20,12 +20,11 @@
import org.apache.wicket.settings.ISecuritySettings;
/**
- * Authorization strategies specify aspect-like constraints on significant
- * actions taken by the framework in a given application. These constraints are
- * guaranteed by the framework to be applied consistently throughout. Violations
- * will result in a security action directed by the strategy, such as the
- * throwing of an AuthorizationException or the filtering out of
- * security-sensitive information.
+ * Authorization strategies specify aspect-like constraints on significant actions taken by the
+ * framework in a given application. These constraints are guaranteed by the framework to be applied
+ * consistently throughout. Violations will result in a security action directed by the strategy,
+ * such as the throwing of an AuthorizationException or the filtering out of security-sensitive
+ * information.
*
* @author Eelco Hillenius
* @author Jonathan Locke
@@ -57,17 +56,15 @@
};
/**
- * Checks whether an instance of the given component class may be created.
- * If this method returns false, the
- * {@link IUnauthorizedComponentInstantiationListener} that is configured in
- * the {@link ISecuritySettings security settings} will be called. The
- * default implementation of that listener throws a
- * {@link UnauthorizedInstantiationException}.
+ * Checks whether an instance of the given component class may be created. If this method
+ * returns false, the {@link IUnauthorizedComponentInstantiationListener} that is configured in
+ * the {@link ISecuritySettings security settings} will be called. The default implementation of
+ * that listener throws a {@link UnauthorizedInstantiationException}.
* <p>
- * If you wish to implement a strategy that authenticates users which cannot
- * access a given Page (or other Component), you can simply throw a
- * {@link org.apache.wicket.RestartResponseAtInterceptPageException} in your
- * implementation of this method.
+ * If you wish to implement a strategy that authenticates users which cannot access a given Page
+ * (or other Component), you can simply throw a
+ * {@link org.apache.wicket.RestartResponseAtInterceptPageException} in your implementation of
+ * this method.
*
* @param componentClass
* The component class to check
@@ -76,11 +73,10 @@
boolean isInstantiationAuthorized(Class componentClass);
/**
- * Gets whether the given action is permitted. If it is, this method should
- * return true. If it isn't, this method should either return false or - in
- * case of a serious breach - throw a security exception. Returning is
- * generally preferable over throwing an exception as that doesn't break the
- * normal flow.
+ * Gets whether the given action is permitted. If it is, this method should return true. If it
+ * isn't, this method should either return false or - in case of a serious breach - throw a
+ * security exception. Returning is generally preferable over throwing an exception as that
+ * doesn't break the normal flow.
*
* @param component
* The component to be acted upon
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java Mon Oct 15 14:21:25 2007
@@ -19,20 +19,18 @@
import org.apache.wicket.Component;
/**
- * Interface to code that is called to handle unauthorized component
- * instantiations.
+ * Interface to code that is called to handle unauthorized component instantiations.
*
* @author Jonathan Locke
*/
public interface IUnauthorizedComponentInstantiationListener
{
/**
- * Called when an unauthorized component instantiation is about to take
- * place (but before it happens).
+ * Called when an unauthorized component instantiation is about to take place (but before it
+ * happens).
*
* @param component
- * The partially constructed component (only the id is guaranteed
- * to be valid).
+ * The partially constructed component (only the id is guaranteed to be valid).
* @see org.apache.wicket.application.IComponentInstantiationListener
*/
void onUnauthorizedInstantiation(Component component);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java Mon Oct 15 14:21:25 2007
@@ -33,7 +33,7 @@
/** The component that caused the unauthorized exception */
private final Component component;
-
+
/**
* Construct.
*
@@ -48,7 +48,7 @@
this.component = component;
this.action = action;
}
-
+
/**
* @return The action that was forbidden
*/
@@ -56,7 +56,7 @@
{
return action;
}
-
+
/**
* @return The component that caused the unauthorized exception
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java Mon Oct 15 14:21:25 2007
@@ -24,8 +24,8 @@
/**
- * Compound implementation of the IAuthorizationStrategy that lets you chain two
- * or more strategies together.
+ * Compound implementation of the IAuthorizationStrategy that lets you chain two or more strategies
+ * together.
*
* @author ivaynberg
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java Mon Oct 15 14:21:25 2007
@@ -25,9 +25,8 @@
/**
- * An authorization strategy which allows the use of a command pattern for users
- * that want to authorize a variety of different types of actions throughout an
- * application.
+ * An authorization strategy which allows the use of a command pattern for users that want to
+ * authorize a variety of different types of actions throughout an application.
*
* @author Jonathan Locke
* @since Wicket 1.2
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java Mon Oct 15 14:21:25 2007
@@ -22,9 +22,9 @@
import org.apache.wicket.authorization.IAuthorizationStrategy;
/**
- * An abstract base class for implementing simple authorization of Pages. Users
- * should override {@link #isPageAuthorized(Class)}, which gets called for Page
- * classes when they are being constructed.
+ * An abstract base class for implementing simple authorization of Pages. Users should override
+ * {@link #isPageAuthorized(Class)}, which gets called for Page classes when they are being
+ * constructed.
*
* @author Jonathan Locke
* @author Eelco Hillenius
@@ -53,14 +53,13 @@
}
/**
- * Works like instanceof operator where instanceOf(a, b) is the runtime
- * equivalent of (a instanceof b).
+ * Works like instanceof operator where instanceOf(a, b) is the runtime equivalent of (a
+ * instanceof b).
*
* @param type
* The type to check
* @param superType
- * The interface or superclass that the type needs to implement
- * or extend
+ * The interface or superclass that the type needs to implement or extend
* @return True if the type is an instance of the superType
*/
protected boolean instanceOf(final Class type, final Class superType)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java Mon Oct 15 14:21:25 2007
@@ -26,14 +26,12 @@
import org.apache.wicket.authorization.UnauthorizedInstantiationException;
/**
- * A very simple authorization strategy that takes a supertype (a base class or
- * tagging interface) and performs a simple authorization check by calling the
- * abstract method isAuthorized() whenever a Page class that extends or
- * implements the supertype is about to be instantiated. If that method returns
- * true, page instantiation proceeds normally. If it returns false, the user is
- * automatically directed to the specified sign-in page for authentication,
- * which will presumably allow authorization to succeed once they have signed
- * in.
+ * A very simple authorization strategy that takes a supertype (a base class or tagging interface)
+ * and performs a simple authorization check by calling the abstract method isAuthorized() whenever
+ * a Page class that extends or implements the supertype is about to be instantiated. If that method
+ * returns true, page instantiation proceeds normally. If it returns false, the user is
+ * automatically directed to the specified sign-in page for authentication, which will presumably
+ * allow authorization to succeed once they have signed in.
* <p>
* In your Application.init() method do something like the following:
*
@@ -41,11 +39,11 @@
* SimplePageAuthorizationStrategy authorizationStrategy = new SimplePageAuthorizationStrategy(
* MySecureWebPage.class, MySignInPage.class)
* {
- * protected boolean isAuthorized()
- * {
- * // Authorize access based on user authentication in the session
- * return (((MySession)Session.get()).isSignedIn());
- * }
+ * protected boolean isAuthorized()
+ * {
+ * // Authorize access based on user authentication in the session
+ * return (((MySession)Session.get()).isSignedIn());
+ * }
* };
*
* getSecuritySettings().setAuthorizationStrategy(authorizationStrategy);
@@ -57,17 +55,16 @@
public abstract class SimplePageAuthorizationStrategy extends AbstractPageAuthorizationStrategy
{
/**
- * The supertype (class or interface) of Pages that require authorization to
- * be instantiated.
+ * The supertype (class or interface) of Pages that require authorization to be instantiated.
*/
- private final WeakReference/*<Class>*/ securePageSuperTypeRef;
+ private final WeakReference/* <Class> */securePageSuperTypeRef;
/**
* Construct.
*
* @param securePageSuperType
- * The class or interface supertype that indicates that a given
- * Page requires authorization
+ * The class or interface supertype that indicates that a given Page requires
+ * authorization
* @param signInPageClass
* The sign in page class
*/
@@ -119,12 +116,11 @@
}
/**
- * Gets whether the current user/session is authorized to instantiate a page
- * class which extends or implements the supertype (base class or tagging
- * interface) passed to the constructor.
+ * Gets whether the current user/session is authorized to instantiate a page class which extends
+ * or implements the supertype (base class or tagging interface) passed to the constructor.
*
- * @return True if the instantiation should be allowed to proceed. False, if
- * the user should be directed to the application's sign-in page.
+ * @return True if the instantiation should be allowed to proceed. False, if the user should be
+ * directed to the application's sign-in page.
*/
protected abstract boolean isAuthorized();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AttributeAppender.java Mon Oct 15 14:21:25 2007
@@ -22,9 +22,9 @@
import org.apache.wicket.util.string.Strings;
/**
- * AttributeModifier that appends the given value, rather than replace it. This
- * is especially useful for adding CSS classes to markup elements, or adding
- * JavaScript snippets to existing element handlers.
+ * AttributeModifier that appends the given value, rather than replace it. This is especially useful
+ * for adding CSS classes to markup elements, or adding JavaScript snippets to existing element
+ * handlers.
*
* <pre>
* <a href="#" wicket:id="foo" class="link" onmouseover="doSomething()">
@@ -56,9 +56,8 @@
private final String separator;
/**
- * Creates an AttributeModifier that appends the appendModel's value to the
- * current value of the attribute, and will add the attribute when
- * addAttributeIfNotPresent is true.
+ * Creates an AttributeModifier that appends the appendModel's value to the current value of the
+ * attribute, and will add the attribute when addAttributeIfNotPresent is true.
*
* @param attribute
* the attribute to append the appendModels value to
@@ -67,8 +66,7 @@
* @param appendModel
* the model supplying the value to append
* @param separator
- * the separator string, comes between the original value and the
- * append value
+ * the separator string, comes between the original value and the append value
*/
public AttributeAppender(String attribute, boolean addAttributeIfNotPresent,
IModel appendModel, String separator)
@@ -78,17 +76,15 @@
}
/**
- * Creates an AttributeModifier that appends the appendModel's value to the
- * current value of the attribute, and will add the attribute when it is not
- * there already.
+ * Creates an AttributeModifier that appends the appendModel's value to the current value of the
+ * attribute, and will add the attribute when it is not there already.
*
* @param attribute
* the attribute to append the appendModels value to
* @param appendModel
* the model supplying the value to append
* @param separator
- * the separator string, comes between the original value and the
- * append value
+ * the separator string, comes between the original value and the append value
*/
public AttributeAppender(String attribute, IModel appendModel, String separator)
{
@@ -97,8 +93,7 @@
}
/**
- * @see org.apache.wicket.AttributeModifier#newValue(java.lang.String,
- * java.lang.String)
+ * @see org.apache.wicket.AttributeModifier#newValue(java.lang.String, java.lang.String)
*/
protected String newValue(String currentValue, String appendValue)
{
@@ -111,8 +106,8 @@
}
else
{
- sb = new AppendingStringBuffer(currentValue.length() + appendValueLen
- + separator.length());
+ sb = new AppendingStringBuffer(currentValue.length() + appendValueLen +
+ separator.length());
sb.append(currentValue);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java Mon Oct 15 14:21:25 2007
@@ -23,12 +23,11 @@
import org.apache.wicket.markup.html.resources.CompressedResourceReference;
/**
- * A {@link org.apache.wicket.behavior.AbstractHeaderContributor} behavior that is
- * specialized on package resources. If you use this class, you have to
- * pre-register the resources you want to contribute. A shortcut for common
- * cases is to call {@link #forCss(Class, String)} to contribute a package css
- * file or {@link #forJavaScript(Class, String)} to contribute a packaged
- * javascript file. For instance:
+ * A {@link org.apache.wicket.behavior.AbstractHeaderContributor} behavior that is specialized on
+ * package resources. If you use this class, you have to pre-register the resources you want to
+ * contribute. A shortcut for common cases is to call {@link #forCss(Class, String)} to contribute a
+ * package css file or {@link #forJavaScript(Class, String)} to contribute a packaged javascript
+ * file. For instance:
*
* <pre>
* add(HeaderContributor.forCss(MyPanel.class, "mystyle.css"));
@@ -42,13 +41,12 @@
private static final long serialVersionUID = 1L;
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor that references a CSS file that lives in a package.
+ * Returns a new instance of {@link HeaderContributor} with a header contributor that references
+ * a CSS file that lives in a package.
*
* @param scope
- * The scope of the package resource (typically the class of the
- * caller, or a class that lives in the package where the
- * resource lives).
+ * The scope of the package resource (typically the class of the caller, or a class
+ * that lives in the package where the resource lives).
* @param path
* The path
* @return the new header contributor instance
@@ -67,13 +65,12 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor that references a CSS file that lives in a package.
+ * Returns a new instance of {@link HeaderContributor} with a header contributor that references
+ * a CSS file that lives in a package.
*
* @param scope
- * The scope of the package resource (typically the class of the
- * caller, or a class that lives in the package where the
- * resource lives).
+ * The scope of the package resource (typically the class of the caller, or a class
+ * that lives in the package where the resource lives).
* @param path
* The path
* @param media
@@ -95,8 +92,8 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor that references a CSS file that lives in a package.
+ * Returns a new instance of {@link HeaderContributor} with a header contributor that references
+ * a CSS file that lives in a package.
*
* @param reference
*
@@ -116,8 +113,8 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor that references a CSS file that lives in a package.
+ * Returns a new instance of {@link HeaderContributor} with a header contributor that references
+ * a CSS file that lives in a package.
*
* @param reference
* @param media
@@ -139,14 +136,13 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor referencing a CSS file using one of the following schemes:
+ * Returns a new instance of {@link HeaderContributor} with a header contributor referencing a
+ * CSS file using one of the following schemes:
* <ul>
* <li>Starts with http:// or https:// for an external reference.</li>
- * <li>Starts with "/" for an absolute reference that Wicket will not
- * rewrite.</li>
- * <li>Starts with anything else, which Wicket will automatically prepend
- * to make relative to the context root of your web-app.</li>
+ * <li>Starts with "/" for an absolute reference that Wicket will not rewrite.</li>
+ * <li>Starts with anything else, which Wicket will automatically prepend to make relative to
+ * the context root of your web-app.</li>
* </ul>
*
* @param location
@@ -167,14 +163,13 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor referencing a CSS file using one of the following schemes:
+ * Returns a new instance of {@link HeaderContributor} with a header contributor referencing a
+ * CSS file using one of the following schemes:
* <ul>
* <li>Starts with http:// or https:// for an external reference.</li>
- * <li>Starts with "/" for an absolute reference that Wicket will not
- * rewrite.</li>
- * <li>Starts with anything else, which Wicket will automatically prepend
- * to make relative to the context root of your web-app.</li>
+ * <li>Starts with "/" for an absolute reference that Wicket will not rewrite.</li>
+ * <li>Starts with anything else, which Wicket will automatically prepend to make relative to
+ * the context root of your web-app.</li>
* </ul>
*
* @param location
@@ -197,13 +192,12 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor that references a java script file that lives in a package.
+ * Returns a new instance of {@link HeaderContributor} with a header contributor that references
+ * a java script file that lives in a package.
*
* @param scope
- * The scope of the package resource (typically the class of the
- * caller, or a class that lives in the package where the
- * resource lives).
+ * The scope of the package resource (typically the class of the caller, or a class
+ * that lives in the package where the resource lives).
* @param path
* The path
* @return the new header contributor instance
@@ -222,8 +216,8 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor that references a java script file that lives in a package.
+ * Returns a new instance of {@link HeaderContributor} with a header contributor that references
+ * a java script file that lives in a package.
*
* @param reference
*
@@ -243,14 +237,13 @@
}
/**
- * Returns a new instance of {@link HeaderContributor} with a header
- * contributor referencing a CSS file using one of the following schemes:
+ * Returns a new instance of {@link HeaderContributor} with a header contributor referencing a
+ * CSS file using one of the following schemes:
* <ul>
* <li>Starts with http:// or https:// for an external reference.</li>
- * <li>Starts with "/" for an absolute reference that Wicket will not
- * rewrite.</li>
- * <li>Starts with anything else, which Wicket will automatically prepend
- * to make relative to the context root of your web-app.</li>
+ * <li>Starts with "/" for an absolute reference that Wicket will not rewrite.</li>
+ * <li>Starts with anything else, which Wicket will automatically prepend to make relative to
+ * the context root of your web-app.</li>
* </ul>
*
* @param location
@@ -275,7 +268,8 @@
private static final String returnRelativePath(String location)
{
// WICKET-59 allow external URLs, WICKET-612 allow absolute URLs.
- if (location.startsWith("http://") || location.startsWith("https://") || location.startsWith("/"))
+ if (location.startsWith("http://") || location.startsWith("https://") ||
+ location.startsWith("/"))
{
return location;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java Mon Oct 15 14:21:25 2007
@@ -24,7 +24,9 @@
import org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
/**
- * An extended {@link IBehaviorListener} which will be ignored if the page is not the last one the user accessed.
+ * An extended {@link IBehaviorListener} which will be ignored if the page is not the last one the
+ * user accessed.
+ *
* @see AbstractAjaxBehavior#getCallbackUrl(boolean)
*
* @author Ate Douma
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java Mon Oct 15 14:21:25 2007
@@ -25,11 +25,10 @@
import org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
/**
- * Listens for requests to behaviors. When {@link org.apache.wicket.behavior.IBehavior}s
- * are 'enriched' with this interface, they can receive requests themselves. You
- * can use this for example to implement AJAX behavior, though you'll probably
- * want to extend from {@link org.apache.wicket.behavior.AbstractAjaxBehavior} directly
- * instead in that case.
+ * Listens for requests to behaviors. When {@link org.apache.wicket.behavior.IBehavior}s are
+ * 'enriched' with this interface, they can receive requests themselves. You can use this for
+ * example to implement AJAX behavior, though you'll probably want to extend from
+ * {@link org.apache.wicket.behavior.AbstractAjaxBehavior} directly instead in that case.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java Mon Oct 15 14:21:25 2007
@@ -20,9 +20,8 @@
import org.apache.wicket.markup.ComponentTag;
/**
- * A lightweight version of the attribute modifier. This is convenient for
- * simpler situations where you know the value upfront and you do not need a
- * pull-based model.
+ * A lightweight version of the attribute modifier. This is convenient for simpler situations where
+ * you know the value upfront and you do not need a pull-based model.
*
* @author Igor Vaynberg (ivaynberg)
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java Mon Oct 15 14:21:25 2007
@@ -24,8 +24,8 @@
import org.apache.wicket.util.lang.Objects;
/**
- * A simple header contributor that just spits out the string it is constructed
- * with as a header contribution.
+ * A simple header contributor that just spits out the string it is constructed with as a header
+ * contribution.
*
* @author Eelco Hillenius
*/
@@ -37,8 +37,8 @@
private final StringContributor contributor;
/**
- * Simply writes out the string it was constructed with whenever it is
- * called for a header contribution.
+ * Simply writes out the string it was constructed with whenever it is called for a header
+ * contribution.
*/
private static final class StringContributor implements IHeaderContributor
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java Mon Oct 15 14:21:25 2007
@@ -26,7 +26,7 @@
public class ComponentFeedbackMessageFilter implements IFeedbackMessageFilter
{
private static final long serialVersionUID = 1L;
-
+
/** The component to accept feedback messages for */
private final Component component;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java Mon Oct 15 14:21:25 2007
@@ -56,8 +56,8 @@
}
else
{
- return container.contains(message.getReporter(), true)
- || container == message.getReporter();
+ return container.contains(message.getReporter(), true) ||
+ container == message.getReporter();
}
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java Mon Oct 15 14:21:25 2007
@@ -37,20 +37,18 @@
/**
- * A subclass of MarkupElement which represents a "significant" markup tag, such
- * as a component open tag. Insignificant markup tags (those which are merely
- * concerned with markup formatting operations and do not denote components or
- * component nesting) are coalesced into instances of RawMarkup (also a subclass
- * of MarkupElement).
+ * A subclass of MarkupElement which represents a "significant" markup tag, such as a component open
+ * tag. Insignificant markup tags (those which are merely concerned with markup formatting
+ * operations and do not denote components or component nesting) are coalesced into instances of
+ * RawMarkup (also a subclass of MarkupElement).
*
* @author Jonathan Locke
*/
public class ComponentTag extends MarkupElement
{
/**
- * Standard component id attribute always available for components
- * regardless of user ApplicationSettings for id attribute; value ==
- * 'wicket'.
+ * Standard component id attribute always available for components regardless of user
+ * ApplicationSettings for id attribute; value == 'wicket'.
*/
public static final String DEFAULT_WICKET_NAMESPACE = "wicket";
@@ -58,8 +56,8 @@
private static final List EMPTY_LIST = new ArrayList();
/**
- * Assuming this is a open (or open-close) tag, 'closes' refers to the
- * ComponentTag which closes it.
+ * Assuming this is a open (or open-close) tag, 'closes' refers to the ComponentTag which closes
+ * it.
*/
private ComponentTag closes;
@@ -70,8 +68,8 @@
private boolean autolink = false;
/**
- * By default this is equal to the wicket:id="xxx" attribute value, but may
- * be provided e.g. for auto-tags
+ * By default this is equal to the wicket:id="xxx" attribute value, but may be provided e.g. for
+ * auto-tags
*/
private String id;
@@ -82,8 +80,7 @@
private boolean modified = false;
/**
- * If true, than the MarkupParser will ignore (remove) it. Temporary working
- * variable
+ * If true, than the MarkupParser will ignore (remove) it. Temporary working variable
*/
private transient boolean ignore = false;
@@ -91,15 +88,15 @@
private boolean autoComponent = false;
/**
- * In case of inherited markup, the base and the extended markups are merged
- * and the information about the tags origin is lost. In some cases like
- * wicket:head and wicket:link this information however is required.
+ * In case of inherited markup, the base and the extended markups are merged and the information
+ * about the tags origin is lost. In some cases like wicket:head and wicket:link this
+ * information however is required.
*/
private WeakReference/* <Class> */markupClassRef = null;
/**
- * Tags which are detected to have only an open tag, which is allowed with
- * some HTML tags like 'br' for example
+ * Tags which are detected to have only an open tag, which is allowed with some HTML tags like
+ * 'br' for example
*/
private boolean hasNoCloseTag = false;
@@ -110,8 +107,8 @@
private Map userData;
/**
- * Automatically create a XmlTag, assign the name and the type, and
- * construct a ComponentTag based on this XmlTag.
+ * Automatically create a XmlTag, assign the name and the type, and construct a ComponentTag
+ * based on this XmlTag.
*
* @param name
* The name of html tag
@@ -198,8 +195,8 @@
}
/**
- * If autolink is set to true, href attributes will automatically be
- * converted into Wicket bookmarkable URLs.
+ * If autolink is set to true, href attributes will automatically be converted into Wicket
+ * bookmarkable URLs.
*
* @param autolink
* enable/disable automatic href conversion
@@ -378,9 +375,8 @@
}
/**
- * Makes this tag object immutable by making the attribute map unmodifiable.
- * Immutable tags cannot be made mutable again. They can only be copied into
- * new mutable tag objects.
+ * Makes this tag object immutable by making the attribute map unmodifiable. Immutable tags
+ * cannot be made mutable again. They can only be copied into new mutable tag objects.
*/
public final void makeImmutable()
{
@@ -388,11 +384,9 @@
}
/**
- * Gets this tag if it is already mutable, or a mutable copy of this tag if
- * it is immutable.
+ * Gets this tag if it is already mutable, or a mutable copy of this tag if it is immutable.
*
- * @return This tag if it is already mutable, or a mutable copy of this tag
- * if it is immutable.
+ * @return This tag if it is already mutable, or a mutable copy of this tag if it is immutable.
*/
public ComponentTag mutable()
{
@@ -409,8 +403,8 @@
}
/**
- * Copies all internal properties from this tag to <code>dest</code>.
- * This is basically cloning without instance creation.
+ * Copies all internal properties from this tag to <code>dest</code>. This is basically
+ * cloning without instance creation.
*
* @param dest
* tag whose properties will be set
@@ -518,8 +512,8 @@
}
/**
- * Set the component's id. The value is usually taken from the tag's id
- * attribute, e.g. wicket:id="componentId".
+ * Set the component's id. The value is usually taken from the tag's id attribute, e.g.
+ * wicket:id="componentId".
*
* @param id
* The component's id assigned to the tag.
@@ -680,8 +674,7 @@
}
/**
- * Converts this object to a string representation including useful
- * information for debugging
+ * Converts this object to a string representation including useful information for debugging
*
* @return String version of this object
*/
@@ -699,8 +692,8 @@
}
/**
- * Manually mark the ComponentTag being modified. Flagging the tag being
- * modified does not happen automatically.
+ * Manually mark the ComponentTag being modified. Flagging the tag being modified does not
+ * happen automatically.
*
* @param modified
*/
@@ -760,9 +753,9 @@
}
/**
- * In case of inherited markup, the base and the extended markups are merged
- * and the information about the tags origin is lost. In some cases like
- * wicket:head and wicket:link this information however is required.
+ * In case of inherited markup, the base and the extended markups are merged and the information
+ * about the tags origin is lost. In some cases like wicket:head and wicket:link this
+ * information however is required.
*
* @return wicketHeaderClass
*/
@@ -824,8 +817,7 @@
}
/**
- * @return True, if wicket:id has been automatically created (internal
- * component)
+ * @return True, if wicket:id has been automatically created (internal component)
*/
public boolean isAutoComponentTag()
{
@@ -834,8 +826,7 @@
/**
* @param auto
- * True, if wicket:id has been automatically created (internal
- * component)
+ * True, if wicket:id has been automatically created (internal component)
*/
public void setAutoComponentTag(boolean auto)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ContainerInfo.java Mon Oct 15 14:21:25 2007
@@ -22,11 +22,10 @@
import org.apache.wicket.MarkupContainer;
/**
- * Because a Component has reference to its parents, which eventually is the
- * Page, and because the Page contains a reference to the Session, keeping a
- * "copy" of a component is very expensive. ContainerInfo shall be used instead
- * of MarkupContainer whenever a small subset of the container's information is
- * required.
+ * Because a Component has reference to its parents, which eventually is the Page, and because the
+ * Page contains a reference to the Session, keeping a "copy" of a component is very expensive.
+ * ContainerInfo shall be used instead of MarkupContainer whenever a small subset of the container's
+ * information is required.
*
* @author Juergen Donnerstag
*/
@@ -121,7 +120,7 @@
*/
public String toString()
{
- return ((Class)containerClassRef.get()).getName() + ":" + locale + ":" + style + ":"
- + fileExtension;
+ return ((Class)containerClassRef.get()).getName() + ":" + locale + ":" + style + ":" +
+ fileExtension;
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProvider.java Mon Oct 15 14:21:25 2007
@@ -23,8 +23,8 @@
/**
- * Wicket default implementation for the cache key used to reference the cached
- * markup resource stream.
+ * Wicket default implementation for the cache key used to reference the cached markup resource
+ * stream.
*
* @author Jonathan Locke
* @author Juergen Donnerstag
@@ -45,8 +45,8 @@
* The container requesting the markup
* @param clazz
* The clazz to get the key for
- * @return Key that uniquely identifies any markup that might be associated
- * with this markup container.
+ * @return Key that uniquely identifies any markup that might be associated with this markup
+ * container.
*/
public String getCacheKey(final MarkupContainer container, final Class clazz)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java Mon Oct 15 14:21:25 2007
@@ -27,8 +27,8 @@
/**
- * Wicket default implementation for loading the markup resource stream
- * associated with a MarkupContainer.
+ * Wicket default implementation for loading the markup resource stream associated with a
+ * MarkupContainer.
*
* @author Jonathan Locke
* @author Juergen Donnerstag
@@ -36,7 +36,8 @@
public class DefaultMarkupResourceStreamProvider implements IMarkupResourceStreamProvider
{
/** Log for reporting. */
- private static final Logger log = LoggerFactory.getLogger(DefaultMarkupResourceStreamProvider.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(DefaultMarkupResourceStreamProvider.class);
/**
* Constructor.
@@ -48,12 +49,10 @@
/**
* Create a new markup resource stream for the container.
* <p>
- * Note: it will only called once, the IResourceStream will be cached by
- * MarkupCache.
+ * Note: it will only called once, the IResourceStream will be cached by MarkupCache.
* <p>
- * Note: IResourceStreamLocators should be used in case the strategy to find
- * a markup resource should be extended for ALL components of your
- * application.
+ * Note: IResourceStreamLocators should be used in case the strategy to find a markup resource
+ * should be extended for ALL components of your application.
*
* @see org.apache.wicket.util.resource.locator.IResourceStream
* @see org.apache.wicket.markup.DefaultMarkupResourceStreamProvider
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkup.java Mon Oct 15 14:21:25 2007
@@ -17,8 +17,8 @@
package org.apache.wicket.markup;
/**
- * Holds markup as a resource (the stream that the markup came from) and a list
- * of MarkupElements (the markup itself).
+ * Holds markup as a resource (the stream that the markup came from) and a list of MarkupElements
+ * (the markup itself).
*
* @see MarkupElement
* @see ComponentTag
@@ -44,9 +44,8 @@
int findComponentIndex(final String path, final String id);
/**
- * For Wicket it would be sufficient for this method to be package
- * protected. However to allow wicket-bench easy access to the information
- * ...
+ * For Wicket it would be sufficient for this method to be package protected. However to allow
+ * wicket-bench easy access to the information ...
*
* @param index
* Index into markup list
@@ -55,9 +54,8 @@
MarkupElement get(final int index);
/**
- * Gets the markup encoding. A markup encoding may be specified in a markup
- * file with an XML encoding specifier of the form <?xml ...
- * encoding="..." ?>.
+ * Gets the markup encoding. A markup encoding may be specified in a markup file with an XML
+ * encoding specifier of the form <?xml ... encoding="..." ?>.
*
* @return Encoding, or null if not found.
*/
@@ -85,9 +83,8 @@
String getXmlDeclaration();
/**
- * For Wicket it would be sufficient for this method to be package
- * protected. However to allow wicket-bench easy access to the information
- * ...
+ * For Wicket it would be sufficient for this method to be package protected. However to allow
+ * wicket-bench easy access to the information ...
*
* @return Number of markup elements
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java Mon Oct 15 14:21:25 2007
@@ -20,10 +20,9 @@
import org.apache.wicket.settings.IMarkupSettings;
/**
- * Each Wicket application has a single IMarkupCache associated with it (see
- * {@link IMarkupSettings}). The markup cache is used by every Component to get
- * its associated markup stream. Note that it is the markup caches
- * responsibility to load the markup, if not yet done.
+ * Each Wicket application has a single IMarkupCache associated with it (see {@link IMarkupSettings}).
+ * The markup cache is used by every Component to get its associated markup stream. Note that it is
+ * the markup caches responsibility to load the markup, if not yet done.
*
* @author Juergen Donnerstag
*/
@@ -35,33 +34,29 @@
void clear();
/**
- * Gets any (immutable) markup resource for the container or any of its
- * parent classes (markup inheritance)
+ * Gets any (immutable) markup resource for the container or any of its parent classes (markup
+ * inheritance)
*
* @param container
* The original requesting markup container
* @param clazz
- * The class to get the associated markup for. If null, the
- * container's class is used, but it can be a parent class of the
- * container as well (markup inheritance)
+ * The class to get the associated markup for. If null, the container's class is
+ * used, but it can be a parent class of the container as well (markup inheritance)
* @param enforceReload
- * The cache will be ignored and all, including inherited markup
- * files, will be reloaded. Whatever is in the cache, it will be
- * ignored
+ * The cache will be ignored and all, including inherited markup files, will be
+ * reloaded. Whatever is in the cache, it will be ignored
* @return Markup resource
*/
Markup getMarkup(final MarkupContainer container, final Class clazz, final boolean enforceReload);
/**
- * Gets a fresh markup stream that contains the (immutable) markup resource
- * for this class.
+ * Gets a fresh markup stream that contains the (immutable) markup resource for this class.
*
* @param container
* The container the markup should be associated with
* @param enforceReload
- * The cache will be ignored and all, including inherited markup
- * files, will be reloaded. Whatever is in the cache, it will be
- * ignored
+ * The cache will be ignored and all, including inherited markup files, will be
+ * reloaded. Whatever is in the cache, it will be ignored
* @param throwException
* If true, throw an exception, if markup could not be found
* @return A stream of MarkupElement elements
@@ -79,8 +74,8 @@
boolean hasAssociatedMarkup(final MarkupContainer container);
/**
- * Remove the markup associated with the cache key from the cache including
- * all dependent markups (markup inheritance)
+ * Remove the markup associated with the cache key from the cache including all dependent
+ * markups (markup inheritance)
*
* @see MarkupResourceStream#getCacheKey()
*
@@ -95,8 +90,8 @@
int size();
/**
- * Will be called by the application while shutting down. It allows the
- * markup cache to cleanup if necessary.
+ * Will be called by the application while shutting down. It allows the markup cache to cleanup
+ * if necessary.
*/
void shutdown();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCacheKeyProvider.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
import org.apache.wicket.MarkupContainer;
/**
- * To be implemented by MarkupContainers that wish to implement their own
- * algorithms for the markup cache key.
+ * To be implemented by MarkupContainers that wish to implement their own algorithms for the markup
+ * cache key.
*
* @see IMarkupResourceStreamProvider
*
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java Mon Oct 15 14:21:25 2007
@@ -20,15 +20,15 @@
import org.apache.wicket.util.resource.IResourceStream;
/**
- * To be implemented by MarkupContainer which whish to implement there own
- * algorithms for loading the markup resource stream.
+ * To be implemented by MarkupContainer which whish to implement there own algorithms for loading
+ * the markup resource stream.
* <p>
- * Note: IResourceStreamLocators should be used in case the strategy to find a
- * markup resource is meant to be applied to ALL components of your application.
+ * Note: IResourceStreamLocators should be used in case the strategy to find a markup resource is
+ * meant to be applied to ALL components of your application.
* <p>
- * Note: See IMarkupCacheKeyProvider if you whish to implement your own cache
- * key algorithm, which sometimes is useful when the MarkupContainer implements
- * its own IMarkupResourceStreamProvider as well.
+ * Note: See IMarkupCacheKeyProvider if you whish to implement your own cache key algorithm, which
+ * sometimes is useful when the MarkupContainer implements its own IMarkupResourceStreamProvider as
+ * well.
*
* @see IMarkupCacheKeyProvider
*
@@ -39,12 +39,10 @@
/**
* Create a new markup resource stream for the container.
* <p>
- * Note: usually it will only called once, as the IResourceStream will be
- * cached by MarkupCache.
+ * Note: usually it will only called once, as the IResourceStream will be cached by MarkupCache.
*
* @param container
- * The MarkupContainer which requests to load the Markup resource
- * stream
+ * The MarkupContainer which requests to load the Markup resource stream
* @param containerClass
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IScopedComponent.java Mon Oct 15 14:21:25 2007
@@ -17,13 +17,11 @@
package org.apache.wicket.markup;
/**
- * To be implemented by Components which walks up the component tree until a
- * Page or Panel and tries to find a component with a matching wicket id if the
- * component itself does not contain it.
+ * To be implemented by Components which walks up the component tree until a Page or Panel and tries
+ * to find a component with a matching wicket id if the component itself does not contain it.
* <p>
- * Note: MarkupContainer.isTransparent() in combination with ParentResolver
- * tries to resolve the wicket id with the parent only and shall be used to
- * implement transparent containers.
+ * Note: MarkupContainer.isTransparent() in combination with ParentResolver tries to resolve the
+ * wicket id with the parent only and shall be used to implement transparent containers.
*
* @see org.apache.wicket.markup.resolver.ScopedComponentResolver
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
@@ -35,8 +33,8 @@
public interface IScopedComponent
{
/**
- * @return true, if component shall try its parents to resolve the component
- * if the component itself does not contain it.
+ * @return true, if component shall try its parents to resolve the component if the component
+ * itself does not contain it.
*/
boolean isRenderableInSubContainers();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java Mon Oct 15 14:21:25 2007
@@ -31,14 +31,14 @@
/**
- * A list of markup elements associated with a Markup. Might be all elements of
- * a markup resource, might be just the elements associated with a specific tag.
- *
+ * A list of markup elements associated with a Markup. Might be all elements of a markup resource,
+ * might be just the elements associated with a specific tag.
+ *
* @see org.apache.wicket.markup.MarkupResourceData
* @see org.apache.wicket.markup.MarkupElement
* @see org.apache.wicket.markup.ComponentTag
* @see org.apache.wicket.markup.RawMarkup
- *
+ *
* @author Juergen Donnerstag
*/
public class Markup
@@ -55,20 +55,19 @@
private final MarkupResourceData markupResourceData;
/**
- * A cache which maps (componentPath + id) to the componentTags index in the
- * markup
+ * A cache which maps (componentPath + id) to the componentTags index in the markup
*/
private Map componentMap;
/**
- * Used at markup load time to maintain the current component path (not id)
- * while adding markup elements to this Markup instance
+ * Used at markup load time to maintain the current component path (not id) while adding markup
+ * elements to this Markup instance
*/
private StringBuffer currentPath;
/**
* Constructor
- *
+ *
* @param markupResourceData
* The associated Markup
*/
@@ -79,10 +78,9 @@
}
/**
- * For Wicket it would be sufficient for this method to be package
- * protected. However to allow wicket-bench easy access to the information
- * ...
- *
+ * For Wicket it would be sufficient for this method to be package protected. However to allow
+ * wicket-bench easy access to the information ...
+ *
* @param index
* Index into markup list
* @return Markup element
@@ -94,7 +92,7 @@
/**
* Gets the associate markup
- *
+ *
* @return The associated markup
*/
public final MarkupResourceData getMarkupResourceData()
@@ -103,10 +101,9 @@
}
/**
- * For Wicket it would be sufficient for this method to be package
- * protected. However to allow wicket-bench easy access to the information
- * ...
- *
+ * For Wicket it would be sufficient for this method to be package protected. However to allow
+ * wicket-bench easy access to the information ...
+ *
* @return Number of markup elements
*/
public int size()
@@ -116,7 +113,7 @@
/**
* Add a MarkupElement
- *
+ *
* @param markupElement
*/
final public void addMarkupElement(final MarkupElement markupElement)
@@ -126,7 +123,7 @@
/**
* Add a MarkupElement
- *
+ *
* @param pos
* @param markupElement
*/
@@ -155,9 +152,8 @@
}
/**
- * Add the tag to the local cache if open or open-close and if wicket:id is
- * present
- *
+ * Add the tag to the local cache if open or open-close and if wicket:id is present
+ *
* @param index
* @param tag
*/
@@ -175,8 +171,7 @@
/*
* XXX cleanup - this fragment check probably needs to be in
- * componenttag.isWantToBeDirectMarkupChild() or something similar
- * instead of being here
+ * componenttag.isWantToBeDirectMarkupChild() or something similar instead of being here
*/
final boolean fragment = (tag instanceof WicketTag && ((WicketTag)tag).isFragementTag());
@@ -195,9 +190,8 @@
}
/**
- * Set the components path within the markup and add the component tag to
- * the local cache
- *
+ * Set the components path within the markup and add the component tag to the local cache
+ *
* @param componentPath
* @param tag
* @return componentPath
@@ -262,7 +256,7 @@
/**
* Find the markup element index of the component with 'path'
- *
+ *
* @param path
* The component path expression
* @param id
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java Mon Oct 15 14:21:25 2007
@@ -44,9 +44,9 @@
* <p>
* MarkupCache is registered with {@link IMarkupSettings} and thus can be replaced with a subclassed
* version.
- *
+ *
* @see IMarkupSettings
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
@@ -72,7 +72,7 @@
/**
* Constructor.
- *
+ *
* @param application
*/
public MarkupCache(Application application)
@@ -95,7 +95,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.markup.IMarkupCache#shutdown()
*/
public void shutdown()
@@ -240,7 +240,7 @@
/**
* Get a unmodifiable map which contains the cached data. The map key is of type String and the
* value is of type Markup.
- *
+ *
* @return
*/
protected final ICache getMarkupCache()
@@ -250,10 +250,10 @@
/**
* THIS IS NOT PART OF WICKET'S PUBLIC API. DO NOT USE IT.
- *
+ *
* I still don't like this method being part of the API but I didn't find a suitable other
* solution.
- *
+ *
* @see org.apache.wicket.markup.IMarkupCache#getMarkup(org.apache.wicket.MarkupContainer,
* java.lang.Class, boolean)
*/
@@ -323,7 +323,7 @@
* Subclasses may change the default implementation. E.g. they might choose not update the cache
* to enforce reloading of any markup not found. This might be useful in very dynamic
* environments.
- *
+ *
* @param cacheKey
* @param container
* @return Markup.NO_MARKUP
@@ -342,7 +342,7 @@
/**
* Put the markup into the cache if cacheKey is not null and the cache does not yet contain the
* cacheKey. Return the markup stored in the cache if cacheKey is present already.
- *
+ *
* @param cacheKey
* If null, than ignore the cache
* @param markup
@@ -376,7 +376,7 @@
* Wicket's default implementation just uses the cacheKey to retrieve the markup from the cache.
* More sophisticated implementations may call a container method to e.g. ignore the cached
* markup under certain situations.
- *
+ *
* @param cacheKey
* If null, than the cache will be ignored
* @param container
@@ -393,7 +393,7 @@
/**
* Loads markup from a resource stream.
- *
+ *
* @param container
* The original requesting markup container
* @param markupResourceStream
@@ -437,7 +437,7 @@
* Load markup from an IResourceStream and add an {@link IChangeListener}to the
* {@link ModificationWatcher} so that if the resource changes, we can remove it from the cache
* automatically and subsequently reload when needed.
- *
+ *
* @param container
* The original requesting markup container
* @param markupResourceStream
@@ -485,7 +485,7 @@
/**
* Get the markup cache key provider to be used
- *
+ *
* @param container
* The MarkupContainer requesting the markup resource stream
* @return IMarkupResourceStreamProvider
@@ -506,7 +506,7 @@
/**
* Get the markup resource stream provider to be used
- *
+ *
* @param container
* The MarkupContainer requesting the markup resource stream
* @return IMarkupResourceStreamProvider
@@ -528,7 +528,7 @@
/**
* In case there is a need to extend the default chain of MarkupLoaders
- *
+ *
* @return MarkupLoader
*/
protected IMarkupLoader getMarkupLoader()
@@ -543,7 +543,7 @@
/**
* Allows you to change the map implementation which will hold the cache data. By default it is
* a ConcurrentHashMap() in order to allow multiple thread to access the data in a secure way.
- *
+ *
* @return
*/
protected ICache newCacheImplementation()
@@ -554,7 +554,7 @@
/**
* MarkupCache allows you to implement you own cache implementation. ICache is the interface the
* implementation must comply with.
- *
+ *
* @see MarkupCache
*/
public interface ICache
@@ -566,7 +566,7 @@
/**
* Remove an entry from the cache.
- *
+ *
* @param key
* @return true, if found and removed
*/
@@ -574,7 +574,7 @@
/**
* Get the cache element associated with the key
- *
+ *
* @param key
* @return
*/
@@ -582,14 +582,14 @@
/**
* Get all the keys referencing cache entries
- *
+ *
* @return
*/
Collection getKeys();
/**
* Check if key is in the cache
- *
+ *
* @param key
* @return
*/
@@ -597,14 +597,14 @@
/**
* Get the number of cache entries
- *
+ *
* @return
*/
int size();
/**
* Put an entry into the cache
- *
+ *
* @param key
* The reference key to find the element
* @param value
@@ -619,7 +619,7 @@
}
/**
- *
+ *
*/
public class DefaultCacheImplementation implements ICache
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java Mon Oct 15 14:21:25 2007
@@ -17,18 +17,16 @@
package org.apache.wicket.markup;
/**
- * Base class for different kinds of markup elements. Markup elements are held
- * in a Markup container object.
+ * Base class for different kinds of markup elements. Markup elements are held in a Markup container
+ * object.
* <p>
- * Wicket divides markup like (x)html, wml etc. into two types of
- * MarkupElements:
+ * Wicket divides markup like (x)html, wml etc. into two types of MarkupElements:
* <ul>
- * <li>ComponentTag, which represents a "significant" markup tag (meaning that
- * the tag has some meaning to Wicket)
- * <li>RawMarkup, which is a section of unparsed markup having no meaning to
- * Wicket.
+ * <li>ComponentTag, which represents a "significant" markup tag (meaning that the tag has some
+ * meaning to Wicket)
+ * <li>RawMarkup, which is a section of unparsed markup having no meaning to Wicket.
* </ul>
- *
+ *
* @see MarkupResourceData
* @see org.apache.wicket.markup.RawMarkup
* @see ComponentTag
@@ -45,7 +43,7 @@
/**
* Gets whether this element closes the given element.
- *
+ *
* @param open
* The open tag
* @return True if this markup element closes the given open tag
@@ -56,10 +54,10 @@
}
/**
- * This is not an implementation of equals because we don't care about
- * hashCodes for MarkupElements yet. Also, this method only compares the
- * namespace, name and attributes of the given MarkupElements.
- *
+ * This is not an implementation of equals because we don't care about hashCodes for
+ * MarkupElements yet. Also, this method only compares the namespace, name and attributes of the
+ * given MarkupElements.
+ *
* @param element
* The markup element to compare with
* @return True if the other element equals this one
@@ -73,9 +71,9 @@
/**
* Gets a string representation.
- *
- * @return A string representation suitable for displaying to the user when
- * something goes wrong.
+ *
+ * @return A string representation suitable for displaying to the user when something goes
+ * wrong.
*/
public abstract String toUserDebugString();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupException.java Mon Oct 15 14:21:25 2007
@@ -27,7 +27,7 @@
public final class MarkupException extends WicketRuntimeException
{
private static final long serialVersionUID = 1L;
-
+
/** The markup stream that was being parsed when the exception was thrown */
private MarkupStream markupStream;
@@ -63,7 +63,8 @@
* @param cause
* The causing exception
*/
- public MarkupException(final IResourceStream resource, final String message, final Throwable cause)
+ public MarkupException(final IResourceStream resource, final String message,
+ final Throwable cause)
{
super(resource.toString() + ": " + message, cause);
markupStream = null;
@@ -89,7 +90,8 @@
* @param cause
* The causing exception
*/
- public MarkupException(final MarkupStream markupStream, final String message, final Throwable cause)
+ public MarkupException(final MarkupStream markupStream, final String message,
+ final Throwable cause)
{
super(message + "\n" + markupStream.toString(), cause);
this.markupStream = markupStream;
@@ -102,9 +104,10 @@
{
return markupStream;
}
-
+
/**
* Set the markup stream which caused the exception
+ *
* @param markupStream
*/
public void setMarkupStream(final MarkupStream markupStream)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java Mon Oct 15 14:21:25 2007
@@ -50,12 +50,12 @@
* <p>
* The result will be an Markup object, which is basically a list, containing Wicket relevant tags
* and RawMarkup.
- *
+ *
* @see IMarkupFilter
* @see IMarkupParserFactory
* @see IMarkupSettings
* @see MarkupResourceData
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
@@ -79,7 +79,7 @@
/**
* Constructor.
- *
+ *
* @param resource
* The markup resource (file)
*/
@@ -90,7 +90,7 @@
/**
* Constructor. Usually for testing purposes only
- *
+ *
* @param markup
* The markup resource.
*/
@@ -101,7 +101,7 @@
/**
* Constructor.
- *
+ *
* @param xmlParser
* The streaming xml parser to read and parse the markup
* @param resource
@@ -124,7 +124,7 @@
/**
* In case you want to analyze markup which BY DEFAULT does not use "wicket" to find relevant
* tags.
- *
+ *
* @param namespace
*/
public final void setWicketNamespace(final String namespace)
@@ -135,7 +135,7 @@
/**
* Applications which subclass initFilterChain() might also wish to access the markup resource
* stream.
- *
+ *
* @return The markup resource stream
*/
protected MarkupResourceStream getMarkupResourceStream()
@@ -185,7 +185,7 @@
/**
* By default don't do anything. Subclasses may append additional markup filters if required.
- *
+ *
* @see #appendMarkupFilter(IMarkupFilter)
* @deprecated since 1.3
*/
@@ -196,7 +196,7 @@
/**
* Append a new filter to the list of already pre-configured markup filters.
- *
+ *
* @param filter
* The filter to be appended
*/
@@ -208,7 +208,7 @@
/**
* Append a new filter to the list of already pre-configured markup filters. Add the new filter
* before the "beforeFilter" which is identified by its class.
- *
+ *
* @param filter
* The filter to be appended
* @param beforeFilter
@@ -246,7 +246,7 @@
/**
* Reads and parses markup from a file.
- *
+ *
* @return The markup
* @throws IOException
* @throws ResourceStreamNotFoundException
@@ -271,7 +271,7 @@
/**
* Get the next tag from the markup file
- *
+ *
* @return The next tag
* @throws ParseException
*/
@@ -282,7 +282,7 @@
/**
* Scans the given markup and extracts balancing tags.
- *
+ *
*/
private void parseMarkup()
{
@@ -398,7 +398,7 @@
/**
* Remove whitespace from the raw markup
- *
+ *
* @param rawMarkup
* @return rawMarkup
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParserFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParserFactory.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParserFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParserFactory.java Mon Oct 15 14:21:25 2007
@@ -21,10 +21,9 @@
import org.apache.wicket.settings.IMarkupSettings;
/**
- * Default implementation of IMarkupParserFactory. It creates a MarkupParser
- * with a standard set of IMarkupFilter. You may add IMarkupFilters like shown
- * below, but don't forget to register your own MarkupParserFactory with
- * Settings to become activated.
+ * Default implementation of IMarkupParserFactory. It creates a MarkupParser with a standard set of
+ * IMarkupFilter. You may add IMarkupFilters like shown below, but don't forget to register your own
+ * MarkupParserFactory with Settings to become activated.
*
* <pre>
* class MyMarkupParserFactory
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceData.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceData.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceData.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceData.java Mon Oct 15 14:21:25 2007
@@ -20,8 +20,8 @@
import org.slf4j.LoggerFactory;
/**
- * Holds markup as a resource (the stream that the markup came from) and a list
- * of MarkupElements (the markup itself).
+ * Holds markup as a resource (the stream that the markup came from) and a list of MarkupElements
+ * (the markup itself).
*
* @see MarkupElement
* @see ComponentTag
@@ -99,9 +99,8 @@
}
/**
- * Gets the markup encoding. A markup encoding may be specified in a markup
- * file with an XML encoding specifier of the form <?xml ...
- * encoding="..." ?>.
+ * Gets the markup encoding. A markup encoding may be specified in a markup file with an XML
+ * encoding specifier of the form <?xml ... encoding="..." ?>.
*
* @return Encoding, or null if not found.
*/
@@ -169,8 +168,7 @@
}
/**
- * Sets the resource stream associated with the markup. It is for diagnostic
- * purposes only.
+ * Sets the resource stream associated with the markup. It is for diagnostic purposes only.
*
* @param resource
* the markup resource stream
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java Mon Oct 15 14:21:25 2007
@@ -27,9 +27,8 @@
/**
- * An IResourceStream implementation with specific extensions for markup
- * resource streams.
- *
+ * An IResourceStream implementation with specific extensions for markup resource streams.
+ *
* @author Juergen Donnerstag
*/
public class MarkupResourceStream implements IResourceStream
@@ -40,14 +39,13 @@
private final IResourceStream resourceStream;
/**
- * Container info like Class, locale and style which were used to locate the
- * resource
+ * Container info like Class, locale and style which were used to locate the resource
*/
private final ContainerInfo containerInfo;
/**
- * The actual component class the markup is directly associated with. It
- * might be super class of the component class
+ * The actual component class the markup is directly associated with. It might be super class of
+ * the component class
*/
private final String markupClassName;
@@ -56,7 +54,7 @@
/**
* Construct.
- *
+ *
* @param resourceStream
*/
public MarkupResourceStream(final IResourceStream resourceStream)
@@ -73,7 +71,7 @@
/**
* Construct.
- *
+ *
* @param resourceStream
* @param containerInfo
* @param markupClass
@@ -92,7 +90,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#close()
*/
public void close() throws IOException
@@ -101,7 +99,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#getContentType()
*/
public String getContentType()
@@ -110,7 +108,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#getInputStream()
*/
public InputStream getInputStream() throws ResourceStreamNotFoundException
@@ -119,7 +117,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#getLocale()
*/
public Locale getLocale()
@@ -128,7 +126,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.watch.IModifiable#lastModifiedTime()
*/
public Time lastModifiedTime()
@@ -137,7 +135,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#length()
*/
public long length()
@@ -146,7 +144,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#setLocale(java.util.Locale)
*/
public void setLocale(Locale locale)
@@ -155,9 +153,9 @@
}
/**
- * Get the actual component class the markup is directly associated with.
- * Note: it not necessarily must be the container class.
- *
+ * Get the actual component class the markup is directly associated with. Note: it not
+ * necessarily must be the container class.
+ *
* @return The directly associated class
*/
public Class getMarkupClass()
@@ -167,7 +165,7 @@
/**
* Get the container info associated with the markup
- *
+ *
* @return ContainerInfo
*/
public ContainerInfo getContainerInfo()
@@ -177,6 +175,7 @@
/**
* Gets cacheKey.
+ *
* @return cacheKey
*/
public final String getCacheKey()
@@ -186,6 +185,7 @@
/**
* Set the cache key
+ *
* @param cacheKey
*/
public final void setCacheKey(final String cacheKey)
@@ -194,7 +194,7 @@
}
/**
- *
+ *
* @see java.lang.Object#toString()
*/
public String toString()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Mon Oct 15 14:21:25 2007
@@ -21,27 +21,24 @@
/**
- * A stream of {@link org.apache.wicket.markup.MarkupElement}s, subclasses of
- * which are {@link org.apache.wicket.markup.ComponentTag} and
- * {@link org.apache.wicket.markup.RawMarkup}. A markup stream has a current
- * index in the list of markup elements. The next markup element can be
- * retrieved and the index advanced by calling next(). If the index hits the
- * end, hasMore() will return false.
+ * A stream of {@link org.apache.wicket.markup.MarkupElement}s, subclasses of which are
+ * {@link org.apache.wicket.markup.ComponentTag} and {@link org.apache.wicket.markup.RawMarkup}. A
+ * markup stream has a current index in the list of markup elements. The next markup element can be
+ * retrieved and the index advanced by calling next(). If the index hits the end, hasMore() will
+ * return false.
* <p>
- * The current markup element can be accessed with get() and as a ComponentTag
- * with getTag().
+ * The current markup element can be accessed with get() and as a ComponentTag with getTag().
* <p>
* The stream can be sought to a particular location with setCurrentIndex().
* <p>
- * Convenience methods also exist to skip component tags (and any potentially
- * nested markup) or raw markup.
+ * Convenience methods also exist to skip component tags (and any potentially nested markup) or raw
+ * markup.
* <p>
- * Several boolean methods of the form at*() return true if the markup stream is
- * positioned at a tag with a given set of characteristics.
+ * Several boolean methods of the form at*() return true if the markup stream is positioned at a tag
+ * with a given set of characteristics.
* <p>
- * The resource from which the markup was loaded can be retrieved with
- * getResource().
- *
+ * The resource from which the markup was loaded can be retrieved with getResource().
+ *
* @author Jonathan Locke
*/
public final class MarkupStream
@@ -57,7 +54,7 @@
/**
* Constructor
- *
+ *
* @param markup
* List of markup elements
*/
@@ -90,8 +87,7 @@
/**
* @param componentId
* Required component name attribute
- * @return True if the current markup element is an openclose tag with the
- * given component name
+ * @return True if the current markup element is an openclose tag with the given component name
*/
public boolean atOpenCloseTag(final String componentId)
{
@@ -109,8 +105,7 @@
/**
* @param id
* Required component id attribute
- * @return True if the current markup element is an open tag with the given
- * component name
+ * @return True if the current markup element is an open tag with the given component name
*/
public boolean atOpenTag(final String id)
{
@@ -127,7 +122,7 @@
/**
* Compare this markup stream with another one
- *
+ *
* @param that
* The other markup stream
* @return True if each MarkupElement in this matches each element in that
@@ -175,9 +170,9 @@
}
/**
- * True, if associate markup is the same. It will change e.g. if the markup
- * file has been re-loaded or the locale has been changed.
- *
+ * True, if associate markup is the same. It will change e.g. if the markup file has been
+ * re-loaded or the locale has been changed.
+ *
* @param markupStream
* The markup stream to compare with.
* @return true, if markup has not changed
@@ -193,7 +188,7 @@
/**
* Find the markup element index of the component with 'path'
- *
+ *
* @param path
* The component path expression
* @param id
@@ -224,9 +219,8 @@
}
/**
- * Get the component/container's Class which is directly associated with the
- * stream.
- *
+ * Get the component/container's Class which is directly associated with the stream.
+ *
* @return The component's class
*/
public final Class getContainerClass()
@@ -243,10 +237,9 @@
}
/**
- * Gets the markup encoding. A markup encoding may be specified in a markup
- * file with an XML encoding specifier of the form <?xml ...
- * encoding="..." ?>.
- *
+ * Gets the markup encoding. A markup encoding may be specified in a markup file with an XML
+ * encoding specifier of the form <?xml ... encoding="..." ?>.
+ *
* @return The encoding, or null if not found
*/
public final String getEncoding()
@@ -279,7 +272,7 @@
/**
* Get the wicket namespace valid for this specific markup
- *
+ *
* @return wicket namespace
*/
public final String getWicketNamespace()
@@ -289,7 +282,7 @@
/**
* Return the XML declaration string, in case if found in the markup.
- *
+ *
* @return Null, if not found.
*/
public String getXmlDeclaration()
@@ -306,7 +299,7 @@
}
/**
- *
+ *
* @return true, if underlying markup has been merged (inheritance)
*/
public final boolean isMergedMarkup()
@@ -316,7 +309,7 @@
/**
* Note:
- *
+ *
* @return The next markup element in the stream
*/
public MarkupElement next()
@@ -412,9 +405,8 @@
}
/**
- * Skips any markup at the current position until the wicket tag name is
- * found.
- *
+ * Skips any markup at the current position until the wicket tag name is found.
+ *
* @param wicketTagName
* wicket tag name to seek
*/
@@ -438,7 +430,7 @@
/**
* Renders markup until a closing tag for openTag is reached.
- *
+ *
* @param openTag
* The open tag
*/
@@ -462,7 +454,7 @@
/**
* Throws a new markup exception
- *
+ *
* @param message
* The exception message
* @throws MarkupException
@@ -473,8 +465,7 @@
}
/**
- * @return An HTML string highlighting the current position in the markup
- * stream
+ * @return An HTML string highlighting the current position in the markup stream
*/
public String toHtmlDebugString()
{