Author: janne
Date: Thu Mar 22 04:46:10 2007
New Revision: 521226
URL: http://svn.apache.org/viewvc?view=rev&rev=521226
Log:
some cleanup
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/IRequestCycleFactory.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/lang/PropertyResolver.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/resource/FileResourceStream.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ajax/AjaxTimerBehaviorTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/basic/HomePageRedirectTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/link/DownloadLinkTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/protocol/http/WebResponseTest.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategyTest.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Thu Mar 22 04:46:10 2007
@@ -18,7 +18,6 @@
import wicket.Application;
import wicket.AttributeModifier;
-import wicket.Component;
import wicket.IInitializer;
import wicket.ResourceReference;
import wicket.behavior.HeaderContributor;
@@ -29,7 +28,7 @@
/**
* ProgressbarPanel
- *
+ *
* @author Andrew Lombardi
*/
public class UploadProgressBar extends Panel
@@ -75,7 +74,7 @@
setOutputMarkupId(true);
form.setOutputMarkupId(true);
setRenderBodyOnly(true);
-
+
add(HeaderContributor.forJavaScript(JS_PROGRESSBAR));
final WebMarkupContainer barDiv = new WebMarkupContainer("bar");
@@ -90,7 +89,7 @@
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/IRequestCycleFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/IRequestCycleFactory.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/IRequestCycleFactory.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/IRequestCycleFactory.java
Thu Mar 22 04:46:10 2007
@@ -16,18 +16,17 @@
*/
package wicket;
-import java.io.Serializable;
/**
* Factory for creating request cycles for a session.
- *
+ *
* @author Jonathan Locke
*/
public interface IRequestCycleFactory extends IClusterable
{
/**
* Creates a new RequestCycle object.
- *
+ *
* @param session
* The session
* @param request
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
Thu Mar 22 04:46:10 2007
@@ -16,13 +16,11 @@
*/
package wicket.markup.html.form;
-import java.io.Serializable;
import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -34,7 +32,6 @@
import wicket.markup.ComponentTag;
import wicket.markup.html.WebMarkupContainer;
import wicket.model.IModel;
-import wicket.model.Model;
import wicket.util.convert.ConversionException;
import wicket.util.convert.IConverter;
import wicket.util.lang.Classes;
@@ -67,7 +64,7 @@
* <li>${name}: the name of the component that failed</li>
* <li>${label}: the label of the component</li>
* </ul>
- *
+ *
* @author Jonathan Locke
* @author Eelco Hillenius
* @author Johan Compagner
@@ -82,7 +79,7 @@
{
/**
* Called when visiting a form component
- *
+ *
* @param formComponent
* The form component
* @return component
@@ -112,7 +109,7 @@
/**
* Change object to capture the required flag change
- *
+ *
* @author Igor Vaynberg (ivaynberg)
*/
private final class RequiredStateChange extends Change
@@ -205,7 +202,7 @@
/**
* Adds a validator to this form component.
- *
+ *
* @param validator
* The validator
* @return This
@@ -218,7 +215,7 @@
/**
* Checks if the form component's 'required' requirement is met
- *
+ *
* @return true if the 'required' requirement is met, false otherwise
*/
public final boolean checkRequired()
@@ -256,12 +253,12 @@
/**
* Reports a validation error against this form component.
- *
+ *
* The actual error is reported by creating a
* [EMAIL PROTECTED] ValidationErrorFeedback} object that holds both
the validation
* error and the generated error message - so a custom feedback panel
can
* have access to both.
- *
+ *
* @param error
* validation error
*/
@@ -307,7 +304,7 @@
/**
* Gets the request parameter for this component as a string.
- *
+ *
* @return The value in the request for this component
*/
// TODO Post 1.2: make this final, if the users want to override this
they
@@ -327,7 +324,7 @@
/**
* Gets the request parameters for this component as strings.
- *
+ *
* @return The values in the request for this component
*/
public String[] getInputAsArray()
@@ -354,7 +351,7 @@
* element. Generated using the path from the form to the component,
* excluding the form itself. Override it if you want even a smaller
name.
* E.g. if you know for sure that the id is unique within a form.
- *
+ *
* @return The string to use as the form element's name attribute
*/
public String getInputName()
@@ -386,7 +383,7 @@
/**
* The value will be made available to the validator property by means
of
* ${label}. It does not have any specific meaning to FormComponent
itself.
- *
+ *
* @return labelModel
*/
public IModel getLabel()
@@ -398,7 +395,7 @@
* Use hasRawInput() to check if this component has raw input because
null
* can mean 2 things: It doesn't have rawinput or the rawinput is really
* null.
- *
+ *
* @return The raw form input that is stored for this formcomponent
*/
public final String getRawInput()
@@ -431,7 +428,7 @@
/**
* Gets an unmodifiable list of validators for this FormComponent.
- *
+ *
* @return List of validators
*/
public final List getValidators()
@@ -454,7 +451,7 @@
/**
* Gets current value for a form component.
- *
+ *
* @return The value
*/
public final String getValue()
@@ -475,7 +472,7 @@
/**
* This method can be called to know if this component really has raw
input.
- *
+ *
* @return boolean if this form component has rawinput.
*/
public final boolean hasRawInput()
@@ -525,7 +522,7 @@
* component TextField is an example (possibly the only one) that never
gets
* a null passed in, even if the field is left empty UNLESS it had
attribute
* <code>disabled="disabled"</code> set.
- *
+ *
* @return True if this component's input can be null. Returns true by
* default.
*/
@@ -565,7 +562,7 @@
* processed. This variable not only is convenient for 'business' use,
but
* is also nescesarry as we don't want the form component models updated
* with invalid input.
- *
+ *
* @return valid whether this component is 'valid'
*/
public final boolean isValid()
@@ -575,7 +572,7 @@
/**
* Gets whether this component is to be validated.
- *
+ *
* @return True if this component has one or more validators
*/
public final boolean isValidated()
@@ -587,9 +584,9 @@
* This method will retrieve the request parameter, validate it, and if
* valid update the model. These are the same steps as would be
performed by
* the form.
- *
+ *
* This is useful when a formcomponent is used outside a form.
- *
+ *
*/
public final void processInput()
{
@@ -609,7 +606,7 @@
/**
* The value will be made available to the validator property by means
of
* ${label}. It does not have any specific meaning to FormComponent
itself.
- *
+ *
* @param labelModel
* @return this for chaining
*/
@@ -624,10 +621,10 @@
* Sets the value for a form component this value will be split the
string
* with [EMAIL PROTECTED] FormComponent#VALUE_SEPARATOR} and calls
* setModelValue(String[]) with that.
- *
+ *
* @param value
* The value
- *
+ *
* @depricated call or override setModelValue(String[])
*/
public void setModelValue(final String value)
@@ -637,7 +634,7 @@
/**
* Sets the value for a form component.
- *
+ *
* @param value
* The value
*/
@@ -649,7 +646,7 @@
/**
* Sets whether this component is to be persisted.
- *
+ *
* @param persistent
* True if this component is to be persisted.
* @return this for chaining
@@ -670,7 +667,7 @@
/**
* Sets the required flag
- *
+ *
* @param required
* @return this for chaining
*/
@@ -692,7 +689,7 @@
/**
* Sets the type that will be used when updating the model for this
* component. If no type is specified String type is assumed.
- *
+ *
* @param type
* @return this for chaining
*/
@@ -708,11 +705,11 @@
* Updates this components' model from the request, it expect that the
* object is already converted through the convert() call. By default it
* just does this:
- *
+ *
* <pre>
* setModelObject(getConvertedInput());
* </pre>
- *
+ *
* DO NOT CALL THIS METHOD DIRECTLY UNLESS YOU ARE SURE WHAT YOU ARE
DOING.
* USUALLY UPDATING YOUR MODEL IS HANDLED BY THE FORM, NOT DIRECTLY BY
YOU.
*/
@@ -826,12 +823,12 @@
* Subclasses should overwrite this if the conversion is not done
through
* the type field and the IConverter. <strong>WARNING: this method may
be
* removed in future versions.</strong>
- *
+ *
* If conversion fails then a ConversionException should be thrown
- *
+ *
* @param value
* The value can be the getInput() or through a cookie
- *
+ *
* @return The converted value. default returns just the given value
* @throws ConversionException
* If input can't be converted
@@ -852,7 +849,7 @@
/**
* Gets the request parameter for this component as an int.
- *
+ *
* @return The value in the request for this component
*/
protected final int inputAsInt()
@@ -872,7 +869,7 @@
/**
* Gets the request parameter for this component as an int, using the
given
* default in case no corresponding request parameter was found.
- *
+ *
* @param defaultValue
* Default value to return if request does not have an
integer
* for this component
@@ -901,7 +898,7 @@
/**
* Gets the request parameters for this component as ints.
- *
+ *
* @return The values in the request for this component
*/
protected final int[] inputAsIntArray()
@@ -921,7 +918,7 @@
/**
* Gets the request parameters for this component as strings.
- *
+ *
* @return The values in the request for this component
* @deprecated Use [EMAIL PROTECTED] #getInputAsArray()} instead
*/
@@ -943,7 +940,7 @@
/**
* Processes the component tag.
- *
+ *
* @param tag
* Tag to modify
* @see wicket.Component#onComponentTag(ComponentTag)
@@ -965,7 +962,7 @@
* disabled. By default, this method will add a disabled="disabled"
* attribute to the tag. Components may override this method to tweak
the
* tag as they think is fit.
- *
+ *
* @param tag
* the tag that is being rendered
*/
@@ -1080,7 +1077,7 @@
/**
* Gets validator from validators Object (which may be an array of
* IValidators or a single instance, for efficiency) at the given index
- *
+ *
* @param index
* The index of the validator to get
* @return The validator
@@ -1118,7 +1115,7 @@
/**
* Adapter that makes this component appear as [EMAIL PROTECTED]
IValidatable}
- *
+ *
* @author ivaynberg
*/
private class ValidatableAdapter implements IValidatable
@@ -1150,7 +1147,7 @@
/**
* [EMAIL PROTECTED] IMessageSource} used for error messags against
this form
* components.
- *
+ *
* @author ivaynberg
*/
private class MessageSource implements IMessageSource
@@ -1201,7 +1198,7 @@
/**
* Creates a new params map that additionaly contains the
default input,
* name, label parameters
- *
+ *
* @param params
* original params map
* @return new params map
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
Thu Mar 22 04:46:10 2007
@@ -17,17 +17,16 @@
package wicket.model;
import wicket.Component;
-import wicket.markup.html.form.FormComponent;
import wicket.util.string.AppendingStringBuffer;
/**
* A simple compound model which uses the component's name as the property
* expression to retrieve properties on the nested model object.
- *
+ *
* @see wicket.model.IModel
* @see wicket.model.Model
* @see wicket.model.AbstractDetachableModel
- *
+ *
* @author Jonathan Locke
*/
public class CompoundPropertyModel implements IInheritableModel
@@ -35,10 +34,10 @@
private static final long serialVersionUID = 1L;
private Object target;
-
+
/**
* Constructor
- *
+ *
* @param model
* The model object, which may or may not implement IModel
*/
@@ -80,7 +79,7 @@
/**
* Returns the property expression that should be used against the
target
* object
- *
+ *
* @param component
* @return property expression that should be used against the target
object
*/
@@ -88,7 +87,7 @@
{
return component.getId();
}
-
+
/**
* @see
wicket.model.IInheritableModel#wrapOnInheritance(wicket.Component)
*/
@@ -100,7 +99,7 @@
/**
* Component aware variation of the [EMAIL PROTECTED]
CompoundPropertyModel} that
* components that inherit the model get
- *
+ *
* @author ivaynberg
*/
private class AttachedCompoundPropertyModel extends
AbstractPropertyModel
@@ -114,7 +113,7 @@
/**
* Constructor
- *
+ *
* @param owner
* component that this model has been attached to
*/
@@ -139,7 +138,7 @@
{
return CompoundPropertyModel.this;
}
-
+
/**
* @see
wicket.model.IInheritableModel#wrapOnInheritance(wicket.Component)
*/
@@ -168,7 +167,7 @@
sb.append(":nestedModel=[").append(target).append("]");
return sb.toString();
}
-
+
// TODO These methods are for helping people upgrade. Remove after
deprecation release.
/** @deprecated replace by [EMAIL PROTECTED] IModel#getObject()}. */
public final Object getObject(Component component) { throw new
UnsupportedOperationException(); }
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/protocol/http/MockHttpServletResponse.java
Thu Mar 22 04:46:10 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
@@ -114,7 +114,7 @@
/**
* Add the given header value, including an additional entry if one
already
* exists.
- *
+ *
* @param name
* The name for the header
* @param value
@@ -133,7 +133,7 @@
/**
* Add an int header value.
- *
+ *
* @param name
* The header name
* @param i
@@ -146,7 +146,7 @@
/**
* Check if the response contains the given header name.
- *
+ *
* @param name
* The name to check
* @return Whether header in response or not
@@ -159,7 +159,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
@@ -172,7 +172,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
@@ -185,7 +185,7 @@
/**
* Encode thr URL. Does no changes as this test implementation uses
cookie
* based url tracking.
- *
+ *
* @param url
* The url to encode
* @return The encoded url
@@ -198,7 +198,7 @@
/**
* Encode thr URL. Does no changes as this test implementation uses
cookie
* based url tracking.
- *
+ *
* @param url
* The url to encode
* @return The encoded url
@@ -210,7 +210,7 @@
/**
* Flush the buffer.
- *
+ *
* @throws IOException
*/
public void flushBuffer() throws IOException
@@ -219,7 +219,7 @@
/**
* Get the binary content that was written to the servlet stream.
- *
+ *
* @return The binary content
*/
public byte[] getBinaryContent()
@@ -229,7 +229,7 @@
/**
* Return the current buffer size
- *
+ *
* @return The buffer size
*/
public int getBufferSize()
@@ -250,7 +250,7 @@
/**
* Get the character encoding of the response.
- *
+ *
* @return The character encoding
*/
public String getCharacterEncoding()
@@ -260,7 +260,7 @@
/**
* Get the response code for this request.
- *
+ *
* @return The response code
*/
public int getCode()
@@ -270,7 +270,7 @@
/**
* Get all of the cookies that have been added to the response.
- *
+ *
* @return The collection of cookies
*/
public Collection getCookies()
@@ -280,7 +280,7 @@
/**
* Get the text document that was written as part of this response.
- *
+ *
* @return The document
*/
public String getDocument()
@@ -297,7 +297,7 @@
/**
* Get the error message.
- *
+ *
* @return The error message, or null if no message
*/
public String getErrorMessage()
@@ -307,7 +307,7 @@
/**
* Return the value of the given named header.
- *
+ *
* @param name
* The header name
* @return The value, or null
@@ -327,7 +327,7 @@
/**
* Get the names of all of the headers.
- *
+ *
* @return The header names
*/
public Set getHeaderNames()
@@ -337,7 +337,7 @@
/**
* Get the encoded locale
- *
+ *
* @return The locale
*/
public Locale getLocale()
@@ -347,7 +347,7 @@
/**
* Get the output stream for writing binary data from the servlet.
- *
+ *
* @return The binary output stream.
* @throws IOException
* If stream not available
@@ -364,7 +364,7 @@
/**
* Get the location that was redirected to.
- *
+ *
* @return The redirect location, or null if not a redirect
*/
public String getRedirectLocation()
@@ -374,7 +374,7 @@
/**
* Get the status code.
- *
+ *
* @return The status code
*/
public int getStatus()
@@ -384,7 +384,7 @@
/**
* Get the print writer for writing text output for this response.
- *
+ *
* @return The writer
* @throws IOException
* Not used
@@ -439,7 +439,7 @@
/**
* Always returns false.
- *
+ *
* @return Always false
*/
public boolean isCommitted()
@@ -449,7 +449,7 @@
/**
* Return whether the servlet returned an error code or not.
- *
+ *
* @return Whether an error occurred or not
*/
public boolean isError()
@@ -459,7 +459,7 @@
/**
* Check whether the response was redirected or not.
- *
+ *
* @return Whether the state was redirected or not
*/
public boolean isRedirect()
@@ -493,7 +493,7 @@
/**
* Send an error code. This implementation just sets the internal error
* state information.
- *
+ *
* @param code
* The code
* @throws IOException
@@ -508,7 +508,7 @@
/**
* Send an error code. This implementation just sets the internal error
* state information.
- *
+ *
* @param code
* The error code
* @param msg
@@ -526,7 +526,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
@@ -539,7 +539,7 @@
/**
* Method ignored.
- *
+ *
* @param size
* The size
*/
@@ -549,7 +549,7 @@
/**
* Set the character encoding.
- *
+ *
* @param characterEncoding
* The character encoding
*/
@@ -560,7 +560,7 @@
/**
* Set the content length.
- *
+ *
* @param length
* The length
*/
@@ -571,7 +571,7 @@
/**
* Set the content type.
- *
+ *
* @param type
* The content type
*/
@@ -582,7 +582,7 @@
/**
* Set a date header.
- *
+ *
* @param name
* The header name
* @param l
@@ -593,6 +593,10 @@
setHeader(name, formatDate(l));
}
+ /**
+ * @param l
+ * @return
+ */
public static String formatDate(long l) {
StringBuffer _dateBuffer = new StringBuffer(32);
Calendar _calendar = new
GregorianCalendar(TimeZone.getTimeZone("GMT"));
@@ -600,7 +604,7 @@
formatDate(_dateBuffer, _calendar, false);
return _dateBuffer.toString();
}
-
+
/* BEGIN: This code comes from Jetty 6.1.1 */
private static String[] DAYS =
{ "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
@@ -610,6 +614,9 @@
/**
* 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
*/
public static void formatDate(StringBuffer buf, Calendar calendar, boolean
cookie)
{
@@ -657,6 +664,10 @@
append2digits(buf, seconds);
buf.append(" GMT");
}
+ /**
+ * @param buf
+ * @param i
+ */
public static void append2digits(StringBuffer buf,int i)
{
if (i<100)
@@ -669,7 +680,7 @@
/**
* Set the given header value.
- *
+ *
* @param name
* The name for the header
* @param value
@@ -684,7 +695,7 @@
/**
* Set an int header value.
- *
+ *
* @param name
* The header name
* @param i
@@ -697,7 +708,7 @@
/**
* Set the locale in the response header.
- *
+ *
* @param locale
* The locale
*/
@@ -708,7 +719,7 @@
/**
* Set the status for this response.
- *
+ *
* @param status
* The status
*/
@@ -719,7 +730,7 @@
/**
* Set the status for this response.
- *
+ *
* @param status
* The status
* @param msg
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java
Thu Mar 22 04:46:10 2007
@@ -22,11 +22,11 @@
public class SqlDateConverter extends DateConverter {
private static final long serialVersionUID = 1L;
-
+
public Object convertToObject(String value, Locale locale) {
return new java.sql.Date(((Date)super.convertToObject(value,
locale)).getTime());
}
-
+
protected Class getTargetType() {
return java.sql.Date.class;
}
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/lang/PropertyResolver.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/lang/PropertyResolver.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/lang/PropertyResolver.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/lang/PropertyResolver.java
Thu Mar 22 04:46:10 2007
@@ -30,7 +30,6 @@
import wicket.WicketRuntimeException;
import wicket.util.concurrent.ConcurrentHashMap;
import wicket.util.convert.ConversionException;
-import wicket.util.convert.IConverter;
import wicket.util.string.Strings;
/**
@@ -54,7 +53,7 @@
* <p>
* Index or map properties can also be written as: "property[index]" or
* "property[key]" <p/>
- *
+ *
* @author jcompagner
*/
public final class PropertyResolver
@@ -68,7 +67,7 @@
* Looksup the value from the object with the given expression. If the
* expresion, the object itself or one property evalutes to null then a
null
* will be returned.
- *
+ *
* @param expression
* The expression string with the property to be lookup.
* @param object
@@ -97,10 +96,10 @@
* can't be evaluated then a WicketRuntimeException will be thrown. If a
* null object is encounted then it will try to generate it by calling
the
* default constructor and set it on the object.
- *
+ *
* The value will be tried to convert to the right type with the given
* converter.
- *
+ *
* @param expression
* The expression string with the property to be set.
* @param object
@@ -295,7 +294,7 @@
String
propertyIndex = exp.substring(index + 1);
try
{
-
+
int
parsedIndex = Integer.parseInt(propertyIndex);
// if
so then it could be a
//
getPropertyIndex(int)
@@ -304,7 +303,7 @@
+ propertyName.substring(1);
method
= clz.getMethod("get" + name, new Class[] { int.class });
getAndSetter = new ArrayPropertyGetSet(method, parsedIndex);
-
+
}
catch
(Exception e)
{
@@ -432,7 +431,7 @@
/**
* @author jcompagner
- *
+ *
*/
private final static class ObjectAndGetSetter
{
@@ -475,7 +474,7 @@
/**
* @param object
* The object where the value must be taken from.
- *
+ *
* @return The value of this property
*/
public Object getValue(final Object object);
@@ -483,7 +482,7 @@
/**
* @param object
* The object where the new value must be set on.
- *
+ *
* @return The new value for the property that is set back on
that
* object.
*/
@@ -942,7 +941,7 @@
/**
* Construct.
- *
+ *
* @param field
*/
public FieldGetAndSetter(Field field)
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/resource/FileResourceStream.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/resource/FileResourceStream.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/resource/FileResourceStream.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/resource/FileResourceStream.java
Thu Mar 22 04:46:10 2007
@@ -21,14 +21,12 @@
import java.io.IOException;
import java.io.InputStream;
-import wicket.protocol.http.WebResponse;
-import wicket.request.target.resource.ResourceStreamRequestTarget;
import wicket.util.file.File;
import wicket.util.time.Time;
/**
* A FileResourceStream is an IResource implementation for files.
- *
+ *
* @see wicket.util.resource.IResourceStream
* @see wicket.util.watch.IModifiable
* @author Jonathan Locke
@@ -45,7 +43,7 @@
/**
* Constructor.
- *
+ *
* @param file
* File containing resource
*/
@@ -56,7 +54,7 @@
/**
* Closes this resource.
- *
+ *
* @throws IOException
*/
public void close() throws IOException
@@ -89,7 +87,7 @@
* @return A readable input stream for this resource. The same input
stream
* is returned until <tt>FileResourceStream.close()</tt> is
* invoked.
- *
+ *
* @throws ResourceStreamNotFoundException
*/
public InputStream getInputStream() throws
ResourceStreamNotFoundException
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ajax/AjaxTimerBehaviorTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ajax/AjaxTimerBehaviorTest.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ajax/AjaxTimerBehaviorTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/ajax/AjaxTimerBehaviorTest.java
Thu Mar 22 04:46:10 2007
@@ -31,7 +31,6 @@
import wicket.markup.html.WebMarkupContainer;
import wicket.markup.html.basic.Label;
import wicket.protocol.http.WebRequestCycle;
-import wicket.util.string.Strings;
import wicket.util.tester.ITestPageSource;
import wicket.util.time.Duration;
@@ -39,7 +38,7 @@
* Tests that an AbstractAjaxTimerBehavior injects itself into the markup once
* and only once. Also tests the callback URL to make sure the timer reinjects
* itself
- *
+ *
* @author Jim McLaughlin
*/
public class AjaxTimerBehaviorTest extends WicketTestCase
@@ -48,7 +47,7 @@
/**
* Construct.
- *
+ *
* @param name
*/
public AjaxTimerBehaviorTest(String name)
@@ -132,9 +131,9 @@
/**
* Validates the reponse, then makes sure the timer injects itself again
* when called.
- *
+ *
* @param timer
- * @param inBodyOnLoad
+ * @param inBodyOnLoad
*/
private void validate(MyAjaxSelfUpdatingTimerBehavior timer, boolean
inBodyOnLoad)
{
@@ -143,11 +142,11 @@
String updateScript = timer.getUpdateScript();
String bodyOnLoadUpdateScript = "Wicket.Event.add(window,
\"load\", function() { " + updateScript + ";});";
- if (inBodyOnLoad)
+ if (inBodyOnLoad)
{
validateTimerScript(document, bodyOnLoadUpdateScript);
}
- else
+ else
{
validateTimerScript(document, updateScript);
}
@@ -167,7 +166,7 @@
/**
* Checks that the timer javascript is in the document once and only
once
- *
+ *
* @param document
* the response from the Application
* @param updateScript
@@ -215,7 +214,7 @@
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
private Duration duration;
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/basic/HomePageRedirectTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/basic/HomePageRedirectTest.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/basic/HomePageRedirectTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/basic/HomePageRedirectTest.java
Thu Mar 22 04:46:10 2007
@@ -17,7 +17,6 @@
package wicket.markup.html.basic;
import junit.framework.TestCase;
-import wicket.protocol.http.MockWebApplication;
import wicket.util.diff.DiffUtil;
import wicket.util.tester.WicketTester;
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/link/DownloadLinkTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/link/DownloadLinkTest.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/link/DownloadLinkTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/link/DownloadLinkTest.java
Thu Mar 22 04:46:10 2007
@@ -20,12 +20,11 @@
import org.apache.commons.logging.LogFactory;
import wicket.WicketTestCase;
-import wicket.protocol.http.MockHttpServletResponse;
import wicket.protocol.http.MockServletContext;
/**
* Tests DownloadLink
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Jean-Baptiste Quenot</a>
*/
public class DownloadLinkTest extends WicketTestCase
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java
Thu Mar 22 04:46:10 2007
@@ -22,7 +22,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import wicket.Component;
import wicket.RequestCycle;
import wicket.markup.html.WebPage;
import wicket.protocol.http.MockPage;
@@ -69,7 +68,7 @@
}
/**
- *
+ *
*
*/
public void testGetSimpleResource()
@@ -81,7 +80,7 @@
}
/**
- *
+ *
*
*/
public void testNullResourceKey()
@@ -98,7 +97,7 @@
}
/**
- *
+ *
*
*/
public void testGetSimpleResourceWithKeySubstitution()
@@ -113,7 +112,7 @@
}
/**
- *
+ *
*
*/
public void testGetPropertySubstitutedResource()
@@ -127,7 +126,7 @@
}
/**
- *
+ *
*
*/
public void testSubstitutionParametersResource()
@@ -152,7 +151,7 @@
}
/**
- *
+ *
*
*/
public void testUninitialisedLocalizer()
@@ -170,7 +169,7 @@
}
/**
- *
+ *
*/
public void testSetObject()
{
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/protocol/http/WebResponseTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/protocol/http/WebResponseTest.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/protocol/http/WebResponseTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/protocol/http/WebResponseTest.java
Thu Mar 22 04:46:10 2007
@@ -21,13 +21,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import wicket.ajax.AjaxEventBehavior;
-import wicket.ajax.markup.html.AjaxLink;
-import wicket.util.tester.WicketTester;
-
/**
- *
- *
+ *
+ *
* @author Frank Bille (billen)
*/
public class WebResponseTest extends TestCase
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategyTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategyTest.java?view=diff&rev=521226&r1=521225&r2=521226
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategyTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategyTest.java
Thu Mar 22 04:46:10 2007
@@ -16,11 +16,8 @@
*/
package wicket.request.target.coding;
-import javax.servlet.http.HttpServletResponse;
-
import junit.framework.TestCase;
import wicket.WicketRuntimeException;
-import wicket.protocol.http.request.WebRequestCodingStrategy;
import wicket.util.lang.PackageName;
import wicket.util.tester.WicketTester;
@@ -33,30 +30,36 @@
tester.getApplication().mount("/mount/point",
PackageName.forClass(TestPage.class));
tester.setupRequestAndResponse();
}
+
protected void tearDown() throws Exception
{
tester.destroy();
}
+
public void test1() {
tester.getServletRequest().setPath("/mount/XXXpoint");
assertNull(getRequestCodingStrategy());
}
+
public void test2() {
tester.getServletRequest().setPath("/mount/pointXXX");
assertNull(getRequestCodingStrategy());
}
+
public void test3() {
tester.getServletRequest().setPath("/mount/point");
IRequestTargetUrlCodingStrategy ucs =
getRequestCodingStrategy();
assertNotNull(ucs);
assertNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
}
+
public void test4() {
tester.getServletRequest().setPath("/mount/point/TestPage");
IRequestTargetUrlCodingStrategy ucs =
getRequestCodingStrategy();
assertNotNull(ucs);
assertNotNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
}
+
public void test5() {
tester.getServletRequest().setPath("/mount/point/nonexistent.TestPage");
IRequestTargetUrlCodingStrategy ucs =
getRequestCodingStrategy();
@@ -68,6 +71,7 @@
assertEquals("Unable to load class with name:
wicket.request.target.coding.nonexistent.TestPage", e.getMessage());
}
}
+
IRequestTargetUrlCodingStrategy getRequestCodingStrategy() {
String relativePath =
tester.getApplication().getWicketFilter().getRelativePath(tester.getServletRequest());
return
tester.getApplication().getRequestCycleProcessor().getRequestCodingStrategy().urlCodingStrategyForPath(relativePath);
