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 [11/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/ma...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java Mon Oct 15 14:21:25 2007
@@ -49,9 +49,8 @@
/**
* Stores pages on disk.
* <p>
- * Override {@link #getWorkDir()} to change the default directory for pages,
- * which is configured from the javax.servlet.context.tempdir attribute in the
- * servlet context.
+ * Override {@link #getWorkDir()} to change the default directory for pages, which is configured
+ * from the javax.servlet.context.tempdir attribute in the servlet context.
*
* @author jcompagner
*/
@@ -297,9 +296,8 @@
}
/**
- * Key based on session id, page id, version numbers, etc. We don't
- * serialize it anywhere. It's made serializable for convenience if a
- * subclass needs to serialize it
+ * Key based on session id, page id, version numbers, etc. We don't serialize it anywhere. It's
+ * made serializable for convenience if a subclass needs to serialize it
*/
protected static class SessionPageKey implements Serializable
{
@@ -520,7 +518,8 @@
}
/**
- * @see org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore#getPage(String, String, int, int, int)
+ * @see org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore#getPage(String,
+ * String, int, int, int)
*/
public Page getPage(String sessionId, String pagemapName, int id, int versionNumber,
int ajaxVersionNumber)
@@ -614,7 +613,8 @@
/**
- * @see org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore#removePage(String, String, int)
+ * @see org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore#removePage(String,
+ * String, int)
*/
public void removePage(String sessionId, String pageMapName, int pageId)
{
@@ -858,9 +858,8 @@
}
/**
- * Returns the working directory for this disk-based PageStore. Override
- * this to configure a different location. The default is
- * javax.servlet.context.tempdir from the servlet context.
+ * Returns the working directory for this disk-based PageStore. Override this to configure a
+ * different location. The default is javax.servlet.context.tempdir from the servlet context.
*
* @return Working directory
*/
@@ -889,7 +888,8 @@
/**
* @throws IOException
- * @see org.apache.wicket.Page.IPageSerializer#serializePage(org.apache.wicket.Page, java.io.ObjectOutputStream)
+ * @see org.apache.wicket.Page.IPageSerializer#serializePage(org.apache.wicket.Page,
+ * java.io.ObjectOutputStream)
*/
public void serializePage(Page page, ObjectOutputStream stream) throws IOException
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/HttpSessionStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/HttpSessionStore.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/HttpSessionStore.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/HttpSessionStore.java Mon Oct 15 14:21:25 2007
@@ -30,8 +30,8 @@
/**
- * Default web implementation of {@link org.apache.wicket.session.ISessionStore} that uses
- * the {@link javax.servlet.http.HttpSession} to store its attributes.
+ * Default web implementation of {@link org.apache.wicket.session.ISessionStore} that uses the
+ * {@link javax.servlet.http.HttpSession} to store its attributes.
*
* @author Eelco Hillenius
*/
@@ -159,8 +159,8 @@
}
/**
- * Gets the prefix for storing variables in the actual session (typically
- * {@link HttpSession} for this application instance.
+ * Gets the prefix for storing variables in the actual session (typically {@link HttpSession}
+ * for this application instance.
*
* @param request
* the request
@@ -173,8 +173,8 @@
}
/**
- * @return Whether the session was marked invalid during this request
- * (afterwards, we shouldn't even come here as there is no session)
+ * @return Whether the session was marked invalid during this request (afterwards, we shouldn't
+ * even come here as there is no session)
*/
private boolean isSessionValid()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java Mon Oct 15 14:21:25 2007
@@ -23,11 +23,11 @@
import org.apache.wicket.session.ISessionStore;
-
/**
* Interface for the request logger and viewer.
+ *
* @see org.apache.wicket.Application#newRequestLogger()
- *
+ *
* @author jcompagner
*/
public interface IRequestLogger
@@ -44,9 +44,8 @@
public abstract int getPeakSessions();
/**
- * This method returns a List of the current requests that are in mem.
- * This is a readonly list.
- *
+ * This method returns a List of the current requests that are in mem. This is a readonly list.
+ *
* @return Collection of the current requests
*/
public abstract List getRequests();
@@ -63,62 +62,68 @@
public int getCurrentActiveRequestCount();
/**
- * called when the session is created and has an id.
- * (for http it means that the http session is created)
- *
- * @param id the session id
+ * called when the session is created and has an id. (for http it means that the http session is
+ * created)
+ *
+ * @param id
+ * the session id
*/
public abstract void sessionCreated(String id);
/**
- * Method used to cleanup a livesession when the session was
- * invalidated by the webcontainer
- *
- * @param sessionId the session id
+ * Method used to cleanup a livesession when the session was invalidated by the webcontainer
+ *
+ * @param sessionId
+ * the session id
*/
public abstract void sessionDestroyed(String sessionId);
/**
- * This method is called when the request is over. This will
- * set the total time a request takes and cleans up the current
- * request data.
- *
- * @param timeTaken the time taken in milliseconds
+ * This method is called when the request is over. This will set the total time a request takes
+ * and cleans up the current request data.
+ *
+ * @param timeTaken
+ * the time taken in milliseconds
*/
public abstract void requestTime(long timeTaken);
/**
* Called to monitor removals of objects out of the {@link ISessionStore}
- *
- * @param value the object being removed
+ *
+ * @param value
+ * the object being removed
*/
public abstract void objectRemoved(Object value);
/**
* Called to monitor updates of objects in the {@link ISessionStore}
- *
- * @param value the object being updated
+ *
+ * @param value
+ * the object being updated
*/
public abstract void objectUpdated(Object value);
/**
* Called to monitor additions of objects in the {@link ISessionStore}
- *
- * @param value the object being created/added
+ *
+ * @param value
+ * the object being created/added
*/
public abstract void objectCreated(Object value);
/**
* Sets the target that was the response target for the current request
- *
- * @param target the response target
+ *
+ * @param target
+ * the response target
*/
public abstract void logResponseTarget(IRequestTarget target);
/**
* Sets the target that was the event target for the current request
- *
- * @param target the event target
+ *
+ * @param target
+ * the event target
*/
public abstract void logEventTarget(IRequestTarget target);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IWebApplicationFactory.java Mon Oct 15 14:21:25 2007
@@ -17,8 +17,8 @@
package org.apache.wicket.protocol.http;
/**
- * A factory interface used by wicket filter to create application objects.
- * Configure your webapplication to use this factory in web.xml like:
+ * A factory interface used by wicket filter to create application objects. Configure your
+ * webapplication to use this factory in web.xml like:
*
* <pre>
* <init-param>
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IgnoreAjaxRequestException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IgnoreAjaxRequestException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IgnoreAjaxRequestException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/IgnoreAjaxRequestException.java Mon Oct 15 14:21:25 2007
@@ -19,9 +19,10 @@
import org.apache.wicket.Session;
/**
- * This exception is thrown in {@link Session} class when an Ajax requests attempts
- * to get a lock on pagemap while a regular request is processing the same page.
+ * This exception is thrown in {@link Session} class when an Ajax requests attempts to get a lock on
+ * pagemap while a regular request is processing the same page.
* <p>
+ *
* @author Matej Knopp
*/
// TODO: Using an exception to control flow is not the nicest way
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java Mon Oct 15 14:21:25 2007
@@ -70,14 +70,14 @@
/**
* Mock servlet request. Implements all of the methods from the standard HttpServletRequest class
* plus helper methods to aid setting up a request.
- *
+ *
* @author Chris Turner
*/
public class MockHttpServletRequest implements HttpServletRequest
{
/**
* A holder class for an uploaded file.
- *
+ *
* @author Frank Bille (billen)
*/
private class UploadedFile
@@ -88,7 +88,7 @@
/**
* Construct.
- *
+ *
* @param fieldName
* @param file
* @param contentType
@@ -184,7 +184,7 @@
/**
* Create the request using the supplied session object.
- *
+ *
* @param application
* The application that this request is for
* @param session
@@ -203,7 +203,7 @@
/**
* Add a new cookie.
- *
+ *
* @param cookie
* The cookie
*/
@@ -215,7 +215,7 @@
/**
* Add an uploaded file to the request. Use this to simulate a file that has been uploaded to a
* field.
- *
+ *
* @param fieldName
* The fieldname of the upload field.
* @param file
@@ -255,7 +255,7 @@
/**
* Add a header to the request.
- *
+ *
* @param name
* The name of the header to add
* @param value
@@ -274,7 +274,7 @@
/**
* Get an attribute.
- *
+ *
* @param name
* The attribute name
* @return The value, or null
@@ -286,7 +286,7 @@
/**
* Get the names of all of the values.
- *
+ *
* @return The names
*/
public Enumeration getAttributeNames()
@@ -298,7 +298,7 @@
/**
* Get the auth type.
- *
+ *
* @return The auth type
*/
public String getAuthType()
@@ -308,7 +308,7 @@
/**
* Get the current character encoding.
- *
+ *
* @return The character encoding
*/
public String getCharacterEncoding()
@@ -318,7 +318,7 @@
/**
* true will force Request generate multiPart ContentType and ContentLength
- *
+ *
* @param useMultiPartContentType
*/
public void setUseMultiPartContentType(boolean useMultiPartContentType)
@@ -330,7 +330,7 @@
/**
* Return the length of the content. This is always -1 except if useMultiPartContentType set as
* true. Then the length will be the length of the generated request.
- *
+ *
* @return -1 if useMultiPartContentType is false. Else the length of the generated request.
*/
public int getContentLength()
@@ -346,7 +346,7 @@
/**
* If useMultiPartContentType set as true return the correct content-type.
- *
+ *
* @return The correct multipart content-type if useMultiPartContentType is true. Else null.
*/
public String getContentType()
@@ -362,7 +362,7 @@
/**
* Get the context path. For this mock implementation the name of the application is always
* returned.
- *
+ *
* @return The context path
*/
public String getContextPath()
@@ -372,7 +372,7 @@
/**
* Get all of the cookies for this request.
- *
+ *
* @return The cookies
*/
public Cookie[] getCookies()
@@ -387,7 +387,7 @@
/**
* Get the given header as a date.
- *
+ *
* @param name
* The header name
* @return The date, or -1 if header not found
@@ -416,7 +416,7 @@
/**
* Get the given header value.
- *
+ *
* @param name
* The header name
* @return The header value or null
@@ -436,7 +436,7 @@
/**
* Get the names of all of the headers.
- *
+ *
* @return The header names
*/
public Enumeration getHeaderNames()
@@ -446,7 +446,7 @@
/**
* Get enumeration of all header values with the given name.
- *
+ *
* @param name
* The name
* @return The header values
@@ -464,7 +464,7 @@
/**
* Returns an input stream if there has been added some uploaded files. Use
* {@link #addFile(String, File, String)} to add some uploaded files.
- *
+ *
* @return The input stream
* @throws IOException
* If an I/O related problem occurs
@@ -500,7 +500,7 @@
/**
* Get the given header as an int.
- *
+ *
* @param name
* The header name
* @return The header value or -1 if header not found
@@ -520,7 +520,7 @@
/**
* Get the locale of the request. Attempts to decode the Accept-Language header and if not found
* returns the default locale of the JVM.
- *
+ *
* @return The locale
*/
public Locale getLocale()
@@ -557,7 +557,7 @@
/**
* Return all the accepted locales. This implementation always returns just one.
- *
+ *
* @return The locales
*/
public Enumeration getLocales()
@@ -569,7 +569,7 @@
/**
* Get the method.
- *
+ *
* @return The method
*/
public String getMethod()
@@ -579,7 +579,7 @@
/**
* Get the request parameter with the given name.
- *
+ *
* @param name
* The parameter name
* @return The parameter value, or null
@@ -591,7 +591,7 @@
/**
* Get the map of all of the parameters.
- *
+ *
* @return The parameters
*/
public Map getParameterMap()
@@ -601,7 +601,7 @@
/**
* Get the names of all of the parameters.
- *
+ *
* @return The parameter names
*/
public Enumeration getParameterNames()
@@ -611,7 +611,7 @@
/**
* Get the values for the given parameter.
- *
+ *
* @param name
* The name of the parameter
* @return The return values
@@ -638,7 +638,7 @@
/**
* Get the path info.
- *
+ *
* @return The path info
*/
public String getPathInfo()
@@ -648,7 +648,7 @@
/**
* Always returns null.
- *
+ *
* @return null
*/
public String getPathTranslated()
@@ -658,7 +658,7 @@
/**
* Get the protocol.
- *
+ *
* @return Always HTTP/1.1
*/
public String getProtocol()
@@ -668,7 +668,7 @@
/**
* Get the query string part of the request.
- *
+ *
* @return The query string
*/
public String getQueryString()
@@ -706,7 +706,7 @@
/**
* This feature is not implemented at this time as we are not supporting binary servlet input.
* This functionality may be added in the future.
- *
+ *
* @return The reader
* @throws IOException
* If an I/O related problem occurs
@@ -718,7 +718,7 @@
/**
* Deprecated method - should not be used.
- *
+ *
* @param name
* The name
* @return The path
@@ -731,7 +731,7 @@
/**
* Get the remote address of the client.
- *
+ *
* @return Always 127.0.0.1
*/
public String getRemoteAddr()
@@ -741,7 +741,7 @@
/**
* Get the remote host.
- *
+ *
* @return Always localhost
*/
public String getRemoteHost()
@@ -751,7 +751,7 @@
/**
* Get the name of the remote user from the REMOTE_USER header.
- *
+ *
* @return The name of the remote user
*/
public String getRemoteUser()
@@ -762,7 +762,7 @@
/**
* Return a dummy dispatcher that just records that dispatch has occurred without actually doing
* anything.
- *
+ *
* @param name
* The name to dispatch to
* @return The dispatcher
@@ -774,7 +774,7 @@
/**
* Get the requested session id. Always returns the id of the current session.
- *
+ *
* @return The session id
*/
public String getRequestedSessionId()
@@ -785,7 +785,7 @@
/**
* Returns context path and servlet path concatenated, typically
* /applicationClassName/applicationClassName
- *
+ *
* @return The path value
* @see javax.servlet.http.HttpServletRequest#getRequestURI()
*/
@@ -800,7 +800,7 @@
/**
* Try to build a rough URL.
- *
+ *
* @return The url
*/
public StringBuffer getRequestURL()
@@ -824,7 +824,7 @@
/**
* Get the scheme.
- *
+ *
* @return Always http
*/
public String getScheme()
@@ -834,7 +834,7 @@
/**
* Get the server name.
- *
+ *
* @return Always localhost
*/
public String getServerName()
@@ -844,7 +844,7 @@
/**
* Get the server port.
- *
+ *
* @return Always 80
*/
public int getServerPort()
@@ -855,7 +855,7 @@
/**
* The servlet path may either be the application name or /. For test purposes we always return
* the servlet name.
- *
+ *
* @return The servlet path
*/
public String getServletPath()
@@ -865,7 +865,7 @@
/**
* Get the sessions.
- *
+ *
* @return The session
*/
public HttpSession getSession()
@@ -875,7 +875,7 @@
/**
* Get the session.
- *
+ *
* @param b
* Ignored, there is always a session
* @return The session
@@ -887,7 +887,7 @@
/**
* Get the user principal.
- *
+ *
* @return A user principal
*/
public Principal getUserPrincipal()
@@ -936,7 +936,7 @@
/**
* Check whether session id is from a cookie. Always returns true.
- *
+ *
* @return Always true
*/
public boolean isRequestedSessionIdFromCookie()
@@ -946,7 +946,7 @@
/**
* Check whether session id is from a url rewrite. Always returns false.
- *
+ *
* @return Always false
*/
public boolean isRequestedSessionIdFromUrl()
@@ -956,7 +956,7 @@
/**
* Check whether session id is from a url rewrite. Always returns false.
- *
+ *
* @return Always false
*/
public boolean isRequestedSessionIdFromURL()
@@ -966,7 +966,7 @@
/**
* Check whether the session id is valid.
- *
+ *
* @return Always true
*/
public boolean isRequestedSessionIdValid()
@@ -976,7 +976,7 @@
/**
* Always returns false.
- *
+ *
* @return Always false
*/
public boolean isSecure()
@@ -986,7 +986,7 @@
/**
* NOT IMPLEMENTED.
- *
+ *
* @param name
* The role name
* @return Always false
@@ -998,7 +998,7 @@
/**
* Remove the given attribute.
- *
+ *
* @param name
* The name of the attribute
*/
@@ -1009,7 +1009,7 @@
/**
* Set the given attribute.
- *
+ *
* @param name
* The attribute name
* @param o
@@ -1022,7 +1022,7 @@
/**
* Set the auth type.
- *
+ *
* @param authType
* The auth type
*/
@@ -1033,7 +1033,7 @@
/**
* Set the character encoding.
- *
+ *
* @param encoding
* The character encoding
* @throws UnsupportedEncodingException
@@ -1046,7 +1046,7 @@
/**
* Set the cookies.
- *
+ *
* @param theCookies
* The cookies
*/
@@ -1061,7 +1061,7 @@
/**
* Set the method.
- *
+ *
* @param method
* The method
*/
@@ -1072,7 +1072,7 @@
/**
* Set a parameter.
- *
+ *
* @param name
* The name
* @param value
@@ -1085,7 +1085,7 @@
/**
* Sets a map of parameters.
- *
+ *
* @param parameters
* the parameters to set
*/
@@ -1097,7 +1097,7 @@
/**
* Set the path that this request is supposed to be serving. The path is relative to the web
* application root and should start with a / character
- *
+ *
* @param path
*/
public void setPath(final String path)
@@ -1107,7 +1107,7 @@
/**
* Set the complete url for this request. The url will be analyzed.
- *
+ *
* @param url
*/
public void setURL(String url)
@@ -1143,7 +1143,7 @@
/**
* Initialize the request parameters to point to the given bookmarkable page.
- *
+ *
* @param page
* The page to point to
* @param params
@@ -1158,7 +1158,7 @@
/**
* Initialize the request parameters to point to the given component.
- *
+ *
* @param component
* The component
*/
@@ -1219,7 +1219,7 @@
* Initialize the request parameters to point to the given form component. The additional map
* should contain mappings between individual components that appear in the form and the string
* value that should be submitted for each of these components.
- *
+ *
* @param form
* The for to send the request to
* @param values
@@ -1268,7 +1268,7 @@
/**
* Initialize the request parameters from the given redirect string that redirects back to a
* particular component for display.
- *
+ *
* @param redirect
* The redirect string to display from
*/
@@ -1322,7 +1322,7 @@
/**
* Build the request based on the uploaded files and the parameters.
- *
+ *
* @return The request as a string.
*/
private byte[] buildRequest()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletResponse.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletResponse.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletResponse.java Mon Oct 15 14:21:25 2007
@@ -41,7 +41,7 @@
/**
* Mock servlet response. Implements all of the methods from the standard HttpServletResponse class
* plus helper methods to aid viewing the generated response.
- *
+ *
* @author Chris Turner
*/
public class MockHttpServletResponse implements HttpServletResponse
@@ -88,7 +88,7 @@
/**
* Add a cookie to the response.
- *
+ *
* @param cookie
* The cookie to add
*/
@@ -99,7 +99,7 @@
/**
* Add a date header.
- *
+ *
* @param name
* The header value
* @param l
@@ -113,7 +113,7 @@
/**
* Add the given header value, including an additional entry if one already exists.
- *
+ *
* @param name
* The name for the header
* @param value
@@ -132,7 +132,7 @@
/**
* Add an int header value.
- *
+ *
* @param name
* The header name
* @param i
@@ -145,7 +145,7 @@
/**
* Check if the response contains the given header name.
- *
+ *
* @param name
* The name to check
* @return Whether header in response or not
@@ -158,7 +158,7 @@
/**
* Encode the redirectLocation URL. Does no changes as this test implementation uses cookie
* based url tracking.
- *
+ *
* @param url
* The url to encode
* @return The encoded url
@@ -171,7 +171,7 @@
/**
* Encode the redirectLocation URL. Does no changes as this test implementation uses cookie
* based url tracking.
- *
+ *
* @param url
* The url to encode
* @return The encoded url
@@ -183,7 +183,7 @@
/**
* Encode the URL. Does no changes as this test implementation uses cookie based url tracking.
- *
+ *
* @param url
* The url to encode
* @return The encoded url
@@ -195,7 +195,7 @@
/**
* Encode the URL. Does no changes as this test implementation uses cookie based url tracking.
- *
+ *
* @param url
* The url to encode
* @return The encoded url
@@ -207,7 +207,7 @@
/**
* Flush the buffer.
- *
+ *
* @throws IOException
*/
public void flushBuffer() throws IOException
@@ -216,7 +216,7 @@
/**
* Get the binary content that was written to the servlet stream.
- *
+ *
* @return The binary content
*/
public byte[] getBinaryContent()
@@ -226,7 +226,7 @@
/**
* Return the current buffer size
- *
+ *
* @return The buffer size
*/
public int getBufferSize()
@@ -247,7 +247,7 @@
/**
* Get the character encoding of the response.
- *
+ *
* @return The character encoding
*/
public String getCharacterEncoding()
@@ -257,7 +257,7 @@
/**
* Get the response code for this request.
- *
+ *
* @return The response code
*/
public int getCode()
@@ -267,7 +267,7 @@
/**
* Get all of the cookies that have been added to the response.
- *
+ *
* @return The collection of cookies
*/
public Collection getCookies()
@@ -277,7 +277,7 @@
/**
* Get the text document that was written as part of this response.
- *
+ *
* @return The document
*/
public String getDocument()
@@ -294,7 +294,7 @@
/**
* Get the error message.
- *
+ *
* @return The error message, or null if no message
*/
public String getErrorMessage()
@@ -304,7 +304,7 @@
/**
* Return the value of the given named header.
- *
+ *
* @param name
* The header name
* @return The value, or null
@@ -324,7 +324,7 @@
/**
* Get the names of all of the headers.
- *
+ *
* @return The header names
*/
public Set getHeaderNames()
@@ -334,7 +334,7 @@
/**
* Get the encoded locale
- *
+ *
* @return The locale
*/
public Locale getLocale()
@@ -344,7 +344,7 @@
/**
* Get the output stream for writing binary data from the servlet.
- *
+ *
* @return The binary output stream.
*/
public ServletOutputStream getOutputStream()
@@ -359,7 +359,7 @@
/**
* Get the location that was redirected to.
- *
+ *
* @return The redirect location, or null if not a redirect
*/
public String getRedirectLocation()
@@ -369,7 +369,7 @@
/**
* Get the status code.
- *
+ *
* @return The status code
*/
public int getStatus()
@@ -379,7 +379,7 @@
/**
* Get the print writer for writing text output for this response.
- *
+ *
* @return The writer
* @throws IOException
* Not used
@@ -434,7 +434,7 @@
/**
* Always returns false.
- *
+ *
* @return Always false
*/
public boolean isCommitted()
@@ -444,7 +444,7 @@
/**
* Return whether the servlet returned an error code or not.
- *
+ *
* @return Whether an error occurred or not
*/
public boolean isError()
@@ -454,7 +454,7 @@
/**
* Check whether the response was redirected or not.
- *
+ *
* @return Whether the state was redirected or not
*/
public boolean isRedirect()
@@ -487,7 +487,7 @@
/**
* Send an error code. This implementation just sets the internal error state information.
- *
+ *
* @param code
* The code
* @throws IOException
@@ -501,7 +501,7 @@
/**
* Send an error code. This implementation just sets the internal error state information.
- *
+ *
* @param code
* The error code
* @param msg
@@ -518,7 +518,7 @@
/**
* Indicate sending of a redirectLocation to a particular named resource. This implementation
* just keeps hold of the redirectLocation info and makes it available for query.
- *
+ *
* @param location
* The location to redirectLocation to
* @throws IOException
@@ -531,7 +531,7 @@
/**
* Method ignored.
- *
+ *
* @param size
* The size
*/
@@ -541,7 +541,7 @@
/**
* Set the character encoding.
- *
+ *
* @param characterEncoding
* The character encoding
*/
@@ -552,7 +552,7 @@
/**
* Set the content length.
- *
+ *
* @param length
* The length
*/
@@ -563,7 +563,7 @@
/**
* Set the content type.
- *
+ *
* @param type
* The content type
*/
@@ -579,7 +579,7 @@
/**
* Set a date header.
- *
+ *
* @param name
* The header name
* @param l
@@ -611,7 +611,7 @@
/**
* Format HTTP date "EEE, dd MMM yyyy HH:mm:ss 'GMT'" or "EEE, dd-MMM-yy HH:mm:ss 'GMT'"for
* cookies
- *
+ *
* @param buf
* @param calendar
* @param cookie
@@ -680,7 +680,7 @@
/**
* Set the given header value.
- *
+ *
* @param name
* The name for the header
* @param value
@@ -695,7 +695,7 @@
/**
* Set an int header value.
- *
+ *
* @param name
* The header name
* @param i
@@ -708,7 +708,7 @@
/**
* Set the locale in the response header.
- *
+ *
* @param locale
* The locale
*/
@@ -719,7 +719,7 @@
/**
* Set the status for this response.
- *
+ *
* @param status
* The status
*/
@@ -730,7 +730,7 @@
/**
* Set the status for this response.
- *
+ *
* @param status
* The status
* @param msg
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java Mon Oct 15 14:21:25 2007
@@ -28,8 +28,7 @@
/**
- * Mock implementation of the <code>WebSession</code> interface for use by the
- * test harnesses.
+ * Mock implementation of the <code>WebSession</code> interface for use by the test harnesses.
*
* @author Chris Turner
*/
@@ -43,7 +42,7 @@
private final long creationTime = System.currentTimeMillis();
- private final String id = (new UID()).toString().replace(':', '_').replace('-','_');
+ private final String id = (new UID()).toString().replace(':', '_').replace('-', '_');
private long lastAccessedTime = 0;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java Mon Oct 15 14:21:25 2007
@@ -51,7 +51,7 @@
* value allows all of the resource location functionality to work as in a fully functioning web
* application. This value is not set then not resource location functionality will work and instead
* null will always be returned.
- *
+ *
* @author Chris Turner
*/
public class MockServletContext implements ServletContext
@@ -70,11 +70,11 @@
private File webappRoot;
/**
- * Create the mock object. As part of the creation, the context sets the root directory where web
- * application content is stored. This must be an ABSOLUTE directory relative to where the tests
- * are being executed. For example: <code>System.getProperty("user.dir") +
+ * Create the mock object. As part of the creation, the context sets the root directory where
+ * web application content is stored. This must be an ABSOLUTE directory relative to where the
+ * tests are being executed. For example: <code>System.getProperty("user.dir") +
* "/src/webapp"</code>
- *
+ *
* @param application
* The application that this context is for
* @param path
@@ -115,7 +115,7 @@
/**
* Add an init parameter.
- *
+ *
* @param name
* The parameter name
* @param value
@@ -130,7 +130,7 @@
/**
* Add a new recognized mime type.
- *
+ *
* @param fileExtension
* The file extension (e.g. "jpg")
* @param mimeType
@@ -143,7 +143,7 @@
/**
* Get an attribute with the given name.
- *
+ *
* @param name
* The attribute name
* @return The value, or null
@@ -155,7 +155,7 @@
/**
* Get all of the attribute names.
- *
+ *
* @return The attribute names
*/
public Enumeration getAttributeNames()
@@ -167,7 +167,7 @@
/**
* Get the context for the given URL path
- *
+ *
* @param name
* The url path
* @return Always returns this
@@ -179,7 +179,7 @@
/**
* Get the init parameter with the given name.
- *
+ *
* @param name
* The name
* @return The parameter, or null if no such parameter
@@ -191,7 +191,7 @@
/**
* Get the name of all of the init parameters.
- *
+ *
* @return The init parameter names
*/
public Enumeration getInitParameterNames()
@@ -210,7 +210,7 @@
/**
* Get the mime type for the given file. Uses a hardcoded map of mime types set at
* Initialization time.
- *
+ *
* @param name
* The name to get the mime type for
* @return The mime type
@@ -238,7 +238,7 @@
/**
* Wicket does not use the RequestDispatcher, so this implementation just returns a dummy value.
- *
+ *
* @param name
* The name of the servlet or JSP
* @return The dispatcher
@@ -250,7 +250,7 @@
/**
* Get the real file path of the given resource name.
- *
+ *
* @param name
* The name
* @return The real path or null
@@ -280,7 +280,7 @@
/**
* Wicket does not use the RequestDispatcher, so this implementation just returns a dummy value.
- *
+ *
* @param name
* The name of the resource to get the dispatcher for
* @return The dispatcher
@@ -305,7 +305,7 @@
/**
* Get the URL for a particular resource that is relative to the web app root directory.
- *
+ *
* @param name
* The name of the resource to get
* @return The resource, or null if resource not found
@@ -337,7 +337,7 @@
/**
* Get an input stream for a particular resource that is relative to the web app root directory.
- *
+ *
* @param name
* The name of the resource to get
* @return The input stream for the resource, or null of resource is not found
@@ -376,7 +376,7 @@
/**
* Get the resource paths starting from the web app root directory and then relative to the the
* given name.
- *
+ *
* @param name
* The starting name
* @return The set of resource paths at this location
@@ -443,7 +443,7 @@
/**
* Get the server info.
- *
+ *
* @return The server info
*/
public String getServerInfo()
@@ -453,7 +453,7 @@
/**
* NOT USED - Servlet Spec requires that this always returns null.
- *
+ *
* @param name
* Not used
* @return null
@@ -467,7 +467,7 @@
/**
* Return the name of the servlet context.
- *
+ *
* @return The name
*/
public String getServletContextName()
@@ -477,7 +477,7 @@
/**
* NOT USED - Servlet spec requires that this always returns null.
- *
+ *
* @return null
*/
public Enumeration getServletNames()
@@ -487,7 +487,7 @@
/**
* NOT USED - Servlet spec requires that this always returns null.
- *
+ *
* @return null
*/
public Enumeration getServlets()
@@ -497,7 +497,7 @@
/**
* As part of testing we always log to the console.
- *
+ *
* @param e
* The exception to log
* @param msg
@@ -510,7 +510,7 @@
/**
* As part of testing we always log to the console.
- *
+ *
* @param msg
* The message to log
*/
@@ -521,7 +521,7 @@
/**
* As part of testing we always log to the console.
- *
+ *
* @param msg
* The message to log
* @param cause
@@ -534,7 +534,7 @@
/**
* Remove an attribute with the given name.
- *
+ *
* @param name
* The name
*/
@@ -545,7 +545,7 @@
/**
* Set an attribute.
- *
+ *
* @param name
* The name of the attribute
* @param o
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Mon Oct 15 14:21:25 2007
@@ -72,7 +72,7 @@
* <li>This harness is SINGLE THREADED - there is only one global session. For multi-threaded
* testing you must do integration testing with a full tester server.
* </ul>
- *
+ *
* @author Chris Turner
*/
public class MockWebApplication
@@ -116,7 +116,7 @@
/**
* Create the mock http tester that can be used for testing.
- *
+ *
* @param application
* The wicket application object
* @param path
@@ -213,7 +213,7 @@
/**
* Used to create a new mock servlet context.
- *
+ *
* @param path
* The absolute path on disk to the web tester contents (e.g. war root) - may be null
* @return ServletContext
@@ -225,7 +225,7 @@
/**
* Gets the application object.
- *
+ *
* @return Wicket application
*/
public final WebApplication getApplication()
@@ -235,7 +235,7 @@
/**
* Get the page that was just rendered by the last request cycle processing.
- *
+ *
* @return The last rendered page
*/
public Page getLastRenderedPage()
@@ -245,7 +245,7 @@
/**
* Get the page that was previously
- *
+ *
* @return The last rendered page
*/
public Page getPreviousRenderedPage()
@@ -255,7 +255,7 @@
/**
* Get the request object so that we can apply configurations to it.
- *
+ *
* @return The request object
*/
public MockHttpServletRequest getServletRequest()
@@ -265,7 +265,7 @@
/**
* Get the response object so that we can apply configurations to it.
- *
+ *
* @return The response object
*/
public MockHttpServletResponse getServletResponse()
@@ -275,7 +275,7 @@
/**
* Get the session object so that we can apply configurations to it.
- *
+ *
* @return The session object
*/
public MockHttpSession getServletSession()
@@ -285,7 +285,7 @@
/**
* Get the wicket request object.
- *
+ *
* @return The wicket request object
*/
public WebRequest getWicketRequest()
@@ -295,7 +295,7 @@
/**
* Get the wicket response object.
- *
+ *
* @return The wicket response object
*/
public WebResponse getWicketResponse()
@@ -305,7 +305,7 @@
/**
* Get the wicket session.
- *
+ *
* @return The wicket session object
*/
public WebSession getWicketSession()
@@ -315,7 +315,7 @@
/**
* Initialize a new WebRequestCycle and all its dependent objects
- *
+ *
* @param component
*/
public void processRequestCycle(final Component component)
@@ -333,7 +333,7 @@
/**
* Initialize a new WebRequestCycle and all its dependent objects
- *
+ *
* @param pageClass
*/
public void processRequestCycle(final Class pageClass)
@@ -361,7 +361,7 @@
/**
* Create and process the request cycle using the current request and response information.
- *
+ *
* @param cycle
*/
public void processRequestCycle(WebRequestCycle cycle)
@@ -378,7 +378,7 @@
}
/**
- *
+ *
* @param cycle
*/
private void postProcessRequestCycle(WebRequestCycle cycle)
@@ -416,7 +416,7 @@
}
/**
- *
+ *
* @param cycle
* @return Last page
*/
@@ -465,7 +465,7 @@
/**
* Create and process the request cycle using the current request and response information.
- *
+ *
* @return A new and initialized WebRequestCyle
*/
public WebRequestCycle createRequestCycle()
@@ -505,7 +505,7 @@
/**
* Gets the parameters to be set on the next request.
- *
+ *
* @return the parameters to be set on the next request
*/
public Map getParametersForNextRequest()
@@ -515,7 +515,7 @@
/**
* Sets the parameters to be set on the next request.
- *
+ *
* @param parametersForNextRequest
* the parameters to be set on the next request
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketServlet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketServlet.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketServlet.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketServlet.java Mon Oct 15 14:21:25 2007
@@ -18,10 +18,9 @@
/**
- * Custom WicketServlet that reloads the web applications when classes are
- * modified. In order to reload your own classes, use include and exclude
- * patterns using wildcards. And in web.xml, point to the reloading wicket
- * servlet instead of the original one.
+ * Custom WicketServlet that reloads the web applications when classes are modified. In order to
+ * reload your own classes, use include and exclude patterns using wildcards. And in web.xml, point
+ * to the reloading wicket servlet instead of the original one.
*
* <p>
* <b>Example denoting the built-in patterns:</b>
@@ -37,8 +36,7 @@
* }
* </pre>
*
- * @see ReloadingWicketFilter for complete documentation, and for proper
- * integration with Spring
+ * @see ReloadingWicketFilter for complete documentation, and for proper integration with Spring
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java Mon Oct 15 14:21:25 2007
@@ -44,19 +44,17 @@
/**
* This is the logger class that can be set in the
* {@link org.apache.wicket.protocol.http.WebApplication#getRequestLogger()} method. If this class
- * is set all request and live sessions will be recorded and displayed From the
- * total created sessions, to the peak session count and the current
- * livesessions. For the livesessions the request logger will record what
- * request are happening what kind of {@link IRequestTarget} was the event
- * target and what {@link IRequestTarget} was the response target. It also
- * records what session data was touched for this and how long the request did
- * take.
- *
- * To view this information live see the {@link InspectorBug} that shows the
- * {@link InspectorPage} with the {@link LiveSessionsPage}
- *
+ * is set all request and live sessions will be recorded and displayed From the total created
+ * sessions, to the peak session count and the current livesessions. For the livesessions the
+ * request logger will record what request are happening what kind of {@link IRequestTarget} was the
+ * event target and what {@link IRequestTarget} was the response target. It also records what
+ * session data was touched for this and how long the request did take.
+ *
+ * To view this information live see the {@link InspectorBug} that shows the {@link InspectorPage}
+ * with the {@link LiveSessionsPage}
+ *
* @author jcompagner
- *
+ *
* @since 1.2
*/
public class RequestLogger implements IRequestLogger
@@ -66,22 +64,20 @@
/**
- * This interface can be implemented in a custom session object. to give an
- * object that has more information for the current session (state of
- * session).
- *
+ * This interface can be implemented in a custom session object. to give an object that has more
+ * information for the current session (state of session).
+ *
* @author jcompagner
*/
public interface ISessionLogInfo
{
/**
- * If you use the request logger log functionality then this object
- * should have a nice String representation. So make sure that the
- * toString() is implemented for the returned object.
- *
- * @return The custom object stored in the request loggers current
- * request.
+ * If you use the request logger log functionality then this object should have a nice
+ * String representation. So make sure that the toString() is implemented for the returned
+ * object.
+ *
+ * @return The custom object stored in the request loggers current request.
*/
Object getSessionInfo();
}
@@ -230,10 +226,13 @@
}
catch (Exception e)
{
- // log the error and let the request logging continue (this is what happens in the
+ // log the error and let the request logging continue (this is what happens in
+ // the
// detach phase of the request cycle anyway. This provides better diagnostics).
- log.error("Exception while determining the size of the session in the request logger: "
- + e.getMessage(), e);
+ log
+ .error(
+ "Exception while determining the size of the session in the request logger: " +
+ e.getMessage(), e);
}
}
rd.setSessionSize(sizeInBytes);
@@ -345,8 +344,8 @@
else if (value instanceof IPageMap)
{
IPageMap map = (IPageMap)value;
- rd.addEntry("PageMap removed, name: "
- + (map.getName() == null ? "DEFAULT" : map.getName()));
+ rd.addEntry("PageMap removed, name: " +
+ (map.getName() == null ? "DEFAULT" : map.getName()));
}
else if (value instanceof WebSession)
{
@@ -372,8 +371,8 @@
else if (value instanceof IPageMap)
{
IPageMap map = (IPageMap)value;
- rd.addEntry("PageMap updated, name: "
- + (map.getName() == null ? "DEFAULT" : map.getName()));
+ rd.addEntry("PageMap updated, name: " +
+ (map.getName() == null ? "DEFAULT" : map.getName()));
}
else if (value instanceof Session)
{
@@ -404,8 +403,8 @@
else if (value instanceof IPageMap)
{
IPageMap map = (IPageMap)value;
- rd.addEntry("PageMap created, name: "
- + (map.getName() == null ? "DEFAULT" : map.getName()));
+ rd.addEntry("PageMap created, name: " +
+ (map.getName() == null ? "DEFAULT" : map.getName()));
}
else
{
@@ -487,7 +486,7 @@
/**
* This class hold the information one request of a session has.
- *
+ *
* @author jcompagner
*/
public static class SessionData implements IClusterable, Comparable
@@ -504,7 +503,7 @@
/**
* Construct.
- *
+ *
* @param sessionId
*/
public SessionData(String sessionId)
@@ -555,8 +554,8 @@
}
/**
- * @return The session info object given by the
- * {@link ISessionLogInfo#getSessionInfo()} session method.
+ * @return The session info object given by the {@link ISessionLogInfo#getSessionInfo()}
+ * session method.
*/
public Object getSessionInfo()
{
@@ -597,7 +596,7 @@
/**
* This class hold the information one request of a session has.
- *
+ *
* @author jcompagner
*/
public static class RequestData implements IClusterable
@@ -644,8 +643,7 @@
}
/**
- * @return The session object info, created by
- * {@link ISessionLogInfo#getSessionInfo()}
+ * @return The session object info, created by {@link ISessionLogInfo#getSessionInfo()}
*/
public Object getSessionInfo()
{
@@ -654,7 +652,7 @@
/**
* Set the session info object of the session for this request.
- *
+ *
* @param sessionInfo
*/
public void setSessionInfo(Object sessionInfo)
@@ -736,8 +734,7 @@
}
/**
- * @return All entries of the objects that are created/updated or
- * removed in this request
+ * @return All entries of the objects that are created/updated or removed in this request
*/
public String getAlteredObjects()
{
@@ -772,10 +769,10 @@
public String toString()
{
- return "Request[timetaken=" + getTimeTaken() + ",sessioninfo=" + sessionInfo
- + ",sessionid=" + sessionId + ",sessionsize=" + totalSessionSize + ",request="
- + eventTarget + ",response=" + responseTarget + ",alteredobjects="
- + getAlteredObjects() + ",activerequest=" + activeRequest + "]";
+ return "Request[timetaken=" + getTimeTaken() + ",sessioninfo=" + sessionInfo +
+ ",sessionid=" + sessionId + ",sessionsize=" + totalSessionSize + ",request=" +
+ eventTarget + ",response=" + responseTarget + ",alteredobjects=" +
+ getAlteredObjects() + ",activerequest=" + activeRequest + "]";
}
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java Mon Oct 15 14:21:25 2007
@@ -32,12 +32,12 @@
public final class RequestUtils
{
/**
- * Decode the provided queryString as a series of key/ value pairs and set
- * them in the provided value map.
- *
+ * Decode the provided queryString as a series of key/ value pairs and set them in the provided
+ * value map.
+ *
* @param queryString
- * string to decode, uses '&' to separate parameters and '=' to
- * separate key from value
+ * string to decode, uses '&' to separate parameters and '=' to separate key from
+ * value
* @param params
* parameters map to write the found key/ value pairs to
*/
@@ -68,6 +68,7 @@
/**
* Remove occurrences of ".." from the path
+ *
* @param path
* @return
*/
@@ -76,12 +77,12 @@
String[] components = path.split("/");
List newcomponents = new ArrayList(Arrays.asList(components));
- for (int i=0; i<components.length; i++)
+ for (int i = 0; i < components.length; i++)
{
- if (i<components.length-1)
+ if (i < components.length - 1)
{
// Verify for a ".." component at next iteration
- if (components[i].length() > 0 && components[i+1].equals(".."))
+ if (components[i].length() > 0 && components[i + 1].equals(".."))
{
newcomponents.remove(i);
newcomponents.remove(i);
@@ -105,6 +106,7 @@
/**
* Does a URLDecoder.decode() in UTF-8
+ *
* @param path
* @return
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java Mon Oct 15 14:21:25 2007
@@ -33,9 +33,8 @@
/**
* Stores pages on disk.
* <p>
- * Override {@link #getWorkDir()} to change the default directory for pages,
- * which is configured from the javax.servlet.context.tempdir attribute in the
- * servlet context.
+ * Override {@link #getWorkDir()} to change the default directory for pages, which is configured
+ * from the javax.servlet.context.tempdir attribute in the servlet context.
*
* @author jcompagner
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/UnitTestSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/UnitTestSettings.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/UnitTestSettings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/UnitTestSettings.java Mon Oct 15 14:21:25 2007
@@ -24,8 +24,8 @@
public class UnitTestSettings
{
/**
- * True when unit testing is going on and we need to sort coded parameters
- * so they will string compare.
+ * True when unit testing is going on and we need to sort coded parameters so they will string
+ * compare.
*/
private static boolean sortUrlParameters = false;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Mon Oct 15 14:21:25 2007
@@ -65,14 +65,14 @@
* <p>
* If you want to use a filter specific configuration, e.g. using init parameters from the
* {@link javax.servlet.FilterConfig} object, you should override the init() method. For example:
- *
+ *
* <pre>
* public void init() {
* String webXMLParameter = getInitParameter("myWebXMLParameter");
* URL schedulersConfig = getServletContext().getResource("/WEB-INF/schedulers.xml");
* ...
* </pre>
- *
+ *
* @see WicketFilter
* @see org.apache.wicket.settings.IApplicationSettings
* @see org.apache.wicket.settings.IDebugSettings
@@ -86,7 +86,7 @@
* @see javax.servlet.Filter
* @see javax.servlet.FilterConfig
* @see javax.servlet.ServletContext
- *
+ *
* @author Jonathan Locke
* @author Chris Turner
* @author Johan Compagner
@@ -146,7 +146,7 @@
/**
* Gets an init parameter from the filter's context.
- *
+ *
* @param key
* the key to search for
* @return the value of the filter init parameter
@@ -166,7 +166,7 @@
* Gets the default request cycle processor (with lazy initialization). This is the
* {@link IRequestCycleProcessor} that will be used by {@link RequestCycle}s when custom
* implementations of the request cycle do not provide their own customized versions.
- *
+ *
* @return the default request cycle processor
*/
public final IRequestCycleProcessor getRequestCycleProcessor()
@@ -181,7 +181,7 @@
/**
* Gets the servlet context for this application. Use this to get references to absolute paths,
* global web.xml parameters (<context-param>), etc.
- *
+ *
* @return The servlet context for this application
*/
public final ServletContext getServletContext()
@@ -198,10 +198,10 @@
/**
* Gets the prefix for storing variables in the actual session (typically {@link HttpSession}
* for this application instance.
- *
+ *
* @param request
* the request
- *
+ *
* @return the prefix for storing variables in the actual session
*/
public String getSessionAttributePrefix(final WebRequest request)
@@ -252,7 +252,7 @@
/**
* Mounts an encoder at the given path.
- *
+ *
* @param encoder
* the encoder that will be used for this mount
*/
@@ -268,7 +268,7 @@
/**
* Mounts all bookmarkable pages at the given path.
- *
+ *
* @param path
* the path to mount the bookmarkable page class on
* @param packageName
@@ -286,7 +286,7 @@
/**
* Mounts a bookmarkable page class to the given path.
- *
+ *
* @param path
* the path to mount the bookmarkable page class on
* @param bookmarkablePageClass
@@ -299,7 +299,7 @@
/**
* Mounts a bookmarkable page class to the given pagemap and path.
- *
+ *
* @param path
* the path to mount the bookmarkable page class on
* @param pageMapName
@@ -316,7 +316,7 @@
/**
* Mounts a shared resource class to the given path.
- *
+ *
* @param path
* the path to mount the resource class on
* @param resourceKey
@@ -339,7 +339,7 @@
/**
* Create new Wicket Session object. Note, this method is not called if you registered your own
* ISessionFactory with the Application.
- *
+ *
* @return The created session
* @deprecated see {@link WebApplication#newSession(Request, Response)}.
*/
@@ -352,7 +352,7 @@
/**
* Create new Wicket Session object. Note, this method is not called if you registered your own
* ISessionFactory with the Application.
- *
+ *
* @param request
* @return The created session
* @deprecated {@link WebApplication#newSession(Request, Response)}.
@@ -389,7 +389,7 @@
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.
- *
+ *
* @param wicketFilter
* The wicket filter instance for this application
*/
@@ -401,7 +401,7 @@
/**
* Unmounts whatever encoder is mounted at a given path.
- *
+ *
* @param path
* the path of the encoder to unmount
*/
@@ -450,7 +450,7 @@
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.
- *
+ *
* Internal initialization. First determine the deployment mode. First check the system property
* -Dwicket.configuration. If it does not exist check the servlet init parameter (
* <code><init-param><param-name>configuration</param-name></code>). If not
@@ -533,10 +533,10 @@
/**
* Gets a new request cycle processor for web requests. May be replaced by subclasses which wish
* to use their own implementation of IRequestCycleProcessor.
- *
+ *
* NOTE this can't be moved to application as portlets use two different request cycle
* processors, and hence have two different methods for them, depending on the kind of request.
- *
+ *
* @return IRequestCycleProcessor
*/
protected IRequestCycleProcessor newRequestCycleProcessor()
@@ -555,7 +555,7 @@
/**
* Create a new WebRequest. Subclasses of WebRequest could e.g. decode and obfuscated URL which
* has been encoded by an appropriate WebResponse.
- *
+ *
* @param servletRequest
* @return a WebRequest object
*/
@@ -568,7 +568,7 @@
* Create a WebResponse. Subclasses of WebRequest could e.g. encode wicket's default URL and
* hide the details from the user. A appropriate WebRequest must be implemented and configured
* to decode the encoded URL.
- *
+ *
* @param servletResponse
* @return a WebResponse object
*/
@@ -588,7 +588,7 @@
/**
* Add a buffered response to the redirect buffer.
- *
+ *
* @param sessionId
* the session id
* @param bufferId
@@ -650,10 +650,10 @@
/**
* Returns the redirect map where the buffered render pages are stored in and removes it
* immediately.
- *
+ *
* @param sessionId
* the session id
- *
+ *
* @param bufferId
* the id of the buffer as passed in as a request parameter
* @return the buffered response or null if not found (when this request is on a different box
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplicationFactoryCreationException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplicationFactoryCreationException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplicationFactoryCreationException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplicationFactoryCreationException.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
import org.apache.wicket.WicketRuntimeException;
/**
- * Thrown when the {@link org.apache.wicket.protocol.http.IWebApplicationFactory} could not
- * be created for some reason.
+ * Thrown when the {@link org.apache.wicket.protocol.http.IWebApplicationFactory} could not be
+ * created for some reason.
*
* @author Seth Ladd
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java Mon Oct 15 14:21:25 2007
@@ -40,7 +40,7 @@
* bookmarkable pages as well as non-bookmarkable component interfaces. The protected handleRender
* method is the internal entrypoint which takes care of the details of rendering a response to an
* HTTP request.
- *
+ *
* @see RequestCycle
* @author Jonathan Locke
* @author Johan Compagner
@@ -60,7 +60,7 @@
/**
* Constructor which simply passes arguments to superclass for storage there. This instance will
* be set as the current one for this thread.
- *
+ *
* @param application
* The application
* @param request
@@ -83,7 +83,7 @@
* {@link #onRuntimeException(Page, RuntimeException)} is not called unless you deliberately put
* effort in it to make it work.</strong>
* </p>
- *
+ *
* @see org.apache.wicket.RequestCycle#getProcessor()
*/
public IRequestCycleProcessor getProcessor()
@@ -120,7 +120,7 @@
* directly, but work with setResponsePage instead. This method is part of Wicket's internal
* behavior and should only be used when you want to circumvent the normal framework behavior
* and issue the redirect directly.
- *
+ *
* @param page
* The page to redirect to
*/
@@ -272,7 +272,7 @@
/**
* If it's an ajax request we always redirect.
- *
+ *
* @see org.apache.wicket.RequestCycle#isRedirect()
*/
public final boolean isRedirect()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java Mon Oct 15 14:21:25 2007
@@ -39,7 +39,7 @@
/**
* Default request processor implementation for normal web applications.
- *
+ *
* @author eelcohillenius
*/
public class WebRequestCycleProcessor extends AbstractRequestCycleProcessor
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java Mon Oct 15 14:21:25 2007
@@ -28,7 +28,7 @@
/**
* A session subclass for the HTTP protocol.
- *
+ *
* @author Jonathan Locke
*/
public class WebSession extends Session
@@ -63,9 +63,9 @@
/**
* Constructor. Note that {@link RequestCycle} is not available until this constructor returns.
- *
+ *
* @deprecated Use #WebSession(Request) instead
- *
+ *
* @param application
* The application
* @param request
@@ -78,9 +78,9 @@
/**
* Constructor. Note that {@link RequestCycle} is not available until this constructor returns.
- *
+ *
* @deprecated Use #WebSession(Request)
- *
+ *
* @param application
* The application
* @param request
@@ -93,7 +93,7 @@
/**
* Constructor. Note that {@link RequestCycle} is not available until this constructor returns.
- *
+ *
* @param request
* The current request
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Mon Oct 15 14:21:25 2007
@@ -55,7 +55,7 @@
/**
* Filter for initiating handling of Wicket requests.
- *
+ *
* @author jcompagner
*/
public class WicketFilter implements Filter
@@ -95,18 +95,22 @@
private boolean servletMode = false;
/**
- * The name of the optional filter parameter indicating it may/can only be accessed from within a Portlet context.
- * Value should be true
+ * The name of the optional filter parameter indicating it may/can only be accessed from within
+ * a Portlet context. Value should be true
*/
private final String PORTLET_ONLY_FILTER = "portletOnlyFilter";
/* init marker if running in a portlet container context */
private Boolean portletContextAvailable;
- /* Delegate for handling Portlet specific filtering. Not instantiated if not running in a portlet container context */
+ /*
+ * Delegate for handling Portlet specific filtering. Not instantiated if not running in a
+ * portlet container context
+ */
private WicketFilterPortletContext filterPortletContext;
- /* Flag if this filter may only process request from within a Portlet context.
+ /*
+ * Flag if this filter may only process request from within a Portlet context.
*/
private boolean portletOnlyFilter;
@@ -133,20 +137,22 @@
HttpServletResponse httpServletResponse;
boolean inPortletContext = false;
- if (filterPortletContext != null)
- {
- FilterRequestContext filterRequestContext = new FilterRequestContext((HttpServletRequest)request,(HttpServletResponse)response);
- inPortletContext = filterPortletContext.setupFilter(getFilterConfig(), filterRequestContext, getFilterPath((HttpServletRequest)request));
- httpServletRequest = filterRequestContext.getRequest();
- httpServletResponse = filterRequestContext.getResponse();
- }
- else
- {
- httpServletRequest = (HttpServletRequest)request;
+ if (filterPortletContext != null)
+ {
+ FilterRequestContext filterRequestContext = new FilterRequestContext(
+ (HttpServletRequest)request, (HttpServletResponse)response);
+ inPortletContext = filterPortletContext.setupFilter(getFilterConfig(),
+ filterRequestContext, getFilterPath((HttpServletRequest)request));
+ httpServletRequest = filterRequestContext.getRequest();
+ httpServletResponse = filterRequestContext.getResponse();
+ }
+ else
+ {
+ httpServletRequest = (HttpServletRequest)request;
httpServletResponse = (HttpServletResponse)response;
- }
+ }
- if ( portletOnlyFilter && !inPortletContext )
+ if (portletOnlyFilter && !inPortletContext)
{
chain.doFilter(request, response);
return;
@@ -199,7 +205,7 @@
/**
* Handles servlet page requests.
- *
+ *
* @param servletRequest
* Servlet request object
* @param servletResponse
@@ -308,7 +314,7 @@
response.setCharacterEncoding(webApplication.getRequestCycleSettings()
.getResponseRequestEncoding());
- createRequestContext(request, response);
+ createRequestContext(request, response);
// Create request cycle
final RequestCycle cycle = webApplication.newRequestCycle(request, response);
@@ -359,7 +365,7 @@
/**
* Returns a relative path from an HttpServletRequest Use this to resolve a Wicket request.
- *
+ *
* @param request
* @return Path requested, minus query string, context path, and filterPath. Relative, no
* leading '/'.
@@ -401,7 +407,7 @@
}
/**
- *
+ *
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
public void init(FilterConfig filterConfig) throws ServletException
@@ -487,11 +493,12 @@
// Give the application the option to log that it is started
webApplication.logStarted();
- portletOnlyFilter = Boolean.valueOf(filterConfig.getInitParameter(PORTLET_ONLY_FILTER)).booleanValue();
+ portletOnlyFilter = Boolean.valueOf(filterConfig.getInitParameter(PORTLET_ONLY_FILTER))
+ .booleanValue();
- if ( portletContextAvailable == null )
- {
- try
+ if (portletContextAvailable == null)
+ {
+ try
{
Class portletClass = Class.forName("javax.portlet.PortletContext");
portletContextAvailable = Boolean.TRUE;
@@ -501,11 +508,11 @@
{
portletContextAvailable = Boolean.FALSE;
}
- }
- if (filterPortletContext != null)
- {
- filterPortletContext.initFilter(filterConfig, webApplication);
- }
+ }
+ if (filterPortletContext != null)
+ {
+ filterPortletContext.initFilter(filterConfig, webApplication);
+ }
}
finally
{
@@ -522,13 +529,14 @@
return new WicketFilterPortletContext();
}
- protected void createRequestContext(WebRequest request, WebResponse response)
- {
- if (filterPortletContext == null || !filterPortletContext.createPortletRequestContext(request, response))
- {
- new RequestContext();
- }
- }
+ protected void createRequestContext(WebRequest request, WebResponse response)
+ {
+ if (filterPortletContext == null ||
+ !filterPortletContext.createPortletRequestContext(request, response))
+ {
+ new RequestContext();
+ }
+ }
private String getFilterPath(String filterName, InputStream is) throws ServletException
{
@@ -633,7 +641,7 @@
/**
* Is this a Wicket request?
- *
+ *
* @param relativePath
* The relativePath
* @return True if this is a Wicket request
@@ -663,7 +671,7 @@
/**
* If the response has not already a 'lastModified' header set and if 'lastModified' >= 0 than
* set the response header accordingly.
- *
+ *
* @param resp
* @param lastModified
*/
@@ -681,12 +689,12 @@
/**
* Creates the web application factory instance.
- *
+ *
* If no APP_FACT_PARAM is specified in web.xml ContextParamWebApplicationFactory will be used
* by default.
- *
+ *
* @see ContextParamWebApplicationFactory
- *
+ *
* @return application factory instance
*/
protected IWebApplicationFactory getApplicationFactory()
@@ -778,7 +786,7 @@
/**
* Strip trailing '*' and keep leading '/'
- *
+ *
* @param result
* @return
*/
@@ -789,7 +797,7 @@
/**
* Gets the last modified time stamp for the given request.
- *
+ *
* @param servletRequest
* @return The last modified time stamp
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/Comment.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/Comment.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/Comment.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/Comment.java Mon Oct 15 14:21:25 2007
@@ -23,37 +23,37 @@
*/
public class Comment implements DocumentElement
{
- /** The text for this HTML comment */
- private final String text;
+ /** The text for this HTML comment */
+ private final String text;
- /**
- * Create the comment.
- *
- * @param text
- * The text for the comment
- */
- public Comment(final String text)
- {
- this.text = text;
- }
+ /**
+ * Create the comment.
+ *
+ * @param text
+ * The text for the comment
+ */
+ public Comment(final String text)
+ {
+ this.text = text;
+ }
- /**
- * Get the comment text.
- *
- * @return The text
- */
- public String getText()
- {
- return text;
- }
+ /**
+ * Get the comment text.
+ *
+ * @return The text
+ */
+ public String getText()
+ {
+ return text;
+ }
- /**
- * Output a descriptive string.
- *
- * @return The string
- */
- public String toString()
- {
- return "[comment = '" + text + "']";
- }
+ /**
+ * Output a descriptive string.
+ *
+ * @return The string
+ */
+ public String toString()
+ {
+ return "[comment = '" + text + "']";
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java Mon Oct 15 14:21:25 2007
@@ -25,10 +25,9 @@
/**
- * Lightweight document parser for HTML. This parser is only intended to process
- * well formed and simple HTML of the kind that would generally be utilized
- * during testing.
- *
+ * Lightweight document parser for HTML. This parser is only intended to process well formed and
+ * simple HTML of the kind that would generally be utilized during testing.
+ *
* @author Chris Turner
*/
public class HtmlDocumentParser
@@ -72,7 +71,7 @@
/**
* Create the parser for the current document.
- *
+ *
* @param document
* The document to parse
*/
@@ -86,7 +85,7 @@
/**
* Get the attributes of the tag.
- *
+ *
* @return The attributes
*/
public Map getAttributes()
@@ -96,7 +95,7 @@
/**
* Get the comment.
- *
+ *
* @return The comment
*/
public String getComment()
@@ -105,10 +104,10 @@
}
/**
- * Iterates through the document searching for tokens. Returns the type of
- * token that was found. If an unexpected token was encountered then the
- * parser writes this fact to the console and continues
- *
+ * Iterates through the document searching for tokens. Returns the type of token that was found.
+ * If an unexpected token was encountered then the parser writes this fact to the console and
+ * continues
+ *
* @return The token that was found
*/
public int getNextToken()
@@ -130,7 +129,7 @@
/**
* Get the tag name.
- *
+ *
* @return The tag name
*/
public String getTag()
@@ -140,7 +139,7 @@
/**
* Get the text.
- *
+ *
* @return The text
*/
public String getText()
@@ -150,7 +149,7 @@
/**
* Extract attributes from the given string.
- *
+ *
* @param attributeString
* The string
* @return The map of attributes
@@ -197,7 +196,7 @@
/**
* Process a directive starting at the current position.
- *
+ *
* @return The token found
*/
private int processDirective()
@@ -265,7 +264,7 @@
/**
* Process text up to the next token.
- *
+ *
* @return The token code
*/
private int processText()