You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 23:23:31 UTC
svn commit: r584925 [21/34] - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/ main/java/org/apache/wicket/ajax/ma...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java Mon Oct 15 14:21:25 2007
@@ -35,11 +35,11 @@
*/
public final class WicketObjectInputStream extends ObjectInputStream
{
-
- private final IntHashMap handledObjects = new IntHashMap();
+
+ private final IntHashMap handledObjects = new IntHashMap();
private short handleCounter = 0;
-
+
private final DataInputStream in;
private ClassStreamHandler currentStreamHandler;
private HandleArrayListStack stack = new HandleArrayListStack();
@@ -47,6 +47,7 @@
/**
* Construct.
+ *
* @param in
* @throws IOException
*/
@@ -55,7 +56,7 @@
super();
this.in = new DataInputStream(in);
}
-
+
/**
* @see java.io.ObjectInputStream#readObjectOverride()
*/
@@ -63,11 +64,11 @@
{
Object value = null;
int token = in.read();
- if(token == ClassStreamHandler.NULL)
+ if (token == ClassStreamHandler.NULL)
{
return null;
}
- else if ( token == ClassStreamHandler.HANDLE)
+ else if (token == ClassStreamHandler.HANDLE)
{
short handle = in.readShort();
value = handledObjects.get(handle);
@@ -84,18 +85,18 @@
if (currentStreamHandler.getStreamClass() == String.class)
{
value = in.readUTF();
- handledObjects.put(handleCounter++,value);
+ handledObjects.put(handleCounter++, value);
}
else
{
try
{
value = currentStreamHandler.createObject();
- handledObjects.put(handleCounter++,value);
+ handledObjects.put(handleCounter++, value);
stack.push(value);
- if ( !currentStreamHandler.invokeReadMethod(this, value))
+ if (!currentStreamHandler.invokeReadMethod(this, value))
{
- currentStreamHandler.readFields(this,value);
+ currentStreamHandler.readFields(this, value);
}
value = currentStreamHandler.readResolve(value);
stack.pop();
@@ -131,7 +132,7 @@
ClassStreamHandler lookup = ClassStreamHandler.lookup(classDef);
int length = in.readInt();
Object[] array = (Object[])Array.newInstance(lookup.getStreamClass(), length);
- handledObjects.put(handleCounter++,array);
+ handledObjects.put(handleCounter++, array);
for (int i = 0; i < array.length; i++)
{
array[i] = readObjectOverride();
@@ -143,7 +144,7 @@
short classDef = in.readShort();
ClassStreamHandler lookup = ClassStreamHandler.lookup(classDef);
value = lookup.readArray(this);
- handledObjects.put(handleCounter++,value);
+ handledObjects.put(handleCounter++, value);
}
else
{
@@ -151,21 +152,21 @@
}
return value;
}
-
+
/**
* @see java.io.ObjectInputStream#defaultReadObject()
*/
public void defaultReadObject() throws IOException, ClassNotFoundException
{
Object currentObject = stack.peek();
- if ( !defaultRead.contains(currentObject) )
+ if (!defaultRead.contains(currentObject))
{
defaultRead.add(currentObject);
- currentStreamHandler.readFields(this,currentObject);
+ currentStreamHandler.readFields(this, currentObject);
}
}
-
+
/**
* @see java.io.ObjectInputStream#close()
*/
@@ -176,196 +177,237 @@
currentStreamHandler = null;
in.close();
}
-
- /**
- * Reads in a boolean.
- *
- * @return the boolean read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public boolean readBoolean() throws IOException {
- return in.readBoolean();
- }
-
- /**
- * Reads an 8 bit byte.
- *
- * @return the 8 bit byte read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public byte readByte() throws IOException {
- return in.readByte();
- }
-
- /**
- * Reads an unsigned 8 bit byte.
- *
- * @return the 8 bit byte read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public int readUnsignedByte() throws IOException {
- return in.readUnsignedByte();
- }
-
- /**
- * Reads a 16 bit char.
- *
- * @return the 16 bit char read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public char readChar() throws IOException {
- return in.readChar();
- }
-
- /**
- * Reads a 16 bit short.
- *
- * @return the 16 bit short read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public short readShort() throws IOException {
- return in.readShort();
- }
-
- /**
- * Reads an unsigned 16 bit short.
- *
- * @return the 16 bit short read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public int readUnsignedShort() throws IOException {
- return in.readUnsignedShort();
- }
-
- /**
- * Reads a 32 bit int.
- *
- * @return the 32 bit integer read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public int readInt() throws IOException {
- return in.readInt();
- }
-
- /**
- * Reads a 64 bit long.
- *
- * @return the read 64 bit long.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public long readLong() throws IOException {
- return in.readLong();
- }
-
- /**
- * Reads a 32 bit float.
- *
- * @return the 32 bit float read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public float readFloat() throws IOException {
- return in.readFloat();
- }
-
- /**
- * Reads a 64 bit double.
- *
- * @return the 64 bit double read.
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public double readDouble() throws IOException {
- return in.readDouble();
- }
-
- /**
- * Reads bytes, blocking until all bytes are read.
- *
- * @param buf the buffer into which the data is read
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public void readFully(byte[] buf) throws IOException {
- in.readFully(buf, 0, buf.length);
- }
-
- /**
- * Reads bytes, blocking until all bytes are read.
- *
- * @param buf the buffer into which the data is read
- * @param off the start offset of the data
- * @param len the maximum number of bytes to read
- * @throws EOFException If end of file is reached.
- * @throws IOException If other I/O error has occurred.
- */
- public void readFully(byte[] buf, int off, int len) throws IOException {
- int endoff = off + len;
- if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
- throw new IndexOutOfBoundsException();
- }
- in.readFully(buf, off, len);
- }
-
- /**
- * @see java.io.ObjectInputStream#readUTF()
- */
- public String readUTF() throws IOException
- {
- String s = in.readUTF();
- return s;
- }
-
- /**
- * @see java.io.ObjectInputStream#read()
- */
- public int read() throws IOException
- {
- return in.read();
- }
-
- /**
- * @see java.io.InputStream#read(byte[])
- */
- public int read(byte[] b) throws IOException
- {
- return in.read(b);
- }
-
- /**
- * @see java.io.ObjectInputStream#read(byte[], int, int)
- */
- public int read(byte[] buf, int off, int len) throws IOException
- {
- return in.read(buf, off, len);
- }
-
- /**
- * @see java.io.ObjectInputStream#readFields()
- */
- public GetField readFields() throws IOException, ClassNotFoundException
- {
- GetFieldImpl field = new GetFieldImpl();
- field.read();
- return field;
- }
-
-
- private class GetFieldImpl extends GetField
- {
- private final HashMap values = new HashMap();
-
- private void read() throws IOException, ClassNotFoundException
- {
- short token = readShort();
+
+ /**
+ * Reads in a boolean.
+ *
+ * @return the boolean read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public boolean readBoolean() throws IOException
+ {
+ return in.readBoolean();
+ }
+
+ /**
+ * Reads an 8 bit byte.
+ *
+ * @return the 8 bit byte read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public byte readByte() throws IOException
+ {
+ return in.readByte();
+ }
+
+ /**
+ * Reads an unsigned 8 bit byte.
+ *
+ * @return the 8 bit byte read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public int readUnsignedByte() throws IOException
+ {
+ return in.readUnsignedByte();
+ }
+
+ /**
+ * Reads a 16 bit char.
+ *
+ * @return the 16 bit char read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public char readChar() throws IOException
+ {
+ return in.readChar();
+ }
+
+ /**
+ * Reads a 16 bit short.
+ *
+ * @return the 16 bit short read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public short readShort() throws IOException
+ {
+ return in.readShort();
+ }
+
+ /**
+ * Reads an unsigned 16 bit short.
+ *
+ * @return the 16 bit short read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public int readUnsignedShort() throws IOException
+ {
+ return in.readUnsignedShort();
+ }
+
+ /**
+ * Reads a 32 bit int.
+ *
+ * @return the 32 bit integer read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public int readInt() throws IOException
+ {
+ return in.readInt();
+ }
+
+ /**
+ * Reads a 64 bit long.
+ *
+ * @return the read 64 bit long.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public long readLong() throws IOException
+ {
+ return in.readLong();
+ }
+
+ /**
+ * Reads a 32 bit float.
+ *
+ * @return the 32 bit float read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public float readFloat() throws IOException
+ {
+ return in.readFloat();
+ }
+
+ /**
+ * Reads a 64 bit double.
+ *
+ * @return the 64 bit double read.
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public double readDouble() throws IOException
+ {
+ return in.readDouble();
+ }
+
+ /**
+ * Reads bytes, blocking until all bytes are read.
+ *
+ * @param buf
+ * the buffer into which the data is read
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public void readFully(byte[] buf) throws IOException
+ {
+ in.readFully(buf, 0, buf.length);
+ }
+
+ /**
+ * Reads bytes, blocking until all bytes are read.
+ *
+ * @param buf
+ * the buffer into which the data is read
+ * @param off
+ * the start offset of the data
+ * @param len
+ * the maximum number of bytes to read
+ * @throws EOFException
+ * If end of file is reached.
+ * @throws IOException
+ * If other I/O error has occurred.
+ */
+ public void readFully(byte[] buf, int off, int len) throws IOException
+ {
+ int endoff = off + len;
+ if (off < 0 || len < 0 || endoff > buf.length || endoff < 0)
+ {
+ throw new IndexOutOfBoundsException();
+ }
+ in.readFully(buf, off, len);
+ }
+
+ /**
+ * @see java.io.ObjectInputStream#readUTF()
+ */
+ public String readUTF() throws IOException
+ {
+ String s = in.readUTF();
+ return s;
+ }
+
+ /**
+ * @see java.io.ObjectInputStream#read()
+ */
+ public int read() throws IOException
+ {
+ return in.read();
+ }
+
+ /**
+ * @see java.io.InputStream#read(byte[])
+ */
+ public int read(byte[] b) throws IOException
+ {
+ return in.read(b);
+ }
+
+ /**
+ * @see java.io.ObjectInputStream#read(byte[], int, int)
+ */
+ public int read(byte[] buf, int off, int len) throws IOException
+ {
+ return in.read(buf, off, len);
+ }
+
+ /**
+ * @see java.io.ObjectInputStream#readFields()
+ */
+ public GetField readFields() throws IOException, ClassNotFoundException
+ {
+ GetFieldImpl field = new GetFieldImpl();
+ field.read();
+ return field;
+ }
+
+
+ private class GetFieldImpl extends GetField
+ {
+ private final HashMap values = new HashMap();
+
+ private void read() throws IOException, ClassNotFoundException
+ {
+ short token = readShort();
ClassStreamHandler lookup = ClassStreamHandler.lookup(boolean.class);
if (token == lookup.getClassId())
{
@@ -373,7 +415,7 @@
for (int i = 0; i < count; i++)
{
String key = (String)readObjectOverride();
- values.put(key, readBoolean()?Boolean.TRUE:Boolean.FALSE);
+ values.put(key, readBoolean() ? Boolean.TRUE : Boolean.FALSE);
}
token = readShort();
if (token == ClassStreamHandler.NULL)
@@ -501,8 +543,8 @@
{
throw new RuntimeException("Expected NULL end byte");
}
- }
-
+ }
+
/**
* @see java.io.ObjectInputStream.GetField#defaulted(java.lang.String)
*/
@@ -635,6 +677,6 @@
{
return null;
}
-
- }
+
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectOutputStream.java Mon Oct 15 14:21:25 2007
@@ -36,8 +36,8 @@
public final class WicketObjectOutputStream extends ObjectOutputStream
{
/**
- * Lightweight identity hash table which maps objects to integer handles,
- * assigned in ascending order (comes from {@link ObjectOutputStream}).
+ * Lightweight identity hash table which maps objects to integer handles, assigned in ascending
+ * order (comes from {@link ObjectOutputStream}).
*/
private static final class HandleTable
{
@@ -106,8 +106,8 @@
}
/**
- * Assigns next available handle to given object, and returns handle
- * value. Handles are assigned in ascending order starting at 0.
+ * Assigns next available handle to given object, and returns handle value. Handles are
+ * assigned in ascending order starting at 0.
*
* @param obj
* @return
@@ -139,8 +139,7 @@
}
/**
- * Looks up and returns handle associated with given object, or -1 if no
- * mapping found.
+ * Looks up and returns handle associated with given object, or -1 if no mapping found.
*
* @param obj
* @return
@@ -181,8 +180,7 @@
private HashMap mapObject;
/**
- * @see java.io.ObjectOutputStream.PutField#put(java.lang.String,
- * boolean)
+ * @see java.io.ObjectOutputStream.PutField#put(java.lang.String, boolean)
*/
public void put(String name, boolean val)
{
@@ -218,8 +216,7 @@
}
/**
- * @see java.io.ObjectOutputStream.PutField#put(java.lang.String,
- * double)
+ * @see java.io.ObjectOutputStream.PutField#put(java.lang.String, double)
*/
public void put(String name, double val)
{
@@ -267,8 +264,7 @@
}
/**
- * @see java.io.ObjectOutputStream.PutField#put(java.lang.String,
- * java.lang.Object)
+ * @see java.io.ObjectOutputStream.PutField#put(java.lang.String, java.lang.Object)
*/
public void put(String name, Object val)
{
@@ -724,15 +720,15 @@
catch (WicketSerializeableException wse)
{
wse
- .addTrace(componentType.getName() + "[" + Array.getLength(obj)
- + "]");
+ .addTrace(componentType.getName() + "[" + Array.getLength(obj) +
+ "]");
throw wse;
}
catch (Exception e)
{
throw new WicketSerializeableException(
- "Error writing primitive array of " + componentType.getName()
- + "[" + Array.getLength(obj) + "]", e);
+ "Error writing primitive array of " + componentType.getName() +
+ "[" + Array.getLength(obj) + "]", e);
}
}
else
@@ -755,8 +751,8 @@
}
catch (Exception e)
{
- throw new WicketSerializeableException("Error writing array of "
- + componentType.getName() + "[" + length + "]", e);
+ throw new WicketSerializeableException("Error writing array of " +
+ componentType.getName() + "[" + length + "]", e);
}
}
return;
@@ -798,8 +794,8 @@
{
if (realClz != cls)
{
- wse.addTrace(realClz.getName() + "(ReplaceOf:" + cls.getName()
- + ")");
+ wse.addTrace(realClz.getName() + "(ReplaceOf:" + cls.getName() +
+ ")");
}
else
{
@@ -811,15 +807,14 @@
{
if (realClz != cls)
{
- throw new WicketSerializeableException("Error writing fields for "
- + realClz.getName() + "(ReplaceOf:" + cls.getName() + ")",
- e);
+ throw new WicketSerializeableException("Error writing fields for " +
+ realClz.getName() + "(ReplaceOf:" + cls.getName() + ")", e);
}
else
{
- throw new WicketSerializeableException("Error writing fields for "
- + realClz.getName(), e);
+ throw new WicketSerializeableException("Error writing fields for " +
+ realClz.getName(), e);
}
}
finally
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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -28,10 +28,10 @@
/**
- * 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.
- *
+ * 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,11 +57,12 @@
/**
* Construct.
- *
+ *
* @param inputStream
* The InputStream to read the xml data from
* @param defaultEncoding
- * Default character encoding to use when not specified in XML declaration, specify null to use JVM default
+ * Default character encoding to use when not specified in XML declaration, specify
+ * null to use JVM default
* @throws IOException
* In case something went wrong while reading the data
*/
@@ -84,7 +85,7 @@
/**
* Return the encoding used while reading the markup file.
- *
+ *
* @return if null, then JVM default
*/
public String getEncoding()
@@ -94,7 +95,7 @@
/**
* Return the XML declaration string, in case if found in the markup.
- *
+ *
* @return Null, if not found.
*/
public String getXmlDeclaration()
@@ -104,7 +105,7 @@
/**
* Reads and parses markup from a resource such as file.
- *
+ *
* @throws IOException
*/
public void init() throws IOException
@@ -145,8 +146,9 @@
/**
* Determine the encoding from the xml decl.
- *
- * @param string The xmlDecl string
+ *
+ * @param string
+ * The xmlDecl string
* @return The encoding. Null, if not found
*/
private final String determineEncoding(final String string)
@@ -175,17 +177,15 @@
}
/**
- * Read-ahead the input stream (markup file). If the first line contains
- * <?xml...?>, than remember the xml decl for later to determine the
- * encoding.
+ * Read-ahead the input stream (markup file). If the first line contains <?xml...?>, than
+ * remember the xml decl for later to determine the encoding.
* <p>
* The xml decl will not be forwarded to the user.
- *
+ *
* @param in
* The markup file
* @param readAheadSize
- * The read ahead buffer available to read the xml encoding
- * information
+ * The read ahead buffer available to read the xml encoding information
* @return true, if <?xml ..?> has been found
* @throws IOException
*/
@@ -203,8 +203,8 @@
// Stop at the end of the first tag or end of line. If it is HTML
// without newlines, stop after X bytes (= characters)
- if ((value == '>') || (value == '\n') || (value == '\r')
- || (pushBack.length() >= (readAheadSize - 1)))
+ if ((value == '>') || (value == '\n') || (value == '\r') ||
+ (pushBack.length() >= (readAheadSize - 1)))
{
break;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java Mon Oct 15 14:21:25 2007
@@ -28,9 +28,8 @@
/**
- * Represents an immutable byte count. These static factory methods allow easy
- * construction of value objects using either long values like bytes(2034) or
- * megabytes(3):
+ * Represents an immutable byte count. These static factory methods allow easy construction of value
+ * objects using either long values like bytes(2034) or megabytes(3):
* <p>
* <ul>
* <li>Bytes.bytes(long)
@@ -50,12 +49,11 @@
* <li>Bytes.terabytes(double)
* </ul>
* <p>
- * In the case of bytes(double), the value will be rounded off to the nearest
- * integer byte count using Math.round().
+ * In the case of bytes(double), the value will be rounded off to the nearest integer byte count
+ * using Math.round().
* <p>
- * The precise number of bytes in a Bytes object can be retrieved by calling
- * bytes(). Approximate values for different units can be retrieved as double
- * precision values using these methods:
+ * The precise number of bytes in a Bytes object can be retrieved by calling bytes(). Approximate
+ * values for different units can be retrieved as double precision values using these methods:
* <p>
* <ul>
* <li>kilobytes()
@@ -64,11 +62,10 @@
* <li>terabytes()
* </ul>
* <p>
- * Also, value objects can be constructed from strings, optionally using a
- * Locale with valueOf(String) and valueOf(String,Locale). The string may
- * contain a decimal or floating point number followed by optional whitespace
- * followed by a unit (nothing for bytes, K for kilobyte, M for megabytes, G for
- * gigabytes or T for terabytes) optionally followed by a B (for bytes). Any of
+ * Also, value objects can be constructed from strings, optionally using a Locale with
+ * valueOf(String) and valueOf(String,Locale). The string may contain a decimal or floating point
+ * number followed by optional whitespace followed by a unit (nothing for bytes, K for kilobyte, M
+ * for megabytes, G for gigabytes or T for terabytes) optionally followed by a B (for bytes). Any of
* these letters can be any case. So, examples of permissible string values are:
* <p>
* <ul>
@@ -80,11 +77,11 @@
* <li>1024M (1024 megabytes)
* </ul>
* <p>
- * Note that if the Locale was not US, the values might substitute "," for "."
- * as that is the custom in Euroland.
+ * Note that if the Locale was not US, the values might substitute "," for "." as that is the custom
+ * in Euroland.
* <p>
- * The toString() and toString(Locale) methods are smart enough to convert a
- * given value object to the most appropriate units for the given value.
+ * The toString() and toString(Locale) methods are smart enough to convert a given value object to
+ * the most appropriate units for the given value.
*
* @author Jonathan Locke
*/
@@ -95,7 +92,7 @@
/** Pattern for string parsing. */
private static final Pattern valuePattern = Pattern.compile(
"([0-9]+([\\.,][0-9]+)?)\\s*(|K|M|G|T)B?", Pattern.CASE_INSENSITIVE);
-
+
/** Maximum bytes value */
public static Bytes MAX = bytes(Long.MAX_VALUE);
@@ -281,10 +278,9 @@
}
/**
- * Converts a string to a number of bytes. Strings consist of a floating
- * point value followed by K, M, G or T for kilobytes, megabytes, gigabytes
- * or terabytes, respectively. The abbreviations KB, MB, GB and TB are also
- * accepted. Matching is case insensitive.
+ * Converts a string to a number of bytes. Strings consist of a floating point value followed by
+ * K, M, G or T for kilobytes, megabytes, gigabytes or terabytes, respectively. The
+ * abbreviations KB, MB, GB and TB are also accepted. Matching is case insensitive.
*
* @param string
* The string to convert
@@ -348,10 +344,9 @@
}
/**
- * Converts a string to a number of bytes. Strings consist of a floating
- * point value followed by K, M, G or T for kilobytes, megabytes, gigabytes
- * or terabytes, respectively. The abbreviations KB, MB, GB and TB are also
- * accepted. Matching is case insensitive.
+ * Converts a string to a number of bytes. Strings consist of a floating point value followed by
+ * K, M, G or T for kilobytes, megabytes, gigabytes or terabytes, respectively. The
+ * abbreviations KB, MB, GB and TB are also accepted. Matching is case insensitive.
*
* @param string
* The string to convert
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java Mon Oct 15 14:21:25 2007
@@ -26,12 +26,11 @@
/**
- * A base class for defining enumerated types. Since this class extends
- * StringValue, every enumerated type subclass is a StringValue that can be
- * manipulated, converted and displayed in useful ways. In addition to
- * constructing a type with the given name, lists are kept of all enumeration
- * values by subclass. The list of available values in the enumeration
- * represented by a given subclass can be retrieved by calling getValues(Class).
+ * A base class for defining enumerated types. Since this class extends StringValue, every
+ * enumerated type subclass is a StringValue that can be manipulated, converted and displayed in
+ * useful ways. In addition to constructing a type with the given name, lists are kept of all
+ * enumeration values by subclass. The list of available values in the enumeration represented by a
+ * given subclass can be retrieved by calling getValues(Class).
*
* @author Jonathan Locke
*/
@@ -80,21 +79,22 @@
return valueList;
}
-
+
/**
* Method to ensure that == works after deserialization
+ *
* @return object instance
* @throws java.io.ObjectStreamException
*/
- public Object readResolve() throws java.io.ObjectStreamException
+ public Object readResolve() throws java.io.ObjectStreamException
{
EnumeratedType result = this;
List values = getValues(getClass());
if (values != null)
{
- for (Iterator i = values.iterator(); i.hasNext(); )
+ for (Iterator i = values.iterator(); i.hasNext();)
{
- EnumeratedType type = (EnumeratedType) i.next();
+ EnumeratedType type = (EnumeratedType)i.next();
if (type.toString() != null && type.toString().equals(this.toString()))
{
result = type;
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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -44,21 +44,20 @@
/**
* Object utilities.
- *
+ *
* @author Jonathan Locke
*/
public final class Objects
{
/**
- * Interface that enables users to plugin the way object sizes are
- * calculated with Wicket.
+ * Interface that enables users to plugin the way object sizes are calculated with Wicket.
*/
public static interface IObjectSizeOfStrategy
{
/**
- * Computes the size of an object. This typically is an estimation, not
- * an absolute accurate size.
- *
+ * 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.
@@ -67,12 +66,11 @@
}
/**
- * {@link IObjectSizeOfStrategy} that works by serializing the object to an
- * instance of {@link ByteCountingOutputStream}, which records the number
- * of bytes written to it. Hence, this gives the size of the object as it
- * would be serialized,including all the overhead of writing class headers
- * etc. Not very accurate (the real memory consumption should be lower) but
- * the best we can do in a cheap way pre JDK 5.
+ * {@link IObjectSizeOfStrategy} that works by serializing the object to an instance of
+ * {@link ByteCountingOutputStream}, which records the number of bytes written to it. Hence,
+ * this gives the size of the object as it would be serialized,including all the overhead of
+ * writing class headers etc. Not very accurate (the real memory consumption should be lower)
+ * but the best we can do in a cheap way pre JDK 5.
*/
public static final class SerializingObjectSizeOfStrategy implements IObjectSizeOfStrategy
{
@@ -222,12 +220,11 @@
private static final int LONG = 5;
/**
- * The smallest type tag that represents reals as opposed to integers. You
- * can see whether a type tag represents reals or integers by comparing the
- * tag to this constant: all tags less than this constant represent
- * integers, and all tags greater than or equal to this constant represent
- * reals. Of course, you must also check for NONNUMERIC, which means it is
- * not a number at all.
+ * The smallest type tag that represents reals as opposed to integers. You can see whether a
+ * type tag represents reals or integers by comparing the tag to this constant: all tags less
+ * than this constant represent integers, and all tags greater than or equal to this constant
+ * represent reals. Of course, you must also check for NONNUMERIC, which means it is not a
+ * number at all.
*/
private static final int MIN_REAL_TYPE = FLOAT;
@@ -241,18 +238,17 @@
private static final HashMap primitiveDefaults = new HashMap();
/**
- * The default object stream factory to use. Keep this as a static here
- * opposed to in Application, as the Application most likely isn't available
- * in the threads we'll be using this with.
+ * The default object stream factory to use. Keep this as a static here opposed to in
+ * Application, as the Application most likely isn't available in the threads we'll be using
+ * this with.
*/
private static IObjectStreamFactory objectStreamFactory = new IObjectStreamFactory.DefaultObjectStreamFactory();
/**
- * Strategy for calculating sizes of objects. Note: I didn't make this an
- * application setting as we have enough of those already, and the typical
- * way this probably would be used is that install a different one according
- * to the JDK version used, so varying them between applications doesn't
- * make a lot of sense.
+ * Strategy for calculating sizes of objects. Note: I didn't make this an application setting as
+ * we have enough of those already, and the typical way this probably would be used is that
+ * install a different one according to the JDK version used, so varying them between
+ * applications doesn't make a lot of sense.
*/
private static IObjectSizeOfStrategy objectSizeOfStrategy = new SerializingObjectSizeOfStrategy();
@@ -272,7 +268,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 +307,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
@@ -349,10 +345,10 @@
}
/**
- * 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.
- *
+ * 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 +377,7 @@
/**
* De-serializes an object from a byte array.
- *
+ *
* @param data
* The serialized object
* @return The object
@@ -402,22 +398,21 @@
}
catch (ClassNotFoundException e)
{
- throw new RuntimeException("Could not deserialize object using `"
- + objectStreamFactory.getClass().getName() + "` object factory", e);
+ throw new RuntimeException("Could not deserialize object using `" +
+ objectStreamFactory.getClass().getName() + "` object factory", e);
}
catch (IOException e)
{
- throw new RuntimeException("Could not deserialize object using `"
- + objectStreamFactory.getClass().getName() + "` object factory", e);
+ throw new RuntimeException("Could not deserialize object using `" +
+ objectStreamFactory.getClass().getName() + "` object factory", e);
}
}
/**
- * Makes a deep clone of an object by serializing and deserializing it. The
- * 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.
- *
+ * Makes a deep clone of an object by serializing and deserializing it. The 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
@@ -452,10 +447,9 @@
}
/**
- * 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.
- *
+ * 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
@@ -486,17 +480,20 @@
try
{
- return Class.forName(className, true, object.getClass().getClassLoader());
+ return Class.forName(className, true, object.getClass()
+ .getClassLoader());
}
catch (ClassNotFoundException ex1)
{
// ignore this exception.
- log.debug("Class not found by using objects own classloader, trying the IClassResolver");
+ log
+ .debug("Class not found by using objects own classloader, trying the IClassResolver");
}
Application application = Application.get();
- IApplicationSettings applicationSettings = application.getApplicationSettings();
+ IApplicationSettings applicationSettings = application
+ .getApplicationSettings();
IClassResolver classResolver = applicationSettings.getClassResolver();
Class candidate = null;
@@ -532,28 +529,25 @@
}
/**
- * Compares two objects for equality, even if it has to convert one of them
- * to the other type. If both objects are numeric they are converted to the
- * widest type and compared. If one is non-numeric and one is numeric the
- * non-numeric is converted to double and compared to the double numeric
- * value. If both are non-numeric and Comparable and the types are
- * compatible (i.e. v1 is of the same or superclass of v2's type) they are
- * compared with Comparable.compareTo(). If both values are non-numeric and
- * not Comparable or of incompatible classes this will throw and
- * IllegalArgumentException.
- *
+ * Compares two objects for equality, even if it has to convert one of them to the other type.
+ * If both objects are numeric they are converted to the widest type and compared. If one is
+ * non-numeric and one is numeric the non-numeric is converted to double and compared to the
+ * double numeric value. If both are non-numeric and Comparable and the types are compatible
+ * (i.e. v1 is of the same or superclass of v2's type) they are 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.
- *
+ *
+ * @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.
+ * if the objects are both non-numeric yet of incompatible types or do not implement
+ * Comparable.
*/
public static int compareWithConversion(Object v1, Object v2)
{
@@ -581,16 +575,16 @@
case NONNUMERIC :
if ((t1 == NONNUMERIC) && (t2 == NONNUMERIC))
{
- if ((v1 instanceof Comparable)
- && v1.getClass().isAssignableFrom(v2.getClass()))
+ if ((v1 instanceof Comparable) &&
+ v1.getClass().isAssignableFrom(v2.getClass()))
{
result = ((Comparable)v1).compareTo(v2);
break;
}
else
{
- throw new IllegalArgumentException("invalid comparison: "
- + v1.getClass().getName() + " and " + v2.getClass().getName());
+ throw new IllegalArgumentException("invalid comparison: " +
+ v1.getClass().getName() + " and " + v2.getClass().getName());
}
}
// else fall through
@@ -613,16 +607,16 @@
/**
* 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.
- *
+ *
+ * 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
* class type to be converted to
- * @return converted value of the type given, or value if the value cannot
- * be converted to the given type.
+ * @return converted value of the type given, or value if the value cannot be converted to the
+ * given type.
*/
public static Object convertValue(Object value, Class toType)
{
@@ -701,7 +695,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 +728,7 @@
/**
* Returns true if a and b are equal. Either object may be null.
- *
+ *
* @param a
* Object a
* @param b
@@ -758,10 +752,9 @@
/**
- * 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.
- *
+ * 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
@@ -826,9 +819,9 @@
}
/**
- * Returns a constant from the NumericTypes interface that represents the
- * numeric type of the given object.
- *
+ * 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
@@ -883,9 +876,9 @@
}
/**
- * Returns the constant from the NumericTypes interface that best expresses
- * the type of a numeric operation on the two given objects.
- *
+ * 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
@@ -898,10 +891,9 @@
}
/**
- * 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.
- *
+ * 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
@@ -916,15 +908,14 @@
}
/**
- * 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.
- *
+ * 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)
@@ -939,8 +930,8 @@
{
if ((object1 != null) && object1.getClass().isArray())
{
- if ((object2 != null) && object2.getClass().isArray()
- && (object2.getClass() == object1.getClass()))
+ if ((object2 != null) && object2.getClass().isArray() &&
+ (object2.getClass() == object1.getClass()))
{
result = (Array.getLength(object1) == Array.getLength(object2));
if (result)
@@ -956,10 +947,8 @@
{
// Check for converted equivalence first, then equals()
// equivalence
- result = (object1 != null)
- && (object2 != null)
- && ((compareWithConversion(object1, object2) == 0) || object1
- .equals(object2));
+ result = (object1 != null) && (object2 != null) &&
+ ((compareWithConversion(object1, object2) == 0) || object1.equals(object2));
}
}
return result;
@@ -967,7 +956,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
@@ -997,9 +986,9 @@
}
/**
- * Creates a new instance using the current application's class resolver.
- * Returns null if className is null.
- *
+ * 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
@@ -1011,7 +1000,8 @@
try
{
Class c = Classes.resolveClass(className);
- if (c == null) {
+ if (c == null)
+ {
throw new WicketRuntimeException("Unable to create " + className);
}
return c.newInstance();
@@ -1033,17 +1023,15 @@
}
/**
- * 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.
- *
+ * 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
+ * the nominal numeric type of the result, a constant from the NumericTypes interface
* @param value
* the integer value to convert to a Number object
- * @return a Number object with the given value, of type implied by the type
- * argument
+ * @return a Number object with the given value, of type implied by the type argument
*/
public static Number newInteger(int type, long value)
{
@@ -1082,7 +1070,7 @@
/**
* Serializes an object into a byte array.
- *
+ *
* @param object
* The object
* @return The serialized object
@@ -1112,7 +1100,7 @@
/**
* Sets the strategy for determining the sizes of objects.
- *
+ *
* @param objectSizeOfStrategy
* the strategy. Pass null to reset to the default.
*/
@@ -1130,13 +1118,12 @@
}
/**
- * Configure this utility class to use the provided
- * {@link IObjectStreamFactory} instance.
- *
+ * 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
- * (again). Pass null to reset to the default.
+ * {@link DefaultObjectStreamFactory default} will be set (again). Pass null to reset
+ * to the default.
*/
public static void setObjectStreamFactory(IObjectStreamFactory objectStreamFactory)
{
@@ -1152,9 +1139,9 @@
}
/**
- * Computes the size of an object. Note that this is an estimation, never an
- * absolute accurate size.
- *
+ * 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,11 +1153,11 @@
/**
* 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
- * toString() method, or "null" if the object is null.
+ * @return the String value implied by the given object as returned by the toString() method, or
+ * "null" if the object is null.
*/
public static String stringValue(Object value)
{
@@ -1178,9 +1165,8 @@
}
/**
- * returns hashcode of the objects by calling obj.hashcode(). safe to use
- * when obj is null.
- *
+ * 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
*/
@@ -1200,15 +1186,14 @@
}
/**
- * Evaluates the given object as a String and trims it if the trim flag is
- * true.
- *
+ * 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
* whether to trim the string
- * @return the String value implied by the given object as returned by the
- * toString() method, or "null" if the object is null.
+ * @return the String value implied by the given object as returned by the toString() method, or
+ * "null" if the object is null.
*/
public static String stringValue(Object value, boolean trim)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PackageName.java Mon Oct 15 14:21:25 2007
@@ -19,9 +19,8 @@
import org.apache.wicket.IClusterable;
/**
- * A type-safe package name class since Package is unreliable (it's not a
- * Package object, but rather a sometimes-available holder for versioning
- * information).
+ * A type-safe package name class since Package is unreliable (it's not a Package object, but rather
+ * a sometimes-available holder for versioning information).
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Packages.java Mon Oct 15 14:21:25 2007
@@ -28,10 +28,9 @@
public final class Packages
{
/**
- * Takes a package and a relative path to a resource and returns an absolute
- * path to the resource. For example, if the given package was java.lang and
- * the relative path was "../util/List", then "java/util/List" would be
- * returned.
+ * Takes a package and a relative path to a resource and returns an absolute path to the
+ * resource. For example, if the given package was java.lang and the relative path was
+ * "../util/List", then "java/util/List" would be returned.
*
* @param p
* The package to start at
@@ -46,10 +45,9 @@
}
/**
- * Takes a package and a relative path to a resource and returns an absolute
- * path to the resource. For example, if the given package was java.lang and
- * the relative path was "../util/List", then "java/util/List" would be
- * returned.
+ * Takes a package and a relative path to a resource and returns an absolute path to the
+ * resource. For example, if the given package was java.lang and the relative path was
+ * "../util/List", then "java/util/List" would be returned.
*
* @param p
* The package to start at
@@ -63,10 +61,9 @@
}
/**
- * Takes a package and a relative path to a resource and returns an absolute
- * path to the resource. For example, if the given package was java.lang and
- * the relative path was "../util/List", then "java/util/List" would be
- * returned.
+ * Takes a package and a relative path to a resource and returns an absolute path to the
+ * resource. For example, if the given package was java.lang and the relative path was
+ * "../util/List", then "java/util/List" would be returned.
*
* @param packageName
* The package to start at
@@ -159,8 +156,8 @@
/**
- * Resolve scope for the given class by extracting it's package name and
- * converting all dots to slashes.
+ * Resolve scope for the given class by extracting it's package name and converting all dots to
+ * slashes.
*
* @param forClass
* the class
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=584925&r1=584924&r2=584925&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 14:21:25 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 automatically if
- * the index is greater then the size <p/>
+ * 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
@@ -67,7 +67,7 @@
/**
* 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
@@ -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 encountered then it will try
- * to generate it by calling the default constructor and set it on the object.
- *
+ * 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
@@ -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/lang/PropertyResolverConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolverConverter.java Mon Oct 15 14:21:25 2007
@@ -51,7 +51,7 @@
* @param clz
* @return The converted object
*/
- public Object convert(Object object, Class/*<?>*/ clz)
+ public Object convert(Object object, Class/* <?> */clz)
{
if (object == null)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -36,7 +36,7 @@
/**
* Construct.
- *
+ *
* @param ignoreFiles
*/
public AbstractLicenseHeaderHandler(String[] ignoreFiles)
@@ -73,7 +73,8 @@
try
{
- inputStream = ApacheLicenseHeaderTestCase.class.getResourceAsStream(getLicenseHeaderFilename());
+ inputStream = ApacheLicenseHeaderTestCase.class
+ .getResourceAsStream(getLicenseHeaderFilename());
inputStreamReader = new InputStreamReader(inputStream);
lineNumberReader = new LineNumberReader(inputStreamReader);
@@ -94,16 +95,37 @@
{
if (lineNumberReader != null)
{
- try { lineNumberReader.close(); } catch (Exception e) { /* Ignore */ }
- };
+ try
+ {
+ lineNumberReader.close();
+ }
+ catch (Exception e)
+ { /* Ignore */
+ }
+ }
+ ;
if (inputStream != null)
{
- try { inputStream.close(); } catch (Exception e) { /* Ignore */ }
- };
+ try
+ {
+ inputStream.close();
+ }
+ catch (Exception e)
+ { /* Ignore */
+ }
+ }
+ ;
if (inputStreamReader != null)
{
- try { inputStreamReader.close(); } catch (Exception e) { /* Ignore */ }
- };
+ try
+ {
+ inputStreamReader.close();
+ }
+ catch (Exception e)
+ { /* Ignore */
+ }
+ }
+ ;
}
}
@@ -148,9 +170,9 @@
}
/**
- * Add the license header to the start of the file without caring about
- * existing license headers.
- *
+ * Add the license header to the start of the file without caring about existing license
+ * headers.
+ *
* @param file
* The file to add the license header to.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java Mon Oct 15 14:21:25 2007
@@ -29,8 +29,8 @@
import org.apache.wicket.util.string.Strings;
/**
- * Testcase used in the different wicket projects for testing for the correct
- * ASL license headers. Doesn't really make sense outside org.apache.wicket.
+ * Testcase used in the different wicket projects for testing for the correct ASL license headers.
+ * Doesn't really make sense outside org.apache.wicket.
*
* @author Frank Bille Jensen (frankbille)
*/
@@ -193,19 +193,19 @@
*
* @see junit.framework.TestCase#setUp()
*/
- public final void setUp()
+ public final void setUp()
{
// setup the base directory for when running inside maven (building a release
// comes to mind).
String property = System.getProperty("basedir");
- if(!Strings.isEmpty(property))
+ if (!Strings.isEmpty(property))
{
baseDirectory = new File(property).getAbsoluteFile();
}
}
+
/**
- * Test all the files in the project which has an associated
- * {@link ILicenseHeaderHandler}.
+ * Test all the files in the project which has an associated {@link ILicenseHeaderHandler}.
*/
public void testLicenseHeaders()
{
@@ -233,8 +233,8 @@
{
if (licenseHeaderHandler.checkLicenseHeader(file) == false)
{
- if (addHeaders == false
- || licenseHeaderHandler.addLicenseHeader(file) == false)
+ if (addHeaders == false ||
+ licenseHeaderHandler.addLicenseHeader(file) == false)
{
List/* <File> */files = (List)badFiles
.get(licenseHeaderHandler);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -67,7 +67,7 @@
public boolean addLicenseHeader(File file)
{
prependLicenseHeader(file);
-
+
return true;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -24,20 +24,22 @@
* @return The suffixes that matches the files that it handles.
*/
String[] getSuffixes();
-
+
/**
* @return The files to ignore.
*/
String[] getIgnoreFiles();
/**
- * @param file Add a license header to the file.
+ * @param file
+ * Add a license header to the file.
* @return True if the license were added. False if not.
*/
boolean addLicenseHeader(File file);
/**
- * @param file The file to check for a correct license header.
+ * @param file
+ * The file to check for a correct license header.
* @return True if the file has a correct license header. False if not.
*/
boolean checkLicenseHeader(File file);
@@ -45,7 +47,8 @@
/**
* Get the license type of the file. F.ex. ASL2, ASL1.1, GPL, LGPL etc.
*
- * @param file THe file to get the license type from.
+ * @param file
+ * THe file to get the license type from.
* @return The license type of the file. Null if no license header in the file.
*/
String getLicenseType(File file);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -26,8 +26,8 @@
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
- private final Pattern javaHeaderPattern = Pattern.compile("^(.*?)package.*$", Pattern.MULTILINE
- | Pattern.DOTALL);
+ private final Pattern javaHeaderPattern = Pattern.compile("^(.*?)package.*$",
+ Pattern.MULTILINE | Pattern.DOTALL);
/**
* Construct.
@@ -94,7 +94,7 @@
public String getLicenseType(File file)
{
String licenseType = null;
-
+
String header = extractLicenseHeader(file, 0, 20);
// Check for some of the known license types:
@@ -106,7 +106,7 @@
{
licenseType = "ASL1.1";
}
-
+
return licenseType;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -23,6 +23,7 @@
/**
* Construct.
+ *
* @param ignoreFiles
*/
public JavaScriptLicenseHeaderHandler(String[] ignoreFiles)
@@ -44,13 +45,13 @@
public String[] getSuffixes()
{
- return new String[]{"js"};
+ return new String[] { "js" };
}
public boolean addLicenseHeader(File file)
{
prependLicenseHeader(file);
-
+
return true;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -66,7 +66,7 @@
public boolean addLicenseHeader(File file)
{
prependLicenseHeader(file);
-
+
return true;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -66,7 +66,7 @@
public boolean addLicenseHeader(File file)
{
prependLicenseHeader(file);
-
+
return true;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java Mon Oct 15 14:21:25 2007
@@ -28,8 +28,9 @@
class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
- private final Pattern xmlHeader = Pattern.compile("^(\\<\\?xml[^"+LINE_ENDING+"]+?)"+LINE_ENDING+"(.*)$", Pattern.DOTALL | Pattern.MULTILINE);
-
+ private final Pattern xmlHeader = Pattern.compile("^(\\<\\?xml[^" + LINE_ENDING + "]+?)" +
+ LINE_ENDING + "(.*)$", Pattern.DOTALL | Pattern.MULTILINE);
+
/**
* Construct.
*
@@ -91,28 +92,28 @@
public boolean addLicenseHeader(File file)
{
boolean added = false;
-
+
try
{
String content = new org.apache.wicket.util.file.File(file).readString();
String xml = "";
StringBuffer newContent = new StringBuffer();
-
+
Matcher mat = xmlHeader.matcher(content);
if (mat.matches())
{
xml = mat.group(1);
content = mat.group(2);
}
-
+
if (Strings.isEmpty(xml) == false)
{
newContent.append(xml).append(LINE_ENDING);
}
-
+
newContent.append(getLicenseHeader()).append(LINE_ENDING);
newContent.append(content);
-
+
new org.apache.wicket.util.file.File(file).write(newContent.toString());
added = true;
}
@@ -120,9 +121,9 @@
{
Assert.fail(e.getMessage());
}
-
+
return added;
}
-
+
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/IListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/IListener.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/IListener.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/IListener.java Mon Oct 15 14:21:25 2007
@@ -17,8 +17,8 @@
package org.apache.wicket.util.listener;
/**
- * Typesafe super-interface for listener subclasses which can be added to a
- * ListenerSet or are intended to be dealt with in other generic ways.
+ * Typesafe super-interface for listener subclasses which can be added to a ListenerSet or are
+ * intended to be dealt with in other generic ways.
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java Mon Oct 15 14:21:25 2007
@@ -21,9 +21,9 @@
import java.util.Set;
/**
- * Holds a set of listeners implementing the IListener tag interface. Subclasses
- * can implement notification methods that cast the listener to the correct
- * subinterface and invoke the appropriate listener method.
+ * Holds a set of listeners implementing the IListener tag interface. Subclasses can implement
+ * notification methods that cast the listener to the correct subinterface and invoke the
+ * appropriate listener method.
*
* @author Jonathan Locke
*/
@@ -37,8 +37,7 @@
*
* @param listener
* The listener to add
- * @return <tt>true</tt> if the set did not already contain the specified
- * listener.
+ * @return <tt>true</tt> if the set did not already contain the specified listener.
*/
public boolean add(final IListener listener)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/BooleanGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/BooleanGroup.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/BooleanGroup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/BooleanGroup.java Mon Oct 15 14:21:25 2007
@@ -28,8 +28,7 @@
private static final long serialVersionUID = 1L;
/**
- * Constructs an IntegerGroup that parses Strings that match the INTEGER
- * pattern in base 10.
+ * Constructs an IntegerGroup that parses Strings that match the INTEGER pattern in base 10.
*
* @see MetaPattern#INTEGER
*/
@@ -55,8 +54,7 @@
* @param matcher
* The matcher
* @param defaultValue
- * The default value to use if this group is omitted because it
- * is optional
+ * The default value to use if this group is omitted because it is optional
* @return The parsed int value
*/
public boolean getBoolean(final Matcher matcher, final boolean defaultValue)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/FloatingPointGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/FloatingPointGroup.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/FloatingPointGroup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/FloatingPointGroup.java Mon Oct 15 14:21:25 2007
@@ -28,8 +28,8 @@
private static final long serialVersionUID = 1L;
/**
- * Constructs an FloatingPointGroup that parses Strings that match the
- * FLOATING_POINT_NUMBER pattern.
+ * Constructs an FloatingPointGroup that parses Strings that match the FLOATING_POINT_NUMBER
+ * pattern.
*
* @see MetaPattern#FLOATING_POINT_NUMBER
*/
@@ -54,8 +54,7 @@
* @param matcher
* The matcher
* @param defaultValue
- * The default value to use if this group is omitted because it
- * is optional
+ * The default value to use if this group is omitted because it is optional
* @return The parsed value
*/
public float getFloat(final Matcher matcher, final float defaultValue)
@@ -80,8 +79,7 @@
* @param matcher
* The matcher
* @param defaultValue
- * The default value to use if this group is omitted because it
- * is optional
+ * The default value to use if this group is omitted because it is optional
* @return The parsed value
*/
public double getDouble(final Matcher matcher, final double defaultValue)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/Group.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/Group.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/Group.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/Group.java Mon Oct 15 14:21:25 2007
@@ -19,11 +19,10 @@
import java.util.regex.Matcher;
/**
- * A Group is a piece of a regular expression (referenced by some Java field or
- * local variable) that forms a "capturing group" within the larger regular
- * expression. A Group is bound to a regular expression MetaPattern when a
- * matcher is retrieved for the pattern by calling one of the matcher() methods.
- * Once bound, a Group cannot be rebound.
+ * A Group is a piece of a regular expression (referenced by some Java field or local variable) that
+ * forms a "capturing group" within the larger regular expression. A Group is bound to a regular
+ * expression MetaPattern when a matcher is retrieved for the pattern by calling one of the
+ * matcher() methods. Once bound, a Group cannot be rebound.
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/GroupAlreadyBoundException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/GroupAlreadyBoundException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/GroupAlreadyBoundException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/GroupAlreadyBoundException.java Mon Oct 15 14:21:25 2007
@@ -17,8 +17,7 @@
package org.apache.wicket.util.parse.metapattern;
/**
- * Thrown if an attempt is made to re-bind a Group to a second capturing group
- * or MetaPattern.
+ * Thrown if an attempt is made to re-bind a Group to a second capturing group or MetaPattern.
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/IntegerGroup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/IntegerGroup.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/IntegerGroup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/IntegerGroup.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,7 @@
import java.util.regex.Matcher;
/**
- * A Group that captures integer values (positive and negative whole numbers,
- * not Java ints).
+ * A Group that captures integer values (positive and negative whole numbers, not Java ints).
*
* @author Jonathan Locke
*/
@@ -32,8 +31,7 @@
private final int radix;
/**
- * Constructs an IntegerGroup that parses Strings that match the INTEGER
- * pattern in base 10.
+ * Constructs an IntegerGroup that parses Strings that match the INTEGER pattern in base 10.
*
* @see MetaPattern#INTEGER
*/
@@ -43,11 +41,10 @@
}
/**
- * Constructs an IntegerGroup that parses Strings that match the given
- * pattern in base 10.
+ * Constructs an IntegerGroup that parses Strings that match the given pattern in base 10.
*
* @param pattern
- * The capturing pattern
+ * The capturing pattern
*/
public IntegerGroup(final MetaPattern pattern)
{
@@ -55,13 +52,13 @@
}
/**
- * Constructs an IntegerGroup that parses Strings that match the given
- * pattern in the given radix.
+ * Constructs an IntegerGroup that parses Strings that match the given pattern in the given
+ * radix.
*
* @param pattern
- * The capturing pattern
+ * The capturing pattern
* @param radix
- * The radix to use when parsing captured Strings
+ * The radix to use when parsing captured Strings
*/
public IntegerGroup(final MetaPattern pattern, final int radix)
{
@@ -71,7 +68,7 @@
/**
* @param matcher
- * The matcher
+ * The matcher
* @return The value
* @see IntegerGroup#getInt(Matcher, int)
*/
@@ -81,14 +78,13 @@
}
/**
- * Gets an int by parsing the String matched by this capturing group. The
- * IntegerGroup's radix is used in the conversion.
+ * Gets an int by parsing the String matched by this capturing group. The IntegerGroup's radix
+ * is used in the conversion.
*
* @param matcher
- * The matcher
+ * The matcher
* @param defaultValue
- * The default value to use if this group is omitted because it
- * is optional
+ * The default value to use if this group is omitted because it is optional
* @return The parsed int value
*/
public int getInt(final Matcher matcher, final int defaultValue)
@@ -99,7 +95,7 @@
/**
* @param matcher
- * The matcher
+ * The matcher
* @return The value
* @see IntegerGroup#getLong(Matcher)
*/
@@ -109,14 +105,13 @@
}
/**
- * Gets a long by parsing the String matched by this capturing group. The
- * IntegerGroup's radix is used in the conversion. parsing radix.
+ * Gets a long by parsing the String matched by this capturing group. The IntegerGroup's radix
+ * is used in the conversion. parsing radix.
*
* @param defaultValue
- * The default value to use if this group is omitted because it
- * is optional
+ * The default value to use if this group is omitted because it is optional
* @param matcher
- * The matcher
+ * The matcher
* @return The parsed long value
*/
public long getLong(final Matcher matcher, final long defaultValue)