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 [22/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/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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -27,20 +27,18 @@
/**
* Useful class for constructing readable and reusable regular expressions.
* <p>
- * 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
- * object oriented access to capturing group matches.
+ * 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 object oriented access to capturing group matches.
* <p>
- * A given MetaPattern can be converted to a Matcher or Pattern. Groups within
- * the MetaPattern can be used to automatically reference capturing group values
- * when a match is made with a Matcher object.
+ * A given MetaPattern can be converted to a Matcher or Pattern. Groups within the MetaPattern can
+ * be used to automatically reference capturing group values when a match is made with a Matcher
+ * object.
* <p>
- * 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.
- *
+ * 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
@@ -48,8 +46,7 @@
private static final long serialVersionUID = 1L;
/**
- * Compiled regular expression pattern, or null if patterns variable is
- * valid instead
+ * Compiled regular expression pattern, or null if patterns variable is valid instead
*/
private Pattern pattern;
@@ -62,8 +59,8 @@
// Regexps that are used multiple times in defining meta patterns
private static final String _DOUBLE_QUOTED_STRING = "\"[^\"]*?\"";
private static final String _SINGLE_QUOTED_STRING = "'[^']*?\'";
- private static final String _STRING = "(?:[\\w\\-\\.]+|" + _DOUBLE_QUOTED_STRING + "|"
- + _SINGLE_QUOTED_STRING + ")";
+ private static final String _STRING = "(?:[\\w\\-\\.]+|" + _DOUBLE_QUOTED_STRING + "|" +
+ _SINGLE_QUOTED_STRING + ")";
private static final String _OPTIONAL_STRING = _STRING + "?";
private static final String _VARIABLE_NAME = "[A-Za-z_][A-Za-z0-9_]*";
private static final String _XML_NAME = "[A-Za-z_][A-Za-z0-9_.-]*";
@@ -200,8 +197,8 @@
public static final MetaPattern XML_ATTRIBUTE_NAME = new MetaPattern(_XML_NAME);
/** Constant for perl interpolation. */
- public static final MetaPattern PERL_INTERPOLATION = new MetaPattern("$\\{" + _VARIABLE_NAME
- + "\\}");
+ public static final MetaPattern PERL_INTERPOLATION = new MetaPattern("$\\{" + _VARIABLE_NAME +
+ "\\}");
/** Constant for a double quoted string. */
public static final MetaPattern DOUBLE_QUOTED_STRING = new MetaPattern(_DOUBLE_QUOTED_STRING);
@@ -214,7 +211,7 @@
/**
* Constructor for a simple pattern.
- *
+ *
* @param pattern
* The regular expression pattern to compile
*/
@@ -225,7 +222,7 @@
/**
* Copy constructor.
- *
+ *
* @param pattern
* The meta pattern to copy
*/
@@ -238,7 +235,7 @@
/**
* Constructs from an array of MetaPatterns.
- *
+ *
* @param patterns
* Array of MetaPatterns
*/
@@ -249,7 +246,7 @@
/**
* Constructs from a list of MetaPatterns
- *
+ *
* @param patterns
* List of MetaPatterns
*/
@@ -260,7 +257,7 @@
/**
* Creates a matcher against a given input character sequence.
- *
+ *
* @param input
* The input to match against
* @return The matcher
@@ -271,16 +268,15 @@
}
/**
- * Creates a matcher with the given regexp compile flags. Once you call this
- * 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.
- *
+ * Creates a matcher with the given regexp compile flags. Once you call this 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
- * One or more of the standard Java regular expression compile
- * flags (see {@link Pattern#compile(String, int)})
+ * One or more of the standard Java regular expression compile flags (see
+ * {@link Pattern#compile(String, int)})
* @return The matcher
*/
public final Matcher matcher(final CharSequence input, final int flags)
@@ -291,9 +287,8 @@
/**
* Gets the regular expression Pattern for this MetaPattern by compiling it.
- *
- * @return Pattern compiled with default Java regular expression compile
- * flags
+ *
+ * @return Pattern compiled with default Java regular expression compile flags
*/
public final Pattern pattern()
{
@@ -301,14 +296,13 @@
}
/**
- * Gets the regular expression Pattern for this MetaPattern by compiling it
- * using the given flags.
- *
+ * 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)})
- * @return Equivalent Java regular expression Pattern compiled with the
- * given flags
+ * One or more of the standard Java regular expression compile flags (see
+ * {@link Pattern#compile(String, int)})
+ * @return Equivalent Java regular expression Pattern compiled with the given flags
*/
public final Pattern pattern(final int flags)
{
@@ -318,7 +312,7 @@
/**
* Converts this MetaPattern to a String.
- *
+ *
* @return A String representing this MetaPattern
* @see java.lang.Object#toString()
*/
@@ -341,10 +335,10 @@
/**
* 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)})
+ * One or more of the standard Java regular expression compile flags (see
+ * {@link Pattern#compile(String, int)})
*/
private synchronized void compile(final int flags)
{
@@ -356,9 +350,9 @@
}
/**
- * Binds this MetaPattern to one or more capturing groups. Since
- * MetaPatterns can nest, the binding process can recurse.
- *
+ * 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/OptionalMetaPattern.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/OptionalMetaPattern.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/OptionalMetaPattern.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/OptionalMetaPattern.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
import java.util.List;
/**
- * Makes any MetaPattern optional by enclosing the pattern in an optionality
- * expression. The expression will be something equivalent to "(?:<pattern>)?".
+ * Makes any MetaPattern optional by enclosing the pattern in an optionality expression. The
+ * expression will be something equivalent to "(?:<pattern>)?".
*
* @author Jonathan Locke
*/
@@ -42,7 +42,7 @@
* Constructor
*
* @param pattern
- * MetaPattern to make optional
+ * MetaPattern to make optional
*/
public OptionalMetaPattern(final MetaPattern pattern)
{
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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -27,10 +27,9 @@
* <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>
+ * <li>Empty list elements like "a,," are not supported. It'll return the "a" only.</li>
* </ul>
- *
+ *
* @author Jonathan Locke
*/
public final class CommaSeparatedVariableParser extends ListParser
@@ -40,9 +39,9 @@
MetaPattern.OPTIONAL_WHITESPACE, MetaPattern.STRING, MetaPattern.OPTIONAL_WHITESPACE });
/**
- * Construct a new parser with parameter 'input' to be parsed. Base classes
- * provide the method to access the elements of the input parsed.
- *
+ * 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/ListParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java Mon Oct 15 14:21:25 2007
@@ -25,8 +25,8 @@
/**
- * Parses an arbitrary list format with a pattern for list entries and a pattern
- * for list separators.
+ * Parses an arbitrary list format with a pattern for list entries and a pattern for list
+ * separators.
*
* @author Jonathan Locke
*/
@@ -42,8 +42,8 @@
private final List values = new ArrayList();
/**
- * Constructs a list parser from an entry MetaPattern, a separator
- * MetaPattern and an input character sequence.
+ * Constructs a list parser from an entry MetaPattern, a separator MetaPattern and an input
+ * character sequence.
*
* @param entryPattern
* The pattern in between the separators
@@ -61,8 +61,7 @@
}
/**
- * Parse the input and add the elements to an internal list to be accessed
- * by
+ * Parse the input and add the elements to an internal list to be accessed by
*
* @see #getValues()
* @see org.apache.wicket.util.parse.metapattern.parsers.MetaPatternParser#matches()
@@ -92,8 +91,8 @@
}
/**
- * Gets the parsed values. It depends on the elements pattern, whether empty
- * elements, double or single quotes or escape characters are supported.
+ * Gets the parsed values. It depends on the elements pattern, whether empty elements, double or
+ * single quotes or escape characters are supported.
*
* @return the parsed values
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/MetaPatternParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/MetaPatternParser.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/MetaPatternParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/MetaPatternParser.java Mon Oct 15 14:21:25 2007
@@ -35,8 +35,8 @@
private final int length;
/**
- * The position (index) behind the last pattern group matched while
- * advancing from one pattern group to the next one.
+ * The position (index) behind the last pattern group matched while advancing from one pattern
+ * group to the next one.
*/
private int pos;
@@ -80,8 +80,8 @@
}
/**
- * Advance parsing to the next element. The internal cursor will be moved to
- * end of the string matched.
+ * Advance parsing to the next element. The internal cursor will be moved to end of the string
+ * matched.
*
* @param pattern
* Meta pattern
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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -21,11 +21,10 @@
import org.apache.wicket.util.parse.metapattern.OptionalMetaPattern;
/**
- * Parses XML tag names and attribute names which may include optional
- * 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).
- *
+ * Parses XML tag names and attribute names which may include optional 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 +43,7 @@
/**
* Constructs a tag name parser for a given input character sequence.
- *
+ *
* @param input
* The input to parse
*/
@@ -54,11 +53,9 @@
}
/**
- * Get the namespace part (eg 'html' in 'html:form') converted to all lower
- * case characters.
- *
- * @return the namespace part. Will be null, if optional namespace was not
- * found
+ * Get the namespace part (eg 'html' in 'html:form') converted to all lower case characters.
+ *
+ * @return the namespace part. Will be null, if optional namespace was not found
*/
public String getNamespace()
{
@@ -72,7 +69,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/VariableAssignmentParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java Mon Oct 15 14:21:25 2007
@@ -21,9 +21,9 @@
import org.apache.wicket.util.parse.metapattern.OptionalMetaPattern;
/**
- * Parses key value assignment statements like "foo=bar" but also supporting
- * namespaces like "wicket:foo=bar". However the 'key' value returned will
- * contain "wicket:foo". It does not separate namespace and name.
+ * Parses key value assignment statements like "foo=bar" but also supporting namespaces like
+ * "wicket:foo=bar". However the 'key' value returned will contain "wicket:foo". It does not
+ * separate namespace and name.
*
* @author Jonathan Locke
*/
@@ -41,8 +41,7 @@
private final Group value;
/**
- * Construct a variable assignment parser against a given input character
- * sequence
+ * Construct a variable assignment parser against a given input character sequence
*
* @param input
* The input to parse
@@ -53,8 +52,7 @@
}
/**
- * Construct a variable assignment parser against a given input character
- * sequence
+ * Construct a variable assignment parser against a given input character sequence
*
* @param input
* The input to parse
@@ -79,8 +77,8 @@
}
/**
- * Gets the key part (eg 'foo' in 'foo=bar'). The key will include the
- * optional namespace (eg 'html:foo' in 'html:foo=bar').
+ * Gets the key part (eg 'foo' in 'foo=bar'). The key will include the optional namespace (eg
+ * 'html:foo' in 'html:foo=bar').
*
* @return The key part
*/
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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -23,14 +23,13 @@
* 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
{
/**
- * Make it a group to be able to access the word without surrounding
- * whitespace
+ * Make it a group to be able to access the word without surrounding whitespace
*/
private static final Group word = new Group(MetaPattern.WORD);
@@ -40,7 +39,7 @@
/**
* Construct.
- *
+ *
* @param input
* to parse
*/
@@ -51,7 +50,7 @@
/**
* 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/AbstractStringResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/AbstractStringResourceStream.java Mon Oct 15 14:21:25 2007
@@ -38,10 +38,10 @@
/** MIME content type */
private final String contentType;
-
+
/** The last time this stylesheet was modified */
private Time lastModified = null;
-
+
/**
* Constructor.
*/
@@ -49,12 +49,12 @@
{
this("text");
}
-
+
/**
* Constructor.
*
- * @param contentType The mime type of this resource, such as "image/jpeg" or
- * "text/html"
+ * @param contentType
+ * The mime type of this resource, such as "image/jpeg" or "text/html"
*/
public AbstractStringResourceStream(final String contentType)
{
@@ -67,7 +67,7 @@
public void close() throws IOException
{
}
-
+
/**
* @see org.apache.wicket.util.resource.IResourceStream#getContentType()
*/
@@ -99,24 +99,25 @@
}
return new ByteArrayInputStream(bytes);
}
-
+
/**
* @see org.apache.wicket.util.watch.IModifiable#lastModifiedTime()
*/
public Time lastModifiedTime()
{
return lastModified;
- }
-
+ }
+
/**
- * @param lastModified The lastModified to set.
+ * @param lastModified
+ * The lastModified to set.
*/
public void setLastModified(Time lastModified)
{
this.lastModified = lastModified;
}
- /**
+ /**
* @return The string resource
*/
protected abstract String getString();
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/FileResourceStream.java Mon Oct 15 14:21:25 2007
@@ -27,12 +27,14 @@
/**
* A FileResourceStream is an IResource implementation for files.
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream
* @see org.apache.wicket.util.watch.IModifiable
* @author Jonathan Locke
*/
-public class FileResourceStream extends AbstractResourceStream implements IFixedLocationResourceStream
+public class FileResourceStream extends AbstractResourceStream
+ implements
+ IFixedLocationResourceStream
{
private static final long serialVersionUID = 1L;
@@ -44,7 +46,7 @@
/**
* Constructor.
- *
+ *
* @param file
* {@link File} containing resource
*/
@@ -55,7 +57,7 @@
/**
* Constructor.
- *
+ *
* @param file
* {@link java.io.File} containing resource
*/
@@ -66,7 +68,7 @@
/**
* Closes this resource.
- *
+ *
* @throws IOException
*/
public void close() throws IOException
@@ -96,10 +98,9 @@
}
/**
- * @return A readable input stream for this resource. The same input stream
- * is returned until <tt>FileResourceStream.close()</tt> is
- * invoked.
- *
+ * @return A readable input stream for this resource. The same input stream is returned until
+ * <tt>FileResourceStream.close()</tt> is invoked.
+ *
* @throws ResourceStreamNotFoundException
*/
public InputStream getInputStream() throws ResourceStreamNotFoundException
@@ -112,8 +113,8 @@
}
catch (FileNotFoundException e)
{
- throw new ResourceStreamNotFoundException("Resource " + file
- + " could not be found", e);
+ throw new ResourceStreamNotFoundException("Resource " + file +
+ " could not be found", e);
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IFixedLocationResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IFixedLocationResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IFixedLocationResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IFixedLocationResourceStream.java Mon Oct 15 14:21:25 2007
@@ -17,10 +17,9 @@
package org.apache.wicket.util.resource;
/**
- * Non-dynamic resource streams point to fixed locations, like a file or a url.
- * Such resources should implement this interface and provide clients with
- * information about the resource location, such that the client is able to
- * deduct e.g. an extension or URL schema.
+ * Non-dynamic resource streams point to fixed locations, like a file or a url. Such resources
+ * should implement this interface and provide clients with information about the resource location,
+ * such that the client is able to deduct e.g. an extension or URL schema.
*
* @author eelcohillenius
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IResourceStream.java Mon Oct 15 14:21:25 2007
@@ -27,17 +27,14 @@
/**
- * Interface to a streamed resource. The resource stream can be retrieved by
- * calling getInputStream(), but the resource should later be closed by calling
- * close() on the IResourceStream (as opposed to calling close on the
- * InputStream returned by getInputStream()).
+ * Interface to a streamed resource. The resource stream can be retrieved by calling
+ * getInputStream(), but the resource should later be closed by calling close() on the
+ * IResourceStream (as opposed to calling close on the InputStream returned by getInputStream()).
* <p>
- * Once a resource has been closed with a call to close(), it is normally
- * possible to call getInputStream() again to retrieve a new input stream on the
- * same resource.
+ * Once a resource has been closed with a call to close(), it is normally possible to call
+ * getInputStream() again to retrieve a new input stream on the same resource.
* <p>
- * Implementations of this interface are typically unsafe for use from multiple
- * threads.
+ * Implementations of this interface are typically unsafe for use from multiple threads.
*
* @author Jonathan Locke
*/
@@ -46,10 +43,8 @@
/**
* Gets the mime type of this resource
*
- * @return The mime type of this resource, such as "image/jpeg" or
- * "text/html". Return null to let
- * {@link ResourceStreamRequestTarget} handle the Content-Type
- * automatically
+ * @return The mime type of this resource, such as "image/jpeg" or "text/html". Return null to
+ * let {@link ResourceStreamRequestTarget} handle the Content-Type automatically
* @see WebResponse#detectContentType(org.apache.wicket.RequestCycle, String)
*/
String getContentType();
@@ -62,8 +57,8 @@
long length();
/**
- * Gets the resource stream. You should not directly close this stream.
- * Instead call the close() method on IResourceStream.
+ * Gets the resource stream. You should not directly close this stream. Instead call the close()
+ * method on IResourceStream.
*
* @see IResourceStream#close()
* @return Returns the inputStream.
@@ -72,8 +67,8 @@
InputStream getInputStream() throws ResourceStreamNotFoundException;
/**
- * Closes the resource. Normally, this includes closing any underlying input
- * stream returned by getInputStream().
+ * Closes the resource. Normally, this includes closing any underlying input stream returned by
+ * getInputStream().
*
* @throws IOException
*/
@@ -85,8 +80,8 @@
Locale getLocale();
/**
- * This method shouldn't be used for the outside, It is used by the Loaders
- * to set the resolved locale.
+ * This method shouldn't be used for the outside, It is used by the Loaders to set the resolved
+ * locale.
*
* @param locale
* The Locale where this stream did resolve to.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IStringResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IStringResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IStringResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/IStringResourceStream.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,7 @@
import java.nio.charset.Charset;
/**
- * A resource that can be converted to a String representation, possibly using
- * an explicit Charset.
+ * A resource that can be converted to a String representation, possibly using an explicit Charset.
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/PackageResourceStream.java Mon Oct 15 14:21:25 2007
@@ -27,9 +27,9 @@
/**
- * An {@link IResourceStream} that reads data from a resource in the classpath.
- * It simply delegates all operations to the {@link IResourceStream} returned by
- * the application's {@link IResourceStreamLocator}.
+ * An {@link IResourceStream} that reads data from a resource in the classpath. It simply delegates
+ * all operations to the {@link IResourceStream} returned by the application's
+ * {@link IResourceStreamLocator}.
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
@@ -46,8 +46,8 @@
* {@link IResourceStreamLocator#locate(Class, String)}
*
* @param scope
- * This argument will be used to get the class loader for loading
- * the package resource, and to determine what package it is in.
+ * This argument will be used to get the class loader for loading the package
+ * resource, and to determine what package it is in.
* @param path
* The path to the resource
*/
@@ -59,8 +59,8 @@
if (resourceStream == null)
{
- throw new WicketRuntimeException("Cannot find resource with " + scope.getName()
- + " and path " + path);
+ throw new WicketRuntimeException("Cannot find resource with " + scope.getName() +
+ " and path " + path);
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringBufferResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringBufferResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringBufferResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringBufferResourceStream.java Mon Oct 15 14:21:25 2007
@@ -42,8 +42,7 @@
* Constructor.
*
* @param contentType
- * The mime type of this resource, such as "image/jpeg" or
- * "text/html"
+ * The mime type of this resource, such as "image/jpeg" or "text/html"
*/
public StringBufferResourceStream(final String contentType)
{
@@ -80,6 +79,7 @@
/**
* Clears the string buffer resource.
+ *
* @return this for chaining
*/
public StringBufferResourceStream clear()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java Mon Oct 15 14:21:25 2007
@@ -18,7 +18,7 @@
/**
- * A StringResourceStream is an IResource implementation for strings.
+ * A StringResourceStream is an IResource implementation for strings.
*
* @see org.apache.wicket.util.resource.IResourceStream
* @see org.apache.wicket.util.watch.IModifiable
@@ -30,7 +30,7 @@
/** The string resource */
private final CharSequence string;
-
+
/**
* Construct.
*
@@ -41,14 +41,14 @@
{
this.string = string;
}
-
+
/**
* Construct.
*
* @param string
* The resource string
- * @param contentType The mime type of this resource, such as "image/jpeg" or
- * "text/html"
+ * @param contentType
+ * The mime type of this resource, such as "image/jpeg" or "text/html"
*/
public StringResourceStream(final CharSequence string, final String contentType)
{
@@ -71,7 +71,7 @@
{
return toString();
}
-
+
/**
* @see org.apache.wicket.util.resource.AbstractResourceStream#asString()
*/
@@ -87,5 +87,5 @@
{
return string.length();
}
-
+
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java Mon Oct 15 14:21:25 2007
@@ -66,6 +66,7 @@
/**
* Not implemented, throws {@link WicketRuntimeException}
+ *
* @see org.apache.wicket.util.resource.IResourceStream#length()
*/
public long length()
@@ -98,7 +99,8 @@
in = context.getResourceAsStream(url);
if (in == null)
{
- throw new ResourceStreamNotFoundException("The requested resource was not found: " + url);
+ throw new ResourceStreamNotFoundException("The requested resource was not found: " +
+ url);
}
return in;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/XSLTResourceStream.java Mon Oct 15 14:21:25 2007
@@ -25,21 +25,18 @@
import java.util.Map.Entry;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.util.resource.AbstractResourceStream;
-import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.time.Time;
/**
- * {@link IResourceStream} that applies XSLT on an input {@link IResourceStream}.
- * The XSL stylesheet itself is also an {@link IResourceStream}. Override
- * {@link #getParameters()} to pass parameters to the XSL stylesheet.
+ * {@link IResourceStream} that applies XSLT on an input {@link IResourceStream}. The XSL
+ * stylesheet itself is also an {@link IResourceStream}. Override {@link #getParameters()} to pass
+ * parameters to the XSL stylesheet.
*
* <p>
- * FIXME experimental feature, does not implement any kind of caching, use with
- * care, running an XSL transformation for every request is very expensive!
- * Please have a look at {@link ZipResourceStream} for an in-depth explanation
- * of what needs to be done with respect to caching.
+ * FIXME experimental feature, does not implement any kind of caching, use with care, running an XSL
+ * transformation for every request is very expensive! Please have a look at
+ * {@link ZipResourceStream} for an in-depth explanation of what needs to be done with respect to
+ * caching.
* </p>
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
@@ -53,8 +50,8 @@
ByteArrayOutputStream out;
/**
- * @return a {@link Map} of XSLT parameters, appropriate for passing
- * information to the XSL stylesheet
+ * @return a {@link Map} of XSLT parameters, appropriate for passing information to the XSL
+ * stylesheet
*/
protected Map getParameters()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java Mon Oct 15 14:21:25 2007
@@ -37,21 +37,21 @@
* An IResourceStream that ZIPs a directory's contents on the fly
*
* <p>
- * <b>NOTE 1.</b> Nested directories are not supported yet, and a
- * {@link FileNotFoundException} will be thrown in that case.
+ * <b>NOTE 1.</b> Nested directories are not supported yet, and a {@link FileNotFoundException}
+ * will be thrown in that case.
* </p>
*
* <p>
- * <b>NOTE 2.</b> As a future improvement, cache a map of generated ZIP files
- * for every directory and use a Watcher to detect modifications in this
- * directory. Using ehcache would be good for that, but it's not in Wicket
- * dependencies yet. <b>No caching of the generated ZIP files is done yet.</b>
+ * <b>NOTE 2.</b> As a future improvement, cache a map of generated ZIP files for every directory
+ * and use a Watcher to detect modifications in this directory. Using ehcache would be good for
+ * that, but it's not in Wicket dependencies yet. <b>No caching of the generated ZIP files is done
+ * yet.</b>
* </p>
*
* <p>
- * <b>NOTE 3.</b> As a future improvement, implement getLastModified() and
- * request ResourceStreamRequestTarget to generate Last-Modified and Expires
- * HTTP headers. <b>No HTTP cache headers are provided yet</b>. See WICKET-385
+ * <b>NOTE 3.</b> As a future improvement, implement getLastModified() and request
+ * ResourceStreamRequestTarget to generate Last-Modified and Expires HTTP headers. <b>No HTTP cache
+ * headers are provided yet</b>. See WICKET-385
* </p>
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
@@ -71,8 +71,8 @@
* Construct.
*
* @param dir
- * The directory where to look for files. The directory itself
- * will not be included in the ZIP.
+ * The directory where to look for files. The directory itself will not be included
+ * in the ZIP.
*/
public ZipResourceStream(File dir)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ExtensionResourceNameIterator.java Mon Oct 15 14:21:25 2007
@@ -22,9 +22,9 @@
/**
- * Contains the logic to build the various combinations of file path, style and
- * locale required while searching for Wicket resources. The full filename will
- * be built like: <path>_<style>_<locale>.<extension>.
+ * Contains the logic to build the various combinations of file path, style and locale required
+ * while searching for Wicket resources. The full filename will be built like:
+ * <path>_<style>_<locale>.<extension>.
* <p>
* Resource matches will be attempted in the following order:
* <ol>
@@ -34,8 +34,8 @@
* <li>4. <path>.<extension></li>
* </ol>
* <p>
- * Locales may contain a language, a country and a region or variant.
- * Combinations of these components will be attempted in the following order:
+ * Locales may contain a language, a country and a region or variant. Combinations of these
+ * components will be attempted in the following order:
* <ol>
* <li>locale.toString() see javadoc for Locale for more details</li>
* <li><language>_<country></li>
@@ -51,7 +51,7 @@
private final String path;
private final String[] extensions;
-
+
private int index;
/**
@@ -81,7 +81,7 @@
}
}
}
-
+
this.path = path;
this.index = 0;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/IResourceStreamLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/IResourceStreamLocator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/IResourceStreamLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/IResourceStreamLocator.java Mon Oct 15 14:21:25 2007
@@ -29,13 +29,12 @@
public interface IResourceStreamLocator
{
/**
- * Loads a resource, given a path and class. Typically this method is either
- * called by external clients if they are not interested in a lookup that
- * takes the style and locale into account, or it is called by the
- * implementation of {@link #locate(Class, String, String, Locale, String)}
- * where the latter just takes care of trying out the different combinations
- * for the provided style and locale and uses this method to actually load
- * the resource stream.
+ * Loads a resource, given a path and class. Typically this method is either called by external
+ * clients if they are not interested in a lookup that takes the style and locale into account,
+ * or it is called by the implementation of
+ * {@link #locate(Class, String, String, Locale, String)} where the latter just takes care of
+ * trying out the different combinations for the provided style and locale and uses this method
+ * to actually load the resource stream.
*
* @param clazz
* The class loader for delegating the loading of the resource
@@ -54,8 +53,7 @@
* @param path
* The path of the resource
* @param style
- * Any resource style, such as a skin style (see
- * {@link org.apache.wicket.Session})
+ * Any resource style, such as a skin style (see {@link org.apache.wicket.Session})
* @param locale
* The locale of the resource to load
* @param extension
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/LocaleResourceNameIterator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/LocaleResourceNameIterator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/LocaleResourceNameIterator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/LocaleResourceNameIterator.java Mon Oct 15 14:21:25 2007
@@ -23,9 +23,9 @@
/**
- * Contains the logic to build the various combinations of file path, style and
- * locale required while searching for Wicket resources. The full filename will
- * be built like: <path>_<style>_<locale>.<extension>.
+ * Contains the logic to build the various combinations of file path, style and locale required
+ * while searching for Wicket resources. The full filename will be built like:
+ * <path>_<style>_<locale>.<extension>.
* <p>
* Resource matches will be attempted in the following order:
* <ol>
@@ -35,8 +35,8 @@
* <li>4. <path>.<extension></li>
* </ol>
* <p>
- * Locales may contain a language, a country and a region or variant.
- * Combinations of these components will be attempted in the following order:
+ * Locales may contain a language, a country and a region or variant. Combinations of these
+ * components will be attempted in the following order:
* <ol>
* <li>locale.toString() see javadoc for Locale for more details</li>
* <li><language>_<country></li>
@@ -58,8 +58,8 @@
private int state = 0;
/**
- * While iterating the various combinations, it will always contain the
- * current combination used to create the path
+ * While iterating the various combinations, it will always contain the current combination used
+ * to create the path
*/
private Locale currentLocale;
@@ -106,7 +106,7 @@
state = 999;
return path;
}
-
+
// 1. Apply Locale default toString() implementation. See Locale.
if (state == 0)
{
@@ -140,7 +140,7 @@
if (state == 2)
{
this.state++;
-
+
if (!Strings.isEmpty(language))
{
this.currentLocale = new Locale(language);
@@ -150,7 +150,7 @@
// 4. The path only; without locale
this.state++;
-
+
this.currentLocale = null;
return path;
}
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=584925&r1=584924&r2=584925&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 14:21:25 2007
@@ -21,7 +21,7 @@
/**
* OSGI specific resource stream factory
- *
+ *
* @author Juergen Donnerstag
*/
public class OsgiResourceStreamLocator extends ResourceStreamLocator
@@ -35,7 +35,7 @@
/**
* Construct.
- *
+ *
* @param finder
*/
public OsgiResourceStreamLocator(final IResourceFinder finder)
@@ -44,8 +44,9 @@
}
/**
- *
- * @see org.apache.wicket.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class, java.lang.String)
+ *
+ * @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/resource/locator/ResourceNameIterator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceNameIterator.java Mon Oct 15 14:21:25 2007
@@ -25,9 +25,8 @@
/**
* Contains the logic to locate a resource based on a path, a style (see
- * {@link org.apache.wicket.Session}), a locale and a extension strings. The full filename
- * will be built like:
- * <path>_<style>_<locale>.<extension>.
+ * {@link org.apache.wicket.Session}), a locale and a extension strings. The full filename will be
+ * built like: <path>_<style>_<locale>.<extension>.
* <p>
* Resource matches will be attempted in the following order:
* <ol>
@@ -37,8 +36,8 @@
* <li>4. <path>.<extension></li>
* </ol>
* <p>
- * Locales may contain a language, a country and a region or variant.
- * Combinations of these components will be attempted in the following order:
+ * Locales may contain a language, a country and a region or variant. Combinations of these
+ * components will be attempted in the following order:
* <ol>
* <li>locale.toString() see javadoc for Locale for more details</li>
* <li><language>_<country></li>
@@ -130,7 +129,7 @@
{
// Get the next Locale from the iterator and start the next
// inner iterator over again.
- String newPath = (String) this.localeIterator.next();
+ String newPath = (String)this.localeIterator.next();
this.currentLocale = this.localeIterator.getLocale();
this.extenstionsIterator = new ExtensionResourceNameIterator(newPath,
this.extensions);
@@ -146,12 +145,12 @@
// variations
while (this.styleIterator.hasNext())
{
- String newPath = (String) this.styleIterator.next();
+ String newPath = (String)this.styleIterator.next();
this.localeIterator = new LocaleResourceNameIterator(newPath, this.locale);
while (this.localeIterator.hasNext())
{
- newPath = (String) this.localeIterator.next();
+ newPath = (String)this.localeIterator.next();
this.currentLocale = this.localeIterator.getLocale();
this.extenstionsIterator = new ExtensionResourceNameIterator(newPath,
this.extensions);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java Mon Oct 15 14:21:25 2007
@@ -31,9 +31,8 @@
* Locate Wicket resource.
* <p>
* Contains the logic to locate a resource based on a path, a style (see
- * {@link org.apache.wicket.Session}), a locale and an extension string. The
- * full filename will be built like:
- * <path>_<style>_<locale>.<extension>.
+ * {@link org.apache.wicket.Session}), a locale and an extension string. The full filename will be
+ * built like: <path>_<style>_<locale>.<extension>.
* <p>
* Resource matches will be attempted in the following order:
* <ol>
@@ -43,8 +42,8 @@
* <li>4. <path>.<extension></li>
* </ol>
* <p>
- * Locales may contain a language, a country and a region or variant.
- * Combinations of these components will be attempted in the following order:
+ * Locales may contain a language, a country and a region or variant. Combinations of these
+ * components will be attempted in the following order:
* <ol>
* <li>locale.toString() see javadoc for Locale for more details</li>
* <li><language>_<country></li>
@@ -108,8 +107,7 @@
/**
*
* @see org.apache.wicket.util.resource.locator.IResourceStreamLocator#locate(java.lang.Class,
- * java.lang.String, java.lang.String, java.util.Locale,
- * java.lang.String)
+ * java.lang.String, java.lang.String, java.util.Locale, java.lang.String)
*/
public IResourceStream locate(final Class clazz, String path, final String style,
final Locale locale, final String extension)
@@ -163,8 +161,8 @@
// Log attempt
if (log.isDebugEnabled())
{
- log.debug("Attempting to locate resource '" + path + "' using classloader "
- + classLoader);
+ log.debug("Attempting to locate resource '" + path + "' using classloader " +
+ classLoader);
}
// Try loading path using classloader
@@ -177,8 +175,7 @@
}
/**
- * Search the resource by means of the application registered resource
- * finder
+ * Search the resource by means of the application registered resource finder
*
* @param clazz
* @param path
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/StyleAndVariationResourceNameIterator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/StyleAndVariationResourceNameIterator.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/StyleAndVariationResourceNameIterator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/StyleAndVariationResourceNameIterator.java Mon Oct 15 14:21:25 2007
@@ -19,9 +19,9 @@
import java.util.Iterator;
/**
- * Contains the logic to build the various combinations of file path, style and
- * locale required while searching for Wicket resources. The full filename will
- * be built like: <path>_<style>_<locale>.<extension>.
+ * Contains the logic to build the various combinations of file path, style and locale required
+ * while searching for Wicket resources. The full filename will be built like:
+ * <path>_<style>_<locale>.<extension>.
* <p>
* Resource matches will be attempted in the following order:
* <ol>
@@ -31,8 +31,8 @@
* <li>4. <path>.<extension></li>
* </ol>
* <p>
- * Locales may contain a language, a country and a region or variant.
- * Combinations of these components will be attempted in the following order:
+ * Locales may contain a language, a country and a region or variant. Combinations of these
+ * components will be attempted in the following order:
* <ol>
* <li>locale.toString() see javadoc for Locale for more details</li>
* <li><language>_<country></li>
@@ -63,7 +63,8 @@
* @param style
* @param variation
*/
- public StyleAndVariationResourceNameIterator(final String path, final String style, final String variation)
+ public StyleAndVariationResourceNameIterator(final String path, final String style,
+ final String variation)
{
this.path = path;
this.style = style;
@@ -93,7 +94,7 @@
return path + '_' + style + '_' + variation;
}
}
-
+
if (state == 1)
{
state++;
@@ -102,7 +103,7 @@
return path + '_' + style;
}
}
-
+
state = 3;
return path;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/AbstractStringList.java Mon Oct 15 14:21:25 2007
@@ -21,22 +21,18 @@
import java.util.List;
/**
- * An abstract base class for string list implementations. Besides having an
- * implementation for IStringSequence (iterator(), get(int index) and size()),
- * an AbstractStringList can be converted to a String array or a List of
- * Strings.
+ * An abstract base class for string list implementations. Besides having an implementation for
+ * IStringSequence (iterator(), get(int index) and size()), an AbstractStringList can be converted
+ * to a String array or a List of Strings.
* <p>
- * The total length of all Strings in the list can be determined by calling
- * totalLength().
+ * The total length of all Strings in the list can be determined by calling totalLength().
* <p>
- * Strings or a subset of Strings in the list can be formatted using three
- * join() methods:
+ * Strings or a subset of Strings in the list can be formatted using three join() methods:
* <p>
* <ul>
* <li>join(String) Joins strings together using a given separator
* <li>join() Joins Strings using comma as a separator
- * <li>join(int first, int last, String) Joins a sublist of strings using a
- * given separator
+ * <li>join(int first, int last, String) Joins a sublist of strings using a given separator
* </ul>
*
* @author Jonathan Locke
@@ -69,8 +65,8 @@
public abstract String get(int index);
/**
- * Returns this String sequence as an array of Strings. Subclasses may
- * provide a more efficient implementation than the one provided here.
+ * Returns this String sequence as an array of Strings. Subclasses may provide a more efficient
+ * implementation than the one provided here.
*
* @return An array containing exactly this sequence of Strings
*/
@@ -92,8 +88,8 @@
}
/**
- * Returns this String sequence as an array of Strings. Subclasses may
- * provide a more efficient implementation than the one provided here.
+ * Returns this String sequence as an array of Strings. Subclasses may provide a more efficient
+ * implementation than the one provided here.
*
* @return An array containing exactly this sequence of Strings
*/
@@ -134,9 +130,8 @@
}
/**
- * Joins this sequence of strings using a comma separator. For example, if
- * this sequence contains [1 2 3], the result of calling this method will be
- * "1, 2, 3".
+ * Joins this sequence of strings using a comma separator. For example, if this sequence
+ * contains [1 2 3], the result of calling this method will be "1, 2, 3".
*
* @return The joined String
*/