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 22:18:41 UTC
svn commit: r584893 [9/10] - in
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: ./ ajax/
ajax/form/ ajax/markup/html/navigation/paging/ application/ behavior/
feedback/ markup/ markup/html/ markup/html/body/ markup/html/border/
markup/htm...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IOUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IOUtils.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IOUtils.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/IOUtils.java Mon Oct 15 13:18:27 2007
@@ -60,7 +60,7 @@
* closing streams after use.
* <p>
* Origin of code: Apache Avalon (Excalibur)
- *
+ *
* @author Peter Donald
* @author Jeff Turner
* @author Matthew Hawthorne
@@ -70,7 +70,7 @@
*/
public final class IOUtils
{
- // NOTE: This class is focussed on InputStream, OutputStream, Reader and
+ // NOTE: This class is focused on InputStream, OutputStream, Reader and
// Writer. Each method should take at least one of these as a parameter.
// NOTE: This class should not depend on any other classes
@@ -92,7 +92,7 @@
* <p>
* Equivalent to {@link Reader#close()}, except any exceptions will be
* ignored. This is typically used in finally blocks.
- *
+ *
* @param input
* the Reader to close, may be null or already closed
*/
@@ -116,7 +116,7 @@
* <p>
* Equivalent to {@link Writer#close()}, except any exceptions will be
* ignored. This is typically used in finally blocks.
- *
+ *
* @param output
* the Writer to close, may be null or already closed
*/
@@ -140,7 +140,7 @@
* <p>
* Equivalent to {@link InputStream#close()}, except any exceptions will be
* ignored. This is typically used in finally blocks.
- *
+ *
* @param input
* the InputStream to close, may be null or already closed
*/
@@ -164,7 +164,7 @@
* <p>
* Equivalent to {@link OutputStream#close()}, except any exceptions will
* be ignored. This is typically used in finally blocks.
- *
+ *
* @param output
* the OutputStream to close, may be null or already closed
*/
@@ -191,7 +191,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
- *
+ *
* @param input
* the <code>InputStream</code> to read from
* @return the requested byte array
@@ -213,7 +213,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedReader</code>.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @return the requested byte array
@@ -238,7 +238,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedReader</code>.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @param encoding
@@ -265,7 +265,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
- *
+ *
* @param is
* the <code>InputStream</code> to read from
* @return the requested character array
@@ -290,7 +290,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
- *
+ *
* @param is
* the <code>InputStream</code> to read from
* @param encoding
@@ -313,7 +313,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedReader</code>.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @return the requested character array
@@ -337,7 +337,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
- *
+ *
* @param input
* the <code>InputStream</code> to read from
* @return the requested String
@@ -362,7 +362,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
- *
+ *
* @param input
* the <code>InputStream</code> to read from
* @param encoding
@@ -385,7 +385,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedReader</code>.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @return the requested String
@@ -405,7 +405,7 @@
// -----------------------------------------------------------------------
/**
* Writes bytes from a <code>byte[]</code> to an <code>OutputStream</code>.
- *
+ *
* @param data
* the byte array to write, do not modify during output, null
* ignored
@@ -431,7 +431,7 @@
* platform.
* <p>
* This method uses {@link String#String(byte[])}.
- *
+ *
* @param data
* the byte array to write, do not modify during output, null
* ignored
@@ -459,7 +459,7 @@
* href="http://www.iana.org/assignments/character-sets">IANA</a>.
* <p>
* This method uses {@link String#String(byte[], String)}.
- *
+ *
* @param data
* the byte array to write, do not modify during output, null
* ignored
@@ -493,7 +493,7 @@
/**
* Writes chars from a <code>char[]</code> to a <code>Writer</code>
* using the default character encoding of the platform.
- *
+ *
* @param data
* the char array to write, do not modify during output, null
* ignored
@@ -519,7 +519,7 @@
* <p>
* This method uses {@link String#String(char[])} and
* {@link String#getBytes()}.
- *
+ *
* @param data
* the char array to write, do not modify during output, null
* ignored
@@ -548,7 +548,7 @@
* <p>
* This method uses {@link String#String(char[])} and
* {@link String#getBytes(String)}.
- *
+ *
* @param data
* the char array to write, do not modify during output, null
* ignored
@@ -581,7 +581,7 @@
// -----------------------------------------------------------------------
/**
* Writes chars from a <code>String</code> to a <code>Writer</code>.
- *
+ *
* @param data
* the <code>String</code> to write, null ignored
* @param output
@@ -606,7 +606,7 @@
* platform.
* <p>
* This method uses {@link String#getBytes()}.
- *
+ *
* @param data
* the <code>String</code> to write, null ignored
* @param output
@@ -633,7 +633,7 @@
* href="http://www.iana.org/assignments/character-sets">IANA</a>.
* <p>
* This method uses {@link String#getBytes(String)}.
- *
+ *
* @param data
* the <code>String</code> to write, null ignored
* @param output
@@ -666,7 +666,7 @@
/**
* Writes chars from a <code>AppendingStringBuffer</code> to a
* <code>Writer</code>.
- *
+ *
* @param data
* the <code>AppendingStringBuffer</code> to write, null
* ignored
@@ -692,7 +692,7 @@
* platform.
* <p>
* This method uses {@link String#getBytes()}.
- *
+ *
* @param data
* the <code>AppendingStringBuffer</code> to write, null
* ignored
@@ -720,7 +720,7 @@
* href="http://www.iana.org/assignments/character-sets">IANA</a>.
* <p>
* This method uses {@link String#getBytes(String)}.
- *
+ *
* @param data
* the <code>AppendingStringBuffer</code> to write, null
* ignored
@@ -758,7 +758,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedInputStream</code>.
- *
+ *
* @param input
* the <code>InputStream</code> to read from
* @param output
@@ -792,7 +792,7 @@
* <code>BufferedInputStream</code>.
* <p>
* This method uses {@link InputStreamReader}.
- *
+ *
* @param input
* the <code>InputStream</code> to read from
* @param output
@@ -820,7 +820,7 @@
* href="http://www.iana.org/assignments/character-sets">IANA</a>.
* <p>
* This method uses {@link InputStreamReader}.
- *
+ *
* @param input
* the <code>InputStream</code> to read from
* @param output
@@ -853,7 +853,7 @@
* <p>
* This method buffers the input internally, so there is no need to use a
* <code>BufferedReader</code>.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @param output
@@ -890,7 +890,7 @@
* flush.
* <p>
* This method uses {@link OutputStreamWriter}.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @param output
@@ -923,7 +923,7 @@
* flush.
* <p>
* This method uses {@link OutputStreamWriter}.
- *
+ *
* @param input
* the <code>Reader</code> to read from
* @param output
@@ -958,7 +958,7 @@
* <p>
* This method buffers the input internally using
* <code>BufferedInputStream</code> if they are not already buffered.
- *
+ *
* @param input1
* the first stream
* @param input2
@@ -1002,7 +1002,7 @@
* <p>
* This method buffers the input internally using
* <code>BufferedReader</code> if they are not already buffered.
- *
+ *
* @param input1
* the first reader
* @param input2
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java Mon Oct 15 13:18:27 2007
@@ -52,14 +52,14 @@
* <p>
* As this class depends heavily on JDK's serialization internals using
* introspection, analyzing may not be possible, for instance when the runtime
- * environment does not have sufficient rights to set fields accesible that
+ * environment does not have sufficient rights to set fields accessible that
* would otherwise be hidden. You should call
* {@link SerializableChecker#isAvailable()} to see whether this class can
* operate properly. If it doesn't, you should fall back to e.g. re-throwing/
* printing the {@link NotSerializableException} you probably got before using
* this class.
* </p>
- *
+ *
* @author eelcohillenius
* @author Al Maw
*/
@@ -270,7 +270,7 @@
* will just return and you are advised to rely on the
* {@link NotSerializableException}. Clients are advised to call this
* method prior to calling the check method.
- *
+ *
* @return whether security settings and underlying API etc allow for
* accessing the serialization API using introspection
*/
@@ -305,11 +305,11 @@
/**
* Construct.
- *
+ *
* @param exception
* exception that should be set as the cause when throwing a new
* exception
- *
+ *
* @throws IOException
*/
public SerializableChecker(NotSerializableException exception) throws IOException
@@ -584,7 +584,7 @@
|| objVals[i] instanceof Date || objVals[i] instanceof Boolean
|| objVals[i] instanceof Class)
{
- // fitler out common cases
+ // filter out common cases
continue;
}
@@ -618,7 +618,7 @@
}
/**
- * @return name from root to current node concatted with slashes
+ * @return name from root to current node concatenated with slashes
*/
private StringBuffer currentPath()
{
@@ -635,8 +635,8 @@
}
/**
- * Dump with identation.
- *
+ * Dump with indentation.
+ *
* @param type
* the type that couldn't be serialized
* @return A very pretty dump
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/XmlReader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/XmlReader.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/XmlReader.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/XmlReader.java Mon Oct 15 13:18:27 2007
@@ -31,7 +31,7 @@
* This is a simple XmlReader. Its only purpose is to read the xml decl string
* from the input and apply proper character encoding to all subsequent
* characters. The xml decl string itself is removed from the output.
- *
+ *
* @author Juergen Donnerstag
*/
public final class XmlReader extends Reader
@@ -57,7 +57,7 @@
/**
* Construct.
- *
+ *
* @param inputStream
* The InputStream to read the xml data from
* @param defaultEncoding
@@ -72,7 +72,7 @@
super();
this.inputStream = inputStream;
- this.encoding = defaultEncoding;
+ encoding = defaultEncoding;
if (inputStream == null)
{
@@ -84,7 +84,7 @@
/**
* Return the encoding used while reading the markup file.
- *
+ *
* @return if null, then JVM default
*/
public String getEncoding()
@@ -94,22 +94,22 @@
/**
* Return the XML declaration string, in case if found in the markup.
- *
+ *
* @return Null, if not found.
*/
public String getXmlDeclaration()
{
- return this.xmlDeclarationString;
+ return xmlDeclarationString;
}
/**
* Reads and parses markup from a resource such as file.
- *
+ *
* @throws IOException
*/
public void init() throws IOException
{
- if (!this.inputStream.markSupported())
+ if (!inputStream.markSupported())
{
throw new IOException("The InputStream must support mark/reset");
}
@@ -117,35 +117,35 @@
// read ahead buffer required for the first line of the markup
// (encoding)
final int readAheadSize = 80;
- this.inputStream.mark(readAheadSize);
+ inputStream.mark(readAheadSize);
- // read-ahead the input stream and check if it starts with <?xml..?>.
- if (getXmlDeclaration(this.inputStream, readAheadSize))
+ // read-ahead the input stream and check if it starts with <?xml..?>.
+ if (getXmlDeclaration(inputStream, readAheadSize))
{
// If yes than determine the encoding from the xml decl
- this.encoding = determineEncoding(this.xmlDeclarationString);
+ encoding = determineEncoding(xmlDeclarationString);
}
else
{
- // If not, reset the input stream to the begining of the file
- this.inputStream.reset();
+ // If not, reset the input stream to the beginning of the file
+ inputStream.reset();
}
-
- if (this.encoding == null)
+
+ if (encoding == null)
{
// Use JVM default
- this.reader = new BufferedReader(new InputStreamReader(this.inputStream));
+ reader = new BufferedReader(new InputStreamReader(inputStream));
}
else
{
// Use the encoding provided
- this.reader = new BufferedReader(new InputStreamReader(this.inputStream, this.encoding));
+ reader = new BufferedReader(new InputStreamReader(inputStream, encoding));
}
}
/**
* Determine the encoding from the xml decl.
- *
+ *
* @param string The xmlDecl string
* @return The encoding. Null, if not found
*/
@@ -177,10 +177,10 @@
/**
* Read-ahead the input stream (markup file). If the first line contains
* <?xml...?>, than remember the xml decl for later to determine the
- * encoding.
+ * encoding.
* <p>
* The xml decl will not be forwarded to the user.
- *
+ *
* @param in
* The markup file
* @param readAheadSize
@@ -219,7 +219,7 @@
}
// Save the whole <?xml ..> string for later
- this.xmlDeclarationString = pushBack.toString().trim();
+ xmlDeclarationString = pushBack.toString().trim();
return true;
}
@@ -228,8 +228,8 @@
*/
public void close() throws IOException
{
- this.reader.close();
- this.inputStream.close();
+ reader.close();
+ inputStream.close();
}
/**
@@ -237,7 +237,7 @@
*/
public int read(char[] buf, int from, int to) throws IOException
{
- return this.reader.read(buf, from, to);
+ return reader.read(buf, from, to);
}
/**
@@ -245,6 +245,6 @@
*/
public String toString()
{
- return this.inputStream.toString() + " (" + this.encoding + ")";
+ return inputStream.toString() + " (" + encoding + ")";
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Mon Oct 15 13:18:27 2007
@@ -44,7 +44,7 @@
/**
* Object utilities.
- *
+ *
* @author Jonathan Locke
*/
public final class Objects
@@ -58,7 +58,7 @@
/**
* Computes the size of an object. This typically is an estimation, not
* an absolute accurate size.
- *
+ *
* @param object
* Object to compute size of
* @return The size of the object in bytes.
@@ -114,9 +114,9 @@
enableResolveObject(true);
}
- // This overide is required to resolve classess inside in different
+ // This override is required to resolve classes inside in different
// bundle, i.e.
- // The classess can be resolved by OSGI classresolver implementation
+ // The classes can be resolved by OSGI classresolver implementation
protected Class resolveClass(ObjectStreamClass desc) throws IOException,
ClassNotFoundException
{
@@ -272,7 +272,7 @@
/**
* Evaluates the given object as a BigDecimal.
- *
+ *
* @param value
* an object to interpret as a BigDecimal
* @return the BigDecimal value implied by the given object
@@ -311,7 +311,7 @@
/**
* Evaluates the given object as a BigInteger.
- *
+ *
* @param value
* an object to interpret as a BigInteger
* @return the BigInteger value implied by the given object
@@ -352,7 +352,7 @@
* Evaluates the given object as a boolean: if it is a Boolean object, it's
* easy; if it's a Number or a Character, returns true for non-zero objects;
* and otherwise returns true for non-null objects.
- *
+ *
* @param value
* an object to interpret as a boolean
* @return the boolean value implied by the given object
@@ -381,7 +381,7 @@
/**
* De-serializes an object from a byte array.
- *
+ *
* @param data
* The serialized object
* @return The object
@@ -417,7 +417,7 @@
* object must be fully serializable to be cloned. This method will not
* clone wicket Components, it will just reuse those instances so that the
* complete component tree is not copied over only the model data.
- *
+ *
* @param object
* The object to clone
* @return A deep copy of the object
@@ -455,7 +455,7 @@
* Makes a deep clone of an object by serializing and deserializing it. The
* object must be fully serializable to be cloned. No extra debug info is
* gathered.
- *
+ *
* @param object
* The object to clone
* @return A deep copy of the object
@@ -477,8 +477,8 @@
ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(out
.toByteArray()))
{
- // This overide is required to resolve classess inside in different bundle, i.e.
- // The classess can be resolved by OSGI classresolver implementation
+ // This override is required to resolve classes inside in different bundle, i.e.
+ // The classes can be resolved by OSGI classresolver implementation
protected Class resolveClass(ObjectStreamClass desc) throws IOException,
ClassNotFoundException
{
@@ -541,16 +541,16 @@
* compared with Comparable.compareTo(). If both values are non-numeric and
* not Comparable or of incompatible classes this will throw and
* IllegalArgumentException.
- *
+ *
* @param v1
* First value to compare
* @param v2
* second value to compare
- *
+ *
* @return integer describing the comparison between the two objects. A
* negative number indicates that v1 < v2. Positive indicates that
* v1 > v2. Zero indicates v1 == v2.
- *
+ *
* @throws IllegalArgumentException
* if the objects are both non-numeric yet of incompatible types
* or do not implement Comparable.
@@ -613,10 +613,10 @@
/**
* Returns the value converted numerically to the given class type
- *
+ *
* This method also detects when arrays are being converted and converts the
* components of one array to the type of the other.
- *
+ *
* @param value
* an object to be converted to the given type
* @param toType
@@ -701,7 +701,7 @@
/**
* Evaluates the given object as a double-precision floating-point number.
- *
+ *
* @param value
* an object to interpret as a double
* @return the double value implied by the given object
@@ -734,7 +734,7 @@
/**
* Returns true if a and b are equal. Either object may be null.
- *
+ *
* @param a
* Object a
* @param b
@@ -761,7 +761,7 @@
* Returns the constant from the NumericTypes interface that best expresses
* the type of an operation, which can be either numeric or not, on the two
* given types.
- *
+ *
* @param t1
* type of one argument to an operator
* @param t2
@@ -828,7 +828,7 @@
/**
* Returns a constant from the NumericTypes interface that represents the
* numeric type of the given object.
- *
+ *
* @param value
* an object that needs to be interpreted as a number
* @return the appropriate constant from the NumericTypes interface
@@ -885,7 +885,7 @@
/**
* Returns the constant from the NumericTypes interface that best expresses
* the type of a numeric operation on the two given objects.
- *
+ *
* @param v1
* one argument to a numeric operator
* @param v2
@@ -901,7 +901,7 @@
* Returns the constant from the NumericTypes interface that best expresses
* the type of an operation, which can be either numeric or not, on the two
* given objects.
- *
+ *
* @param v1
* one argument to an operator
* @param v2
@@ -919,12 +919,12 @@
* Returns true if object1 is equal to object2 in either the sense that they
* are the same object or, if both are non-null if they are equal in the
* <CODE>equals()</CODE> sense.
- *
+ *
* @param object1
* First object to compare
* @param object2
* Second object to compare
- *
+ *
* @return true if v1 == v2
*/
public static boolean isEqual(Object object1, Object object2)
@@ -967,7 +967,7 @@
/**
* Evaluates the given object as a long integer.
- *
+ *
* @param value
* an object to interpret as a long integer
* @return the long integer value implied by the given object
@@ -999,7 +999,7 @@
/**
* Creates a new instance using the current application's class resolver.
* Returns null if className is null.
- *
+ *
* @param className
* The full class name
* @return The new object instance
@@ -1036,7 +1036,7 @@
* Returns a new Number object of an appropriate type to hold the given
* integer value. The type of the returned object is consistent with the
* given type argument, which is a constant from the NumericTypes interface.
- *
+ *
* @param type
* the nominal numeric type of the result, a constant from the
* NumericTypes interface
@@ -1082,7 +1082,7 @@
/**
* Serializes an object into a byte array.
- *
+ *
* @param object
* The object
* @return The serialized object
@@ -1112,7 +1112,7 @@
/**
* Sets the strategy for determining the sizes of objects.
- *
+ *
* @param objectSizeOfStrategy
* the strategy. Pass null to reset to the default.
*/
@@ -1132,7 +1132,7 @@
/**
* Configure this utility class to use the provided
* {@link IObjectStreamFactory} instance.
- *
+ *
* @param objectStreamFactory
* The factory instance to use. If you pass in null, the
* {@link DefaultObjectStreamFactory default} will be set
@@ -1154,7 +1154,7 @@
/**
* Computes the size of an object. Note that this is an estimation, never an
* absolute accurate size.
- *
+ *
* @param object
* Object to compute size of
* @return The size of the object in bytes
@@ -1166,7 +1166,7 @@
/**
* Evaluates the given object as a String.
- *
+ *
* @param value
* an object to interpret as a String
* @return the String value implied by the given object as returned by the
@@ -1180,7 +1180,7 @@
/**
* returns hashcode of the objects by calling obj.hashcode(). safe to use
* when obj is null.
- *
+ *
* @param obj
* @return hashcode of the object or 0 if obj is null
*/
@@ -1202,7 +1202,7 @@
/**
* Evaluates the given object as a String and trims it if the trim flag is
* true.
- *
+ *
* @param value
* an object to interpret as a String
* @param trim
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java Mon Oct 15 13:18:27 2007
@@ -46,11 +46,11 @@
* <p>
* "property.index": If the property is a List or Array then the second property can be a index on
* that list like: 'mylist.0' this expression will also map on a getProperty(index) or
- * setProperty(index,value) methods. If the object is a List then the list will grow automaticaly if
+ * setProperty(index,value) methods. If the object is a List then the list will grow automatically if
* the index is greater then the size <p/>
* <p>
* Index or map properties can also be written as: "property[index]" or "property[key]" <p/>
- *
+ *
* @author jcompagner
*/
public final class PropertyResolver
@@ -65,14 +65,14 @@
private static final Logger log = LoggerFactory.getLogger(PropertyResolver.class);
/**
- * Looks up 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.
- *
+ * Looks up the value from the object with the given expression. If the expression, the object
+ * itself or one property evaluates to null then a null will be returned.
+ *
* @param expression
* The expression string with the property to be lookup.
* @param object
* The object which is evaluated.
- * @return The value that is evaluted. Null something in the expression evaluted to null.
+ * @return The value that is evaluated. Null something in the expression evaluated to null.
*/
public final static Object getValue(final String expression, final Object object)
{
@@ -92,11 +92,11 @@
/**
* Set the value on the object with the given expression. If the expression can't be evaluated
- * then a WicketRuntimeException will be thrown. If a null object is encounted then it will try
+ * then a WicketRuntimeException will be thrown. If a null object is encountered 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
@@ -319,7 +319,7 @@
}
catch (NumberFormatException ex)
{
- // can't parse the exp als a index maybe the exp was a
+ // can't parse the exp as an index, maybe the exp was a
// method.
method = findMethod(clz, exp);
if (method != null)
@@ -527,7 +527,7 @@
/**
* @author jcompagner
- *
+ *
*/
private final static class ObjectAndGetSetter
{
@@ -602,7 +602,7 @@
/**
* @param object
* The object where the value must be taken from.
- *
+ *
* @return The value of this property
*/
public Object getValue(final Object object);
@@ -615,7 +615,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.
*/
public Object newValue(Object object);
@@ -1176,7 +1176,7 @@
/**
* Construct.
- *
+ *
* @param field
*/
public FieldGetAndSetter(Field field)
@@ -1277,7 +1277,7 @@
/**
* Clean up cache for this app.
- *
+ *
* @param application
*/
public static void destroy(Application application)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/MetaPattern.java Mon Oct 15 13:18:27 2007
@@ -27,7 +27,7 @@
/**
* Useful class for constructing readable and reusable regular expressions.
* <p>
- * MetaPatterns can be contructed from a simple regular expression String, from
+ * MetaPatterns can be constructed from a simple regular expression String, from
* other MetaPatterns (copy constructor), from a list of MetaPatterns or from an
* array of MetaPatterns. In this way, it is easy to build up larger patterns
* while transparently binding the capturing groups of each MetaPattern for easy
@@ -40,7 +40,7 @@
* A variety of static constants are provided for use in constructing compound
* MetaPatterns. Also, a number of simple parsers have been constructed using
* MetaPatterns in the parsers subpackage.
- *
+ *
* @author Jonathan Locke
*/
public class MetaPattern implements IClusterable
@@ -214,7 +214,7 @@
/**
* Constructor for a simple pattern.
- *
+ *
* @param pattern
* The regular expression pattern to compile
*/
@@ -225,20 +225,20 @@
/**
* Copy constructor.
- *
+ *
* @param pattern
* The meta pattern to copy
*/
public MetaPattern(final MetaPattern pattern)
{
this.pattern = pattern.pattern;
- this.patterns = pattern.patterns;
- this.compiledPattern = pattern.compiledPattern;
+ patterns = pattern.patterns;
+ compiledPattern = pattern.compiledPattern;
}
/**
* Constructs from an array of MetaPatterns.
- *
+ *
* @param patterns
* Array of MetaPatterns
*/
@@ -249,7 +249,7 @@
/**
* Constructs from a list of MetaPatterns
- *
+ *
* @param patterns
* List of MetaPatterns
*/
@@ -260,7 +260,7 @@
/**
* Creates a matcher against a given input character sequence.
- *
+ *
* @param input
* The input to match against
* @return The matcher
@@ -275,7 +275,7 @@
* method with a given regexp compile flag value, the pattern will be
* compiled. Calling it again with a different value for flags will not
* recompile the pattern.
- *
+ *
* @param input
* The input to match
* @param flags
@@ -291,7 +291,7 @@
/**
* Gets the regular expression Pattern for this MetaPattern by compiling it.
- *
+ *
* @return Pattern compiled with default Java regular expression compile
* flags
*/
@@ -303,7 +303,7 @@
/**
* Gets the regular expression Pattern for this MetaPattern by compiling it
* using the given flags.
- *
+ *
* @param flags
* One or more of the standard Java regular expression compile
* flags (see {@link Pattern#compile(String, int)})
@@ -318,7 +318,7 @@
/**
* Converts this MetaPattern to a String.
- *
+ *
* @return A String representing this MetaPattern
* @see java.lang.Object#toString()
*/
@@ -341,7 +341,7 @@
/**
* Compiles this MetaPattern with the given Java regular expression flags.
- *
+ *
* @param flags
* One or more of the standard Java regular expression compile
* flags (see {@link Pattern#compile(String, int)})
@@ -358,7 +358,7 @@
/**
* Binds this MetaPattern to one or more capturing groups. Since
* MetaPatterns can nest, the binding process can recurse.
- *
+ *
* @param group
* The initial capturing group number
* @return The final capturing group (for use in recursion)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/CommaSeparatedVariableParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/CommaSeparatedVariableParser.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/CommaSeparatedVariableParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/CommaSeparatedVariableParser.java Mon Oct 15 13:18:27 2007
@@ -24,13 +24,13 @@
* Notes:
* <p>
* <ul>
- * <li>It'll not trim the elements (it'll not remove whitespaces)</li>
+ * <li>It'll not trim the elements (it'll not remove whitespace)</li>
* <li>It is able to handle quotes like "a", 'b', "b,c" etc..</li>
* <li>But no escapes like "c\"d"</li>
* <li>Empty list elements like "a,," are not supported. It'll return the "a"
* only.</li>
- * </lu>
- *
+ * </ul>
+ *
* @author Jonathan Locke
*/
public final class CommaSeparatedVariableParser extends ListParser
@@ -42,7 +42,7 @@
/**
* Construct a new parser with parameter 'input' to be parsed. Base classes
* provide the method to access the elements of the input parsed.
- *
+ *
* @param input
* to parse
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/TagNameParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/TagNameParser.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/TagNameParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/TagNameParser.java Mon Oct 15 13:18:27 2007
@@ -25,7 +25,7 @@
* namespaces like "namespace:name" or "name". Both ":name" and "namespace:" are
* not allowed. Both, the namespace and the name have to follow naming rules for
* variable names (identifier).
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
@@ -44,7 +44,7 @@
/**
* Constructs a tag name parser for a given input character sequence.
- *
+ *
* @param input
* The input to parse
*/
@@ -56,8 +56,8 @@
/**
* Get the namespace part (eg 'html' in 'html:form') converted to all lower
* case characters.
- *
- * @return the namespace part. Will be null, if optonal namespace was not
+ *
+ * @return the namespace part. Will be null, if optional namespace was not
* found
*/
public String getNamespace()
@@ -72,7 +72,7 @@
/**
* Gets the tag name part (eg 'form' in 'html:form' or 'form')
- *
+ *
* @return the name part
*/
public String getName()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/WordParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/WordParser.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/WordParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/WordParser.java Mon Oct 15 13:18:27 2007
@@ -23,7 +23,7 @@
* Matches a 'word' surrounded by whitespace. See <a
* href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html">java.util.regex.Pattern
* </a> for more details on what 'word' means.
- *
+ *
* @author Jonathan Locke
*/
public final class WordParser extends MetaPatternParser
@@ -40,7 +40,7 @@
/**
* Construct.
- *
+ *
* @param input
* to parse
*/
@@ -50,8 +50,8 @@
}
/**
- * Gets the word including the optional whitespaces surrounding the word.
- *
+ * Gets the word including the optional whitespace surrounding the word.
+ *
* @return the word surrounded by whitespace
*/
public String getWord()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/OsgiResourceStreamLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/OsgiResourceStreamLocator.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/OsgiResourceStreamLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/OsgiResourceStreamLocator.java Mon Oct 15 13:18:27 2007
@@ -21,8 +21,8 @@
/**
* OSGI specific resource stream factory
- *
- * @author Juergen Donnerstah
+ *
+ * @author Juergen Donnerstag
*/
public class OsgiResourceStreamLocator extends ResourceStreamLocator
{
@@ -35,7 +35,7 @@
/**
* Construct.
- *
+ *
* @param finder
*/
public OsgiResourceStreamLocator(final IResourceFinder finder)
@@ -44,7 +44,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class, java.lang.String)
*/
public IResourceStream locate(final Class clazz, final String path)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/CssUtils.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/CssUtils.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/CssUtils.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/CssUtils.java Mon Oct 15 13:18:27 2007
@@ -18,7 +18,7 @@
/**
* Utility methods for CSS.
- *
+ *
* @author eelcohillenius
*/
public final class CssUtils
@@ -30,7 +30,7 @@
public final static String INLINE_CLOSE_TAG = "--></style>\n";
/**
- * Hiden constructor.
+ * Hidden constructor.
*/
private CssUtils()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/JavascriptStripper.java Mon Oct 15 13:18:27 2007
@@ -19,7 +19,7 @@
/**
* Strips comments and whitespace from javascript
- *
+ *
* @author Matej Knopp
*/
public class JavascriptStripper
@@ -67,11 +67,11 @@
}
/**
- * Removes javascript comments and whitespaces from specified string.
- *
+ * Removes javascript comments and whitespace from specified string.
+ *
* @param original
* Source string
- * @return String with removed comments and whitespaces
+ * @return String with removed comments and whitespace
*/
public static String stripCommentsAndWhitespace(String original)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/PrependingStringBuffer.java Mon Oct 15 13:18:27 2007
@@ -19,7 +19,7 @@
/**
* This is a prepending stringbuffer optimized for constantly prepending strings
* to the front of the buffer.
- *
+ *
* @author jcompagner
*/
public class PrependingStringBuffer
@@ -39,21 +39,21 @@
/**
* Constructs this PrependingStringBuffer with the given buffer size.
- *
+ *
* @param size
* The initial size of the buffer.
*/
public PrependingStringBuffer(int size)
{
- this.buffer = new char[size];
- this.position = size;
+ buffer = new char[size];
+ position = size;
this.size = 0;
}
/**
* Constructs and direct inserts the given string. The buffer size will be
* string.length+16
- *
+ *
* @param start
* The string that is directly inserted.
*/
@@ -65,7 +65,7 @@
/**
* Prepends one char to this PrependingStringBuffer
- *
+ *
* @param ch
* The char that will be prepended
* @return this
@@ -85,7 +85,7 @@
/**
* Prepends the string to this PrependingStringBuffer
- *
+ *
* @param str
* The string that will be prepended
* @return this
@@ -122,8 +122,8 @@
}
/**
- * Retuns the size of this PrependingStringBuffer
- *
+ * Returns the size of this PrependingStringBuffer
+ *
* @return The size
*/
public int length()
@@ -138,7 +138,7 @@
{
return new String(buffer, position, size);
}
-
+
public boolean equals(Object obj)
{
return toString().equals(obj);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/StringValue.java Mon Oct 15 13:18:27 2007
@@ -40,7 +40,7 @@
* <P>
* The beforeFirst(), afterFirst(), beforeLast() and afterLast() methods are handy for parsing
* things like paths and filenames.
- *
+ *
* @author Jonathan Locke
*/
public class StringValue implements IClusterable
@@ -93,7 +93,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param value
* Double precision value
* @return String value formatted with one place after decimal
@@ -105,7 +105,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param value
* Double precision value
* @param places
@@ -130,7 +130,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param value
* Double precision value
* @param locale
@@ -144,7 +144,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param object
* An object
* @return String value for object
@@ -156,7 +156,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param object
* An object
* @param locale
@@ -170,7 +170,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param string
* A string
* @return String value for string
@@ -182,7 +182,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param string
* A string
* @param locale
@@ -196,7 +196,7 @@
/**
* Converts the given input to an instance of StringValue.
- *
+ *
* @param buffer
* A string buffer
* @return String value
@@ -208,7 +208,7 @@
/**
* Private constructor to force use of static factory methods.
- *
+ *
* @param text
* The text for this string value
*/
@@ -220,7 +220,7 @@
/**
* Private constructor to force use of static factory methods.
- *
+ *
* @param text
* The text for this string value
* @param locale
@@ -233,8 +233,8 @@
}
/**
- * Gets the substring after the first occurence given char.
- *
+ * Gets the substring after the first occurrence given char.
+ *
* @param c
* char to scan for
* @return the substring
@@ -245,8 +245,8 @@
}
/**
- * Gets the substring after the last occurence given char.
- *
+ * Gets the substring after the last occurrence given char.
+ *
* @param c
* char to scan for
* @return the substring
@@ -257,8 +257,8 @@
}
/**
- * Gets the substring before the first occurence given char.
- *
+ * Gets the substring before the first occurrence given char.
+ *
* @param c
* char to scan for
* @return the substring
@@ -269,8 +269,8 @@
}
/**
- * Gets the substring before the last occurence given char.
- *
+ * Gets the substring before the last occurrence given char.
+ *
* @param c
* char to scan for
* @return the substring
@@ -282,7 +282,7 @@
/**
* Replaces on this text.
- *
+ *
* @param searchFor
* What to search for
* @param replaceWith
@@ -297,7 +297,7 @@
/**
* Converts this StringValue to a given type.
- *
+ *
* @param type
* The type to convert to
* @return The converted value
@@ -351,7 +351,7 @@
/**
* Convert this text to a boolean.
- *
+ *
* @return This string value as a boolean
* @throws StringValueConversionException
*/
@@ -362,7 +362,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -376,7 +376,7 @@
/**
* Convert this text to a boolean.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -387,7 +387,7 @@
/**
* Convert this text to a char.
- *
+ *
* @return This string value as a character
* @throws StringValueConversionException
*/
@@ -398,7 +398,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -411,7 +411,7 @@
/**
* Convert this text to a Character.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -422,7 +422,7 @@
/**
* Convert this text to a double.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -441,7 +441,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -454,7 +454,7 @@
/**
* Convert this text to a Double.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -465,7 +465,7 @@
/**
* Convert this text to a Duration instance.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -476,7 +476,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -490,7 +490,7 @@
/**
* Convert this text to an int.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -509,7 +509,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -522,7 +522,7 @@
/**
* Convert this text to an Integer.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -541,7 +541,7 @@
/**
* Convert this text to a long.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -560,7 +560,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -573,7 +573,7 @@
/**
* Convert this text to a Long.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -592,7 +592,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -603,7 +603,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -614,7 +614,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -625,7 +625,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -636,7 +636,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -647,7 +647,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -658,7 +658,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
*/
public final String toOptionalString()
@@ -668,7 +668,7 @@
/**
* Convert to object types, returning null if text is null.
- *
+ *
* @return converted
* @throws StringValueConversionException
*/
@@ -687,7 +687,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
@@ -699,7 +699,7 @@
/**
* Convert this text to a time instance.
- *
+ *
* @return Converted text
* @throws StringValueConversionException
*/
@@ -718,7 +718,7 @@
/**
* Convert to primitive types, returning default value if text is null.
- *
+ *
* @param defaultValue
* the default value to return of text is null
* @return the converted text as a primitive or the default if text is null
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java Mon Oct 15 13:18:27 2007
@@ -47,13 +47,13 @@
* another (replaceAll), do type conversions (toBoolean(), toChar(),
* toString()), check a String for emptiness (isEmpty()), convert a Throwable to
* a String (toString(Throwable)) or capitalize a String (capitalize()).
- *
+ *
* @author Jonathan Locke
*/
public final class Strings
{
/**
- * The line seperator for the current platform.
+ * The line separator for the current platform.
*/
public static final String LINE_SEPARATOR;
@@ -77,7 +77,7 @@
/**
* Returns everything after the first occurrence of the given character in
* s.
- *
+ *
* @param s
* The string
* @param c
@@ -107,7 +107,7 @@
* <p>
* For example, afterFirstPathComponent("foo.bar.baz", '.') would return
* "bar.baz" and afterFirstPathComponent("foo", '.') would return "".
- *
+ *
* @param path
* The path to parse
* @param separator
@@ -120,8 +120,8 @@
}
/**
- * Returns everything after the last occurence of the given character in s.
- *
+ * Returns everything after the last occurrence of the given character in s.
+ *
* @param s
* The string
* @param c
@@ -148,7 +148,7 @@
/**
* Returns everything before the first occurrence of the given character in
* s.
- *
+ *
* @param s
* The string
* @param c
@@ -175,7 +175,7 @@
/**
* Returns everything before the last occurrence of the given character in
* s.
- *
+ *
* @param s
* The string
* @param c
@@ -205,7 +205,7 @@
* <p>
* For example, beforeLastPathComponent("foo.bar.baz", '.') would return
* "foo.bar" and beforeLastPathComponent("foo", '.') would return "".
- *
+ *
* @param path
* The path to parse
* @param separator
@@ -219,7 +219,7 @@
/**
* Capitalizes a string.
- *
+ *
* @param s
* The string
* @return The capitalized string
@@ -243,7 +243,7 @@
/**
* Converts a Java String to an HTML markup string, but does not convert
* normal spaces to non-breaking space entities (<nbsp>).
- *
+ *
* @param s
* The string to escape
* @see Strings#escapeMarkup(String, boolean)
@@ -260,7 +260,7 @@
* non-breaking spaces (<nbsp>) if escapeSpaces is true, tabs are
* converted to four non-breaking spaces, less than signs are converted to
* &lt; entities and greater than signs to &gt; entities.
- *
+ *
* @param s
* The string to escape
* @param escapeSpaces
@@ -278,7 +278,7 @@
* non-breaking spaces (<nbsp>) if escapeSpaces is true, tabs are
* converted to four non-breaking spaces, less than signs are converted to
* &lt; entities and greater than signs to &gt; entities.
- *
+ *
* @param s
* The string to escape
* @param escapeSpaces
@@ -397,7 +397,7 @@
* <p>
* For example, firstPathComponent("foo.bar", '.') would return "foo" and
* firstPathComponent("foo", '.') would return "foo".
- *
+ *
* @param path
* The path to parse
* @param separator
@@ -424,10 +424,10 @@
/**
* Converts encoded \uxxxx to unicode chars and changes special saved
* chars to their original forms.
- *
+ *
* @param escapedUnicodeString
* escaped unicode string, like '\u4F60\u597D'.
- *
+ *
* @return The actual unicode. Can be used for instance with message bundles
*/
public static String fromEscapedUnicode(String escapedUnicodeString)
@@ -532,9 +532,9 @@
/**
* Checks whether the <code>string</code> is considered empty. Empty means
* that the string may contain whitespace, but no visible characters.
- *
+ *
* "\n\t " is considered empty, while " a" is not.
- *
+ *
* @param string
* The string
* @return True if the string is null or ""
@@ -547,7 +547,7 @@
/**
* Checks whether two strings are equals taken care of 'null' values and
* treating 'null' same as trim(string).equals("")
- *
+ *
* @param string1
* @param string2
* @return true, if both strings are equal
@@ -578,9 +578,9 @@
* string is converted to <code>false</code>. Conversion is
* case-insensitive, and does <em>not</em> take internationalization into
* account.
- *
+ *
* 'Ja', 'Oui', 'Igen', 'Nein', 'Nee', 'Non', 'Nem' are all illegal values.
- *
+ *
* @param s
* the value to convert into a boolean
* @return Boolean the converted value of <code>s</code>
@@ -626,7 +626,7 @@
/**
* Joins string fragments using the specified separator
- *
+ *
* @param separator
* @param fragments
* @return combined fragments
@@ -681,7 +681,7 @@
* <p>
* For example, lastPathComponent("foo.bar", '.') would return "bar" and
* lastPathComponent("foo", '.') would return "foo".
- *
+ *
* @param path
* The path to parse
* @param separator
@@ -708,7 +708,7 @@
/**
* Replace all occurrences of one string replaceWith another string.
- *
+ *
* @param s
* The string to process
* @param searchFor
@@ -786,7 +786,7 @@
/**
* Replace HTML numbers like 值 by the appropriate character.
- *
+ *
* @param str
* The text to be evaluated
* @return The text with "numbers" replaced
@@ -814,7 +814,7 @@
/**
* Simpler, faster version of String.split() for splitting on a simple
* character.
- *
+ *
* @param s
* The string to split
* @param c
@@ -850,7 +850,7 @@
/**
* Strips the ending from the string <code>s</code>.
- *
+ *
* @param s
* The string to strip
* @param ending
@@ -894,7 +894,7 @@
/**
* Strip any jsessionid and possibly other redundant info that might be in
* our way.
- *
+ *
* @param url
* The url to strip
* @return The stripped url
@@ -924,7 +924,7 @@
/**
* Converts the string s to a Boolean. See <code>isTrue</code> for valid
* values of s.
- *
+ *
* @param s
* The string to convert.
* @return Boolean <code>TRUE</code> when <code>isTrue(s)</code>.
@@ -939,7 +939,7 @@
/**
* Converts the 1 character string s to a character.
- *
+ *
* @param s
* The 1 character string to convert to a char.
* @return Character value to convert
@@ -967,7 +967,7 @@
/**
* Converts unicodes to encoded \uxxxx.
- *
+ *
* @param unicodeString
* The unicode string
* @return The escaped unicode string, like '\u4F60\u597D'.
@@ -1052,7 +1052,7 @@
* Converts a String to multiline HTML markup by replacing newlines with
* line break entities (<br/>) and multiple occurrences of newline
* with paragraph break entities (<p>).
- *
+ *
* @param s
* String to transform
* @return String with all single occurrences of newline replaced with
@@ -1115,7 +1115,7 @@
* {@link Throwable throwables} and String arrays of length 1 (in which case
* it just returns to string in that array, as this is a common thing to
* have in the Servlet API).
- *
+ *
* @param object
* The object
* @return The string
@@ -1151,7 +1151,7 @@
* the unnecessary parts of the stack trace. The message of the
* <code>location</code> is used as a verb in the rendered string. Use
* "added", "constructed" or similar verbs as values.
- *
+ *
* @param component
* the component that was constructed or added and failed to
* render
@@ -1235,7 +1235,7 @@
/**
* Converts a Throwable to a string.
- *
+ *
* @param throwable
* The throwable
* @return The string
@@ -1305,7 +1305,7 @@
* stopAtWicketSerlvet is true then the output will stop when the
* org.apache.wicket servlet is reached. sun.reflect. packages are filtered
* out.
- *
+ *
* @param cause
* @param sb
* @param stopAtWicketServlet
@@ -1358,7 +1358,7 @@
/**
* Convert a nibble to a hex character
- *
+ *
* @param nibble
* the nibble to convert.
* @return hex character
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Mon Oct 15 13:18:27 2007
@@ -70,9 +70,9 @@
* for a servlet container. See javadoc of <code>WicketTester</code> for
* example usage. This class can be used as is, but JUnit users should use
* derived class <code>WicketTester</code>.
- *
+ *
* @see WicketTester
- *
+ *
* @author Ingram Chen
* @author Juergen Donnerstag
* @author Frank Bille
@@ -93,7 +93,7 @@
/**
* Constructor.
- *
+ *
* @param page
*/
private TestPageSource(Page page) {
@@ -135,7 +135,7 @@
/**
* Creates <code>WicketTester</code> and automatically creates a
* <code>WebApplication</code>.
- *
+ *
* @param homePage
* a home page <code>Class</code>
*/
@@ -163,7 +163,7 @@
/**
* Creates a <code>WicketTester</code>.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code>
* object
@@ -174,14 +174,14 @@
/**
* Creates a <code>WicketTester</code> for unit testing.
- *
+ *
* @param application
* a <code>WicketTester</code> <code>WebApplication</code>
* object
* @param path
* the absolute path on disk to the <code>WebApplication</code>'s
* contents (e.g. war root) - may be <code>null</code>
- *
+ *
* @see org.apache.wicket.protocol.http.MockWebApplication#MockWebApplication(
* org.apache.wicket.protocol.http.WebApplication, String)
*/
@@ -194,7 +194,7 @@
* This is usually used when a page does not have default constructor. For
* example, a <code>ViewBook</code> page requires a <code>Book</code>
* instance:
- *
+ *
* <pre>
* tester.startPage(new TestPageSource() {
* public Page getTestPage() {
@@ -203,7 +203,7 @@
* }
* });
* </pre>
- *
+ *
* @param testPageSource
* a <code>Page</code> factory that creates a test page
* instance
@@ -222,7 +222,7 @@
* Builds and processes a request suitable for invoking a listener. The
* <code>Component</code> must implement any of the known
* <code>IListener</code> interfaces.
- *
+ *
* @param component
* the listener to invoke
*/
@@ -235,7 +235,7 @@
/**
* Builds and processes a request suitable for executing an
* <code>AbstractAjaxBehavior</code>.
- *
+ *
* @param behavior
* an <code>AbstractAjaxBehavior</code> to execute
*/
@@ -251,7 +251,7 @@
/**
* Renders the <code>Page</code>.
- *
+ *
* @param page
* a <code>Page</code> to render
* @return the rendered <code>Page</code>
@@ -262,7 +262,7 @@
/**
* Renders a <code>Page</code> from its default constructor.
- *
+ *
* @param pageClass
* a test <code>Page</code> class with default constructor
* @return the rendered <code>Page</code>
@@ -277,7 +277,7 @@
* and fills all child
* {@link org.apache.wicket.markup.html.form.FormComponent}s with blank
* <code>String</code>s.
- *
+ *
* @param path
* path to <code>FormComponent</code>
* @return a <code>FormTester</code> instance for testing the
@@ -290,7 +290,7 @@
/**
* Creates a {@link FormTester} for the <code>Form</code> at a given path.
- *
+ *
* @param path
* path to <code>FormComponent</code>
* @param fillBlankString
@@ -338,7 +338,7 @@
/**
* Renders a <code>Panel</code> from a <code>Panel(String id)</code>
* constructor.
- *
+ *
* @param panelClass
* a test <code>Panel</code> class with
* <code>Panel(String id)</code> constructor
@@ -377,15 +377,15 @@
/**
* A helper method for starting a component for a test without attaching it to a Page.
- *
+ *
* Components which are somehow dependent on the page structure can not be currently tested with
* this method.
- *
+ *
* Example:
- *
+ *
* UserDataView view = new UserDataView("view", new ListDataProvider(userList));
* tester.startComponent(view); assertEquals(4, view.size());
- *
+ *
* @param component
*/
public void startComponent(Component component)
@@ -399,7 +399,7 @@
/**
* Throw "standard" WicketRuntimeException
- *
+ *
* @param e
* @return RuntimeException
*/
@@ -412,7 +412,7 @@
* Gets the component with the given path from last rendered page. This method fails in case the
* component couldn't be found, and it will return null if the component was found, but is not
* visible.
- *
+ *
* @param path
* Path to component
* @return The component at the path
@@ -436,7 +436,7 @@
/**
* assert the text of <code>Label</code> component.
- *
+ *
* @param path
* path to <code>Label</code> component
* @param expectedLabelText
@@ -451,7 +451,7 @@
/**
* assert <code>PageLink</code> link to page class.
- *
+ *
* @param path
* path to <code>PageLink</code> component
* @param expectedPageClass
@@ -484,7 +484,7 @@
/**
* assert component class
- *
+ *
* @param path
* path to component
* @param expectedComponentClass
@@ -501,7 +501,7 @@
/**
* assert component visible.
- *
+ *
* @param path
* path to component
* @return
@@ -520,7 +520,7 @@
/**
* assert component invisible.
- *
+ *
* @param path
* path to component
* @return
@@ -532,7 +532,7 @@
/**
* assert the content of last rendered page contains(matches) regex pattern.
- *
+ *
* @param pattern
* reqex pattern to match
* @return
@@ -545,7 +545,7 @@
/**
* assert the model of {@link ListView} use expectedList
- *
+ *
* @param path
* path to {@link ListView} component
* @param expectedList
@@ -561,7 +561,7 @@
* Click the {@link Link} in the last rendered Page.
* <p>
* Simulate that AJAX is enabled.
- *
+ *
* @see WicketTester#clickLink(String, boolean)
* @param path
* Click the <code>Link</code> in the last rendered Page.
@@ -589,7 +589,7 @@
* This method is also able to simulate that AJAX (javascript) is disabled on the client. This
* is done by setting the isAjax parameter to false. If you have an AjaxFallbackLink you can
* then check that it doesn't fail when invoked as a normal link.
- *
+ *
* @param path
* path to <code>Link</code> component
* @param isAjax
@@ -713,7 +713,7 @@
/**
* Submits the <code>Form</code> in the last rendered <code>Page</code>.
- *
+ *
* @param path
* path to <code>Form</code> component
*/
@@ -728,7 +728,7 @@
* <p>
* NOTE: this method only works when a <code>Page</code> was rendered
* first.
- *
+ *
* @param componentPath
* path to the <code>Component</code>
* @param value
@@ -756,10 +756,10 @@
/**
* Asserts the last rendered <code>Page</code> class.
- *
+ *
* FIXME explain why the code is so complicated to compare two classes, or
* simplify
- *
+ *
* @param expectedRenderedPageClass
* expected class of last rendered page
* @return a <code>Result</code>
@@ -783,7 +783,7 @@
* Use <code>-Dwicket.replace.expected.results=true</code> to
* automatically replace the expected output file.
* </p>
- *
+ *
* @param pageClass
* used to load the <code>File</code> (relative to
* <code>clazz</code> package)
@@ -801,7 +801,7 @@
/**
* Asserts last rendered <code>Page</code> against an expected HTML
* document as a <code>String</code>.
- *
+ *
* @param expectedDocument
* expected output
* @return a <code>Result</code>
@@ -816,7 +816,7 @@
/**
* Asserts no error-level feedback messages.
- *
+ *
* @return a <code>Result</code>
*/
public Result hasNoErrorMessage() {
@@ -827,7 +827,7 @@
/**
* Asserts no info-level feedback messages.
- *
+ *
* @return a <code>Result</code>
*/
public Result hasNoInfoMessage() {
@@ -838,7 +838,7 @@
/**
* Retrieves <code>FeedbackMessages</code>.
- *
+ *
* @param level
* level of feedback message, for example:
* <code>FeedbackMessage.DEBUG or FeedbackMessage.INFO.. etc</code>
@@ -880,7 +880,7 @@
* Dumps the <code>Component</code> trees to log. Show only the
* <code>Component</code>s whose paths contain the filter
* <code>String</code>.
- *
+ *
* @param filter
* a filter <code>String</code>
*/
@@ -908,7 +908,7 @@
* <code>Component</code> in the client DOM tree, using Javascript. But it
* shouldn't be needed because you have to trust that the Wicket Ajax
* Javascript just works.
- *
+ *
* @param component
* the <code>Component</code> to test
* @return a <code>Result</code>
@@ -949,9 +949,9 @@
/**
* Simulates the firing of an Ajax event.
- *
+ *
* @see #executeAjaxEvent(Component, String)
- *
+ *
* @since 1.2.3
* @param componentPath
* the <code>Component</code> path
@@ -967,7 +967,7 @@
/**
* Simulates the firing of an Ajax event. You add an Ajax event to a
* <code>Component</code> by using:
- *
+ *
* <pre>
* ...
* component.add(new AjaxEventBehavior("ondblclick") {
@@ -975,24 +975,24 @@
* });
* ...
* </pre>
- *
+ *
* You can then test that the code inside <code>onEvent</code> actually
* does what it's supposed to, using the <code>WicketTester</code>:
- *
+ *
* <pre>
* ...
* tester.executeAjaxEvent(component, "ondblclick");
* // Test that the code inside onEvent is correct.
* ...
* </pre>
- *
+ *
* This also works with <code>AjaxFormSubmitBehavior</code>, where it
* will "submit" the <code>Form</code> before executing the command.
* <p>
* PLEASE NOTE! This method doesn't actually insert the
* <code>Component</code> in the client DOM tree, using Javascript.
- *
- *
+ *
+ *
* @param component
* the <code>Component</code> that has the
* <code>AjaxEventBehavior</code> we want to test. If the
@@ -1027,7 +1027,7 @@
}
// If there haven't been found any event behaviors on the component
- // which maches the parameters we fail.
+ // which matches the parameters we fail.
failMessage = "No AjaxEventBehavior found on component: "
+ component.getId() + " which matches the event: "
+ event.toString();
@@ -1059,7 +1059,7 @@
* Retrieves a <code>TagTester</code> based on a <code>wicket:id</code>.
* If more <code>Component</code>s exist with the same
* <code>wicket:id</code> in the markup, only the first one is returned.
- *
+ *
* @param wicketId
* the <code>wicket:id</code> to search for
* @return the <code>TagTester</code> for the tag which has the given
@@ -1074,7 +1074,7 @@
* Retrieves a <code>TagTester</code> based on an DOM id. If more
* <code>Component</code>s exist with the same id in the markup, only the
* first one is returned.
- *
+ *
* @param id
* the DOM id to search for.
* @return the <code>TagTester</code> for the tag which has the given DOM
@@ -1088,7 +1088,7 @@
/**
* Helper method for all the places where an Ajax call should submit an
* associated <code>Form</code>.
- *
+ *
* @param behavior
* The <code>AjaxFormSubmitBehavior</code> with the
* <code>Form</code> to "submit"
@@ -1131,7 +1131,7 @@
/**
* Retrieves the content type from the response header.
- *
+ *
* @return the content type from the response header
*/
public String getContentTypeFromResponseHeader() {
@@ -1145,7 +1145,7 @@
/**
* Retrieves the content length from the response header.
- *
+ *
* @return the content length from the response header
*/
public int getContentLengthFromResponseHeader() {
@@ -1159,7 +1159,7 @@
/**
* Retrieves the last-modified value from the response header.
- *
+ *
* @return the last-modified value from the response header
*/
public String getLastModifiedFromResponseHeader() {
@@ -1169,7 +1169,7 @@
/**
* Retrieves the content disposition from the response header.
- *
+ *
* @return the content disposition from the response header
*/
public String getContentDispositionFromResponseHeader() {
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/ExternalPageViewer.java Mon Oct 15 13:18:27 2007
@@ -28,7 +28,7 @@
/**
* <code>ExternalPageViewer</code> class. This class is experimental only and
* may not yet work in your environment.
- *
+ *
* TODO need Javadoc from author.
*
* @author Ingram Chen
@@ -48,7 +48,7 @@
private final WicketTester tester;
/**
- *
+ *
* @param tester
*/
public ExternalPageViewer(final WicketTester tester)
@@ -57,8 +57,8 @@
}
/**
- * register addtional browser path for viewInBrowser()
- *
+ * register additional browser path for viewInBrowser()
+ *
* @param path
*/
public static final void registerBrowserPath(String path)
@@ -67,7 +67,7 @@
}
/**
- * open a web browser and see lastet rendered WebPage.
+ * open a web browser and see latest rendered WebPage.
*/
public final void viewInBrowser()
{
@@ -124,7 +124,7 @@
}
/**
- *
+ *
* @return path
*/
private String getBrowserPath()
@@ -142,20 +142,20 @@
}
/**
- * define a temperary file name that stores source of last rendered page.
+ * define a temporary file name that stores source of last rendered page.
* This file is used by external browser
- *
+ *
* @return String
*/
protected String getTemperaryDumpHtmlFileName()
{
- // this pattern will hide from eclipe and ignore by cvs
+ // this pattern will hide from eclipse and ignore by cvs
return ".del-wicketTestDump.html";
}
/**
- * set default encoding for writing temperary file.
- *
+ * set default encoding for writing temporary file.
+ *
* @return String
*/
protected String getHtmlEncoding()
@@ -164,18 +164,18 @@
}
/**
- *
+ *
* @return URL
*/
private URL getThisClassFileURL()
{
- URL url = this.getClass().getClassLoader().getResource(
- this.getClass().getName().replace('.', '/') + ".class");
+ URL url = getClass().getClassLoader().getResource(
+ getClass().getName().replace('.', '/') + ".class");
return url;
}
/**
- *
+ *
* @param e
* @return RuntimeException
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/AbstractTime.java Mon Oct 15 13:18:27 2007
@@ -23,14 +23,14 @@
/**
* Abstract base class for subclasses that represent a point in time (as opposed
* to a {@link Duration} of time).
- *
+ *
* @author Jonathan Locke
* @since 1.2.6
*/
abstract class AbstractTime extends AbstractTimeValue
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -41,6 +41,7 @@
static final SimpleDateFormat timeFormat = new SimpleDateFormat("h.mma");
/**
+ * @param milliseconds
* @see AbstractTimeValue
*/
AbstractTime(final long milliseconds)
@@ -51,7 +52,7 @@
/**
* Returns <code>true</code> if this <code>Time</code> value is after
* the given <code>Time</code> argument's value.
- *
+ *
* @param that
* the <code>AbstractTimeValue</code> to compare with
* @return <code>true</code> if this <code>Time</code> value is after
@@ -65,7 +66,7 @@
/**
* Returns <code>true</code> if this <code>Time</code> value is before
* the given <code>Time</code> argument's value.
- *
+ *
* @param that
* the <code>AbstractTimeValue</code> to compare with
* @return <code>true</code> if this <code>Time</code> value is before
@@ -79,7 +80,7 @@
/**
* Converts this <code>Time</code> to a time <code>String</code> using
* the formatter 'h.mma'.
- *
+ *
* @return the <code>Time</code> <code>String</code>
*/
public final String toTimeString()
@@ -90,7 +91,7 @@
/**
* Converts this <code>Time</code> to a <code>Date String</code> using
* the <code>Date</code> formatter 'h.mma'.
- *
+ *
* @param calendar
* the <code>Calendar</code> to use in the conversion
* @return the <code>Date</code> <code>String</code>
@@ -110,7 +111,7 @@
/**
* Converts this <code>Time</code> to a <code>String</code> suitable for
* use in a file system name.
- *
+ *
* @return this <code>Time</code> as a formatted <code>String</code>
*/
public String toString()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java Mon Oct 15 13:18:27 2007
@@ -89,7 +89,7 @@
* <p>
* Finally, the <code>sleep</code> method will sleep for the value of a
* <code>Duration</code>.
- *
+ *
* @author Jonathan Locke
* @since 1.2.6
*/
@@ -98,7 +98,7 @@
private static final long serialVersionUID = 1L;
/** Constant for maximum duration. */
- public static final Duration MAXIMUM = milliseconds(Long.MAX_VALUE);
+ public static final Duration MAXIMUM = milliseconds(Long.MAX_VALUE);
/** Constant for no duration. */
public static final Duration NONE = milliseconds(0);
@@ -125,7 +125,7 @@
/**
* Benchmark the given command.
- *
+ *
* @param code
* an <code>ICode</code>
* @param log
@@ -146,7 +146,7 @@
/**
* Benchmark the given command.
- *
+ *
* @param code
* a <code>Runnable</code>
* @return the <code>Time</code> value it took to run the code
@@ -165,7 +165,7 @@
/**
* Retrieves the <code>Duration</code> based on days.
- *
+ *
* @param days
* days <code>double</code> value
* @return the <code>Duration</code> based on days
@@ -177,7 +177,7 @@
/**
* Retrieves the <code>Duration</code> based on days.
- *
+ *
* @param days
* days <code>int</code> value
* @return the <code>Duration</code> based on days
@@ -189,7 +189,7 @@
/**
* Calculates the amount of time elapsed since start time.
- *
+ *
* @param start
* the start <code>Time</code>
* @return the elapsed period as a <code>Duration</code>
@@ -203,7 +203,7 @@
/**
* Retrieves the <code>Duration</code> based on hours.
- *
+ *
* @param hours
* hours <code>double</code> value
* @return the <code>Duration</code> based on hours
@@ -215,7 +215,7 @@
/**
* Retrieves the <code>Duration</code> based on hours.
- *
+ *
* @param hours
* hours <code>int</code> value
* @return the <code>Duration</code> based on hours
@@ -227,7 +227,7 @@
/**
* Retrieves the <code>Duration</code> based on milliseconds.
- *
+ *
* @param milliseconds
* milliseconds <code>double</code> value
* @return the <code>Duration</code> based on milliseconds
@@ -238,8 +238,8 @@
}
/**
- * Retrieves the <code>Duration</code> based on miliseconds.
- *
+ * Retrieves the <code>Duration</code> based on milliseconds.
+ *
* @param milliseconds
* milliseconds <code>long</code> value
* @return the <code>Duration</code> based on milliseconds
@@ -251,7 +251,7 @@
/**
* Retrieves the <code>Duration</code> based on minutes.
- *
+ *
* @param minutes
* minutes <code>double</code> value
* @return the <code>Duration</code> based on minutes
@@ -263,7 +263,7 @@
/**
* Retrieves the <code>Duration</code> based on minutes.
- *
+ *
* @param minutes
* minutes <code>int</code> value
* @return the <code>Duration</code> based on minutes
@@ -275,7 +275,7 @@
/**
* Retrieves the <code>Duration</code> based on seconds.
- *
+ *
* @param seconds
* seconds <code>double</code> value
* @return the <code>Duration</code> based on seconds
@@ -287,7 +287,7 @@
/**
* Retrieves the <code>Duration</code> based on seconds.
- *
+ *
* @param seconds
* seconds <code>int</code> value
* @return the <code>Duration</code> based on seconds
@@ -299,7 +299,7 @@
/**
* Retrieves the given <code>long</code> as a <code>Duration</code>.
- *
+ *
* @param time
* the duration <code>long</code> value in milliseconds
* @return the <code>Duration</code> value
@@ -314,7 +314,7 @@
* object. The string can take the form of a floating point number followed
* by a number of milliseconds, seconds, minutes, hours or days. For example
* "6 hours" or "3.4 days". Parsing is case-insensitive.
- *
+ *
* @param string
* a <code>String</code> to parse
* @return the <code>Duration</code> value of the given
@@ -331,7 +331,7 @@
* object. The string can take the form of a floating point number followed
* by a number of milliseconds, seconds, minutes, hours or days. For example
* "6 hours" or "3.4 days". Parsing is case-insensitive.
- *
+ *
* @param string
* a <code>String</code> to parse
* @param locale
@@ -383,7 +383,7 @@
/**
* Private constructor forces use of static factory methods.
- *
+ *
* @param milliseconds
* number of milliseconds in this <code>Duration</code>
*/
@@ -394,7 +394,7 @@
/**
* Adds a given <code>Duration</code> to this <code>Duration</code>.
- *
+ *
* @param duration
* the <code>Duration</code> to add
* @return the sum of the <code>Duration</code>s
@@ -406,7 +406,7 @@
/**
* Retrieves the number of days of the current <code>Duration</code>.
- *
+ *
* @return number of days of the current <code>Duration</code>
*/
public final double days()
@@ -416,7 +416,7 @@
/**
* Retrieves the number of hours of the current <code>Duration</code>.
- *
+ *
* @return number of hours of the current <code>Duration</code>
*/
public final double hours()
@@ -426,7 +426,7 @@
/**
* Retrieves the number of minutes of the current <code>Duration</code>.
- *
+ *
* @return number of minutes of the current <code>Duration</code>
*/
public final double minutes()
@@ -436,7 +436,7 @@
/**
* Retrieves the number of seconds of the current <code>Duration</code>.
- *
+ *
* @return number of seconds of the current <code>Duration</code>
*/
public final double seconds()
@@ -464,7 +464,7 @@
/**
* Subtracts a given <code>Duration</code> from this <code>Duration</code>.
- *
+ *
* @param that
* the <code>Duration</code> to subtract
* @return this <code>Duration</code> minus that <code>Duration</code>
@@ -478,7 +478,7 @@
* Retrieves the <code>String</code> representation of this
* <code>Duration</code> in days, hours, minutes, seconds or milliseconds,
* as appropriate. Uses the default <code>Locale</code>.
- *
+ *
* @return a <code>String</code> representation
*/
public String toString()
@@ -490,7 +490,7 @@
* Retrieves the <code>String</code> representation of this
* <code>Duration</code> in days, hours, minutes, seconds or milliseconds,
* as appropriate.
- *
+ *
* @param locale
* a <code>Locale</code>
* @return a <code>String</code> representation
@@ -530,7 +530,7 @@
/**
* Converts a value to a unit-suffixed value, taking care of English
* singular/plural suffix.
- *
+ *
* @param value
* a <code>double</code> value to format
* @param units