You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 22:18:41 UTC
svn commit: r584893 [2/10] - in
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: ./ ajax/
ajax/form/ ajax/markup/html/navigation/paging/ application/ behavior/
feedback/ markup/ markup/html/ markup/html/body/ markup/html/border/
markup/htm...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java Mon Oct 15 13:18:27 2007
@@ -21,389 +21,429 @@
/**
- * This class is an utility class that perform wilcard-patterns matching and isolation.
- *
+ * This class is an utility class that perform wildcard-patterns matching and isolation.
+ *
* @version $Id: WildcardMatcherHelper.java 420832 2006-07-11 13:11:02Z cziegeler $
*/
-public class WildcardMatcherHelper {
- //~ Static fields/initializers -----------------------------------------------------------------
-
- /** Default path separator: "/" */
- public static final char ESC = '\\';
-
- /** Default path separator: "/" */
- public static final char PATHSEP = '/';
-
- /** Default path separator: "/" */
- public static final char STAR = '*';
-
- //~ Methods ------------------------------------------------------------------------------------
-
- /**
- * Match a pattern agains a string and isolates wildcard replacement into a <code>Map</code>.
- * <br>
- * Here is how the matching algorithm works:
- *
- * <ul>
- * <li>
- * The '*' character, meaning that zero or more characters (excluding the path separator '/')
- * are to be matched.
- * </li>
- * <li>
- * The '**' sequence, meaning that zero or more characters (including the path separator '/')
- * are to be matched.
- * </li>
- * <li>
- * The '\*' sequence is honored as a litteral '*' character, not a wildcard
- * </li>
- * </ul>
- * <br>
- * When more than two '*' characters, not separated by another character, are found their value is
- * considered as '**' and immediate succeeding '*' are skipped.
- * <br>
- * The '**' wildcard is greedy and thus the following sample cannot match:
- * <dl>
- * <dt>pattern</dt>
- * <dd>STAR,STAR,PATHSEP,STAR,PATHSEP,STAR,STAR (why can't I express it litterally?)</dt>
- * <dt>string</dt>
- * <dd>foo/bar/baz/bug</dt>
- * </dl>
- * The first '**' in the pattern will suck up until the last '/' in string and thus will not match.
- * <br>
- * A more advance algorithm could cerainly check whether there is an other literal later in the pattern to ev. match in string
- * but I'll leave this exercise to someone else ATM if one needs such.
- *
- * @param pat The pattern string.
- * @param str The string to math agains the pattern
- *
- * @return a <code>Map</code> containing the representation of the extracted pattern. The extracted patterns are
- * keys in the <code>Map</code> from left to right beginning with "1" for te left most, "2" for the next,
- * a.s.o. The key "0" is the string itself. If the return value is null, string does not match to the
- * pattern .
- */
- public static Map match(final String pat,
- final String str) {
- final Matcher map = new Matcher(pat, str);
-
- if(map.isMatch()) {
- return map.getMap();
- }
-
- return null;
- }
-
- //~ Inner Classes ------------------------------------------------------------------------------
-
- /**
- * The private matcher class
- */
- private static class Matcher {
- //~ Instance fields ------------------------------------------------------------------------
-
- /** The character array of the pattern */
- private final char[] apat;
-
- /** The length of the character array of the pattern */
- private final int lpat;
-
- /** The character array of the string */
- private final char[] astr;
-
- /** The length of the character array of the string */
- private final int lstr;
-
- /** The <code>Map</code> to be filled */
- private final Map map = new HashMap();
-
- /** Whether string matched to pattern */
- private final boolean matched;
-
- /** map index */
- private int idx = 0;
-
- /** index into pattern */
- private int ipat = 0;
-
- /** index into string */
- private int istr = 0;
-
- //~ Constructors ---------------------------------------------------------------------------
-
- /**
- * Creates a new Matcher object.
- *
- * @param pat The pattern
- * @param str The string
- */
- public Matcher(final String pat,
- final String str) {
- apat = pat.toCharArray();
- lpat = apat.length;
- astr = str.toCharArray();
- lstr = astr.length;
- add(str);
- matched = match();
- }
-
- //~ Methods --------------------------------------------------------------------------------
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Map getMap() {
- return map;
- }
-
- /**
- * Has it matched?
- *
- * @return whether it has matched
- */
- public boolean isMatch() {
- return matched;
- }
-
- /**
- * Add a extracted substring to the map
- *
- * @param aStr The extracted substring
- */
- private void add(final String aStr) {
- map.put(String.valueOf(idx++), aStr);
- }
-
- /**
- * Scans the pattern and the search string from the start toward the end
- *
- * @return wether the pstring matches the pattern
- */
- private boolean match() {
- // scan a common literal prefix
- scanLiteralPrefix();
-
- // if we are already at the end of both strings
- // than the pattern matched
- if(ipat >= lpat && istr >= lstr)
+public class WildcardMatcherHelper
+{
+ // ~ Static fields/initializers
+ // -----------------------------------------------------------------
+
+ /** Default path separator: "/" */
+ public static final char ESC = '\\';
+
+ /** Default path separator: "/" */
+ public static final char PATHSEP = '/';
+
+ /** Default path separator: "/" */
+ public static final char STAR = '*';
+
+ // ~ Methods
+ // ------------------------------------------------------------------------------------
+
+ /**
+ * Match a pattern against a string and isolates wildcard replacement into a <code>Map</code>.
+ * <br>
+ * Here is how the matching algorithm works:
+ *
+ * <ul>
+ * <li> The '*' character, meaning that zero or more characters (excluding the path separator
+ * '/') are to be matched. </li>
+ * <li> The '**' sequence, meaning that zero or more characters (including the path separator
+ * '/') are to be matched. </li>
+ * <li> The '\*' sequence is honored as a literal '*' character, not a wildcard </li>
+ * </ul>
+ * <br>
+ * When more than two '*' characters, not separated by another character, are found their value
+ * is considered as '**' and immediate succeeding '*' are skipped. <br>
+ * The '**' wildcard is greedy and thus the following sample cannot match:
+ * <dl>
+ * <dt>pattern</dt>
+ * <dd>STAR,STAR,PATHSEP,STAR,PATHSEP,STAR,STAR (why can't I express it literally?)</dt>
+ * <dt>string</dt>
+ * <dd>foo/bar/baz/bug</dt>
+ * </dl>
+ * The first '**' in the pattern will suck up until the last '/' in string and thus will not
+ * match. <br>
+ * A more advance algorithm could certainly check whether there is an other literal later in the
+ * pattern to ev. match in string but I'll leave this exercise to someone else ATM if one needs
+ * such.
+ *
+ * @param pat
+ * The pattern string.
+ * @param str
+ * The string to math against the pattern
+ *
+ * @return a <code>Map</code> containing the representation of the extracted pattern. The
+ * extracted patterns are keys in the <code>Map</code> from left to right beginning
+ * with "1" for the left most, "2" for the next, a.s.o. The key "0" is the string
+ * itself. If the return value is null, string does not match to the pattern .
+ */
+ public static Map match(final String pat, final String str)
+ {
+ final Matcher map = new Matcher(pat, str);
+
+ if (map.isMatch())
+ {
+ return map.getMap();
+ }
+
+ return null;
+ }
+
+ // ~ Inner Classes
+ // ------------------------------------------------------------------------------
+
+ /**
+ * The private matcher class
+ */
+ private static class Matcher
+ {
+ // ~ Instance fields
+ // ------------------------------------------------------------------------
+
+ /** The character array of the pattern */
+ private final char[] apat;
+
+ /** The length of the character array of the pattern */
+ private final int lpat;
+
+ /** The character array of the string */
+ private final char[] astr;
+
+ /** The length of the character array of the string */
+ private final int lstr;
+
+ /** The <code>Map</code> to be filled */
+ private final Map map = new HashMap();
+
+ /** Whether string matched to pattern */
+ private final boolean matched;
+
+ /** map index */
+ private int idx = 0;
+
+ /** index into pattern */
+ private int ipat = 0;
+
+ /** index into string */
+ private int istr = 0;
+
+ // ~ Constructors
+ // ---------------------------------------------------------------------------
+
+ /**
+ * Creates a new Matcher object.
+ *
+ * @param pat
+ * The pattern
+ * @param str
+ * The string
+ */
+ public Matcher(final String pat, final String str)
+ {
+ apat = pat.toCharArray();
+ lpat = apat.length;
+ astr = str.toCharArray();
+ lstr = astr.length;
+ add(str);
+ matched = match();
+ }
+
+ // ~ Methods
+ // --------------------------------------------------------------------------------
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public Map getMap()
+ {
+ return map;
+ }
+
+ /**
+ * Has it matched?
+ *
+ * @return whether it has matched
+ */
+ public boolean isMatch()
+ {
+ return matched;
+ }
+
+ /**
+ * Add a extracted substring to the map
+ *
+ * @param aStr
+ * The extracted substring
+ */
+ private void add(final String aStr)
+ {
+ map.put(String.valueOf(idx++), aStr);
+ }
+
+ /**
+ * Scans the pattern and the search string from the start toward the end
+ *
+ * @return whether the string matches the pattern
+ */
+ private boolean match()
+ {
+ // scan a common literal prefix
+ scanLiteralPrefix();
+
+ // if we are already at the end of both strings
+ // than the pattern matched
+ if (ipat >= lpat && istr >= lstr)
{
return true;
}
- // if hole string has matched the pattern so far and the rest of the pattern only has wildcard(s)
- // we match too otherwise we clearly don't match
- if(ipat < lpat && istr >= lstr) {
- while(ipat < lpat && apat[ipat] == STAR)
+ // if hole string has matched the pattern so far and the rest of the pattern only has
+ // wildcard(s)
+ // we match too otherwise we clearly don't match
+ if (ipat < lpat && istr >= lstr)
+ {
+ while (ipat < lpat && apat[ipat] == STAR)
{
ipat++;
}
- if(ipat >= lpat) {
- add("");
+ if (ipat >= lpat)
+ {
+ add("");
- return true;
- } else {
- return false;
- }
- }
-
- // if hole pattern has matched the string so far but the string has more characters left
- // we don't match
- if(ipat >= lpat && istr < lstr)
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ // if hole pattern has matched the string so far but the string has more characters left
+ // we don't match
+ if (ipat >= lpat && istr < lstr)
{
return false;
}
- // if we have not stopped at a wildcard character
- // a character doesn't match and thus we do not match at all
- if(apat[ipat] != STAR)
+ // if we have not stopped at a wildcard character
+ // a character doesn't match and thus we do not match at all
+ if (apat[ipat] != STAR)
{
return false;
}
- // if it is a double (or more) wildcard pattern
- if(ipat < lpat - 1 && apat[ipat + 1] == STAR) {
- // skip to first non star charater in the pattern
- while(++ipat < lpat && apat[ipat] == STAR)
+ // if it is a double (or more) wildcard pattern
+ if (ipat < lpat - 1 && apat[ipat + 1] == STAR)
+ {
+ // skip to first non star character in the pattern
+ while (++ipat < lpat && apat[ipat] == STAR)
{
;
}
- // if we are at the end of the pattern we've matched and are finish scanning
- if(ipat >= lpat) {
- add(new String(astr, istr, lstr - istr));
+ // if we are at the end of the pattern we've matched and are finish scanning
+ if (ipat >= lpat)
+ {
+ add(new String(astr, istr, lstr - istr));
- return true;
- }
+ return true;
+ }
- // Now we need to scan for the end of the literal characters in the pattern
- final int sipat = ipat; // start position of a literal character used for substring operations
+ // Now we need to scan for the end of the literal characters in the pattern
+ final int sipat = ipat; // start position of a literal character used for substring
+ // operations
- while(ipat < lpat && (apat[ipat] != STAR || (ipat > 0 && apat[ipat - 1] == ESC)))
+ while (ipat < lpat && (apat[ipat] != STAR || (ipat > 0 && apat[ipat - 1] == ESC)))
{
ipat++;
}
- // if we reached the end of the pattern just do a string compare with the corresponding part from
- // the end of the string
- if(ipat >= lpat) {
- return checkEnds(sipat, false);
- }
-
- // Now we need to check whether the litteral substring of the pattern
- // is contained in the string somewhere
- final int l = ipat - sipat;
- int eistr = lstr - l;
+ // if we reached the end of the pattern just do a string compare with the
+ // corresponding part from
+ // the end of the string
+ if (ipat >= lpat)
+ {
+ return checkEnds(sipat, false);
+ }
- // beause the '**' wildcard need to be greedy we scan from the end of the string for a match
- while(istr < eistr && ! strncmp(apat, sipat, astr, eistr, l))
+ // Now we need to check whether the literal substring of the pattern
+ // is contained in the string somewhere
+ final int l = ipat - sipat;
+ int eistr = lstr - l;
+
+ // because the '**' wildcard need to be greedy we scan from the end of the string
+ // for a match
+ while (istr < eistr && !strncmp(apat, sipat, astr, eistr, l))
{
eistr--;
}
- if(istr >= eistr)
+ if (istr >= eistr)
{
return false;
}
- add(new String(astr, istr, eistr - istr));
- istr = eistr + l;
- } else {// if it is a single star pattern
- // skip the star
- ++ipat;
-
- // if we are at the beginning of the pattern we have to check there is no PATH_SEP in string
- if(ipat >= lpat) {
- final int sistr = istr;
+ add(new String(astr, istr, eistr - istr));
+ istr = eistr + l;
+ }
+ else
+ {// if it is a single star pattern
+ // skip the star
+ ++ipat;
+
+ // if we are at the beginning of the pattern we have to check there is no PATH_SEP
+ // in string
+ if (ipat >= lpat)
+ {
+ final int sistr = istr;
- while(istr < lstr && (astr[istr] != PATHSEP))
+ while (istr < lstr && (astr[istr] != PATHSEP))
{
istr++;
}
- if(istr >= lstr) {
- add(new String(astr, sistr, lstr - sistr));
+ if (istr >= lstr)
+ {
+ add(new String(astr, sistr, lstr - sistr));
- return true;
- }
+ return true;
+ }
- // otherwise we do not match
- return false;
- }
-
- // Now we need to search for the start of either a path sparator or another wildcard characters
- // in the pattern
- final int sipat = ipat;
-
- while(ipat < lpat &&
- apat[ipat] != STAR &&
- (apat[ipat] != ESC || ipat < lpat - 1 && apat[ipat + 1] != STAR) &&
- apat[ipat] != PATHSEP) {
- ipat++;
- }
-
- // if we reached the end of the pattern just do a string compare with the corresponding part from
- // the end of the string
- if(ipat >= lpat) {
- return checkEnds(sipat, true);
- }
-
- // If we stopped at an other wildcard
- // we exclude it from being compared
- if(apat[ipat] == STAR) {
- ipat--;
- }
-
- // Now we need to check whether the litteral substring of the pattern
- // is contained in the string somewhere
- final int l = ipat- sipat + 1;
- final int sistr = istr;
+ // otherwise we do not match
+ return false;
+ }
- while(istr < lstr && ! strncmp(apat, sipat, astr, istr, l))
+ // Now we need to search for the start of either a path separator or another
+ // wildcard characters
+ // in the pattern
+ final int sipat = ipat;
+
+ while (ipat < lpat && apat[ipat] != STAR &&
+ (apat[ipat] != ESC || ipat < lpat - 1 && apat[ipat + 1] != STAR) &&
+ apat[ipat] != PATHSEP)
+ {
+ ipat++;
+ }
+
+ // if we reached the end of the pattern just do a string compare with the
+ // corresponding part from
+ // the end of the string
+ if (ipat >= lpat)
+ {
+ return checkEnds(sipat, true);
+ }
+
+ // If we stopped at an other wildcard
+ // we exclude it from being compared
+ if (apat[ipat] == STAR)
+ {
+ ipat--;
+ }
+
+ // Now we need to check whether the literal substring of the pattern
+ // is contained in the string somewhere
+ final int l = ipat - sipat + 1;
+ final int sistr = istr;
+
+ while (istr < lstr && !strncmp(apat, sipat, astr, istr, l))
{
istr++;
}
- if(istr >= lstr)
+ if (istr >= lstr)
{
return false;
}
- add(new String(astr, sistr, istr - sistr));
- ipat++;
- istr += l;
- }
-
- return match();
- }
-
- /**
- * Scan a possible common suffix
- */
- private final void scanLiteralPrefix() {
- // scan a common literal suffix
- while(ipat < lpat &&
- istr < lstr &&
- (apat[ipat] == ESC && ipat < lpat - 1 && apat[ipat + 1] == STAR && apat[++ipat] == astr[istr] ||
- apat[ipat] != STAR &&
- apat[ipat] == astr[istr])) {
- ipat++;
- istr++;
- }
- }
-
- /**
- * Compare two charater array from individual offsets
- *
- * @param a1 The first character array
- * @param o1 The offset into the first character array
- * @param a2 The second character array
- * @param o2 The offset into the second character array
- * @param l The length to compare
- *
- * @return Whether the all the mentioned characters match each other
- */
- private final boolean strncmp(final char[] a1,
- final int o1,
- final char[] a2,
- final int o2,
- final int l) {
- int i = 0;
+ add(new String(astr, sistr, istr - sistr));
+ ipat++;
+ istr += l;
+ }
+
+ return match();
+ }
+
+ /**
+ * Scan a possible common suffix
+ */
+ private final void scanLiteralPrefix()
+ {
+ // scan a common literal suffix
+ while (ipat < lpat &&
+ istr < lstr &&
+ (apat[ipat] == ESC && ipat < lpat - 1 && apat[ipat + 1] == STAR &&
+ apat[++ipat] == astr[istr] || apat[ipat] != STAR &&
+ apat[ipat] == astr[istr]))
+ {
+ ipat++;
+ istr++;
+ }
+ }
+
+ /**
+ * Compare two character array from individual offsets
+ *
+ * @param a1
+ * The first character array
+ * @param o1
+ * The offset into the first character array
+ * @param a2
+ * The second character array
+ * @param o2
+ * The offset into the second character array
+ * @param l
+ * The length to compare
+ *
+ * @return Whether the all the mentioned characters match each other
+ */
+ private final boolean strncmp(final char[] a1, final int o1, final char[] a2, final int o2,
+ final int l)
+ {
+ int i = 0;
- while(i < l && o1 + i < a1.length && o2 + i < a2.length && a1[o1 + i] == a2[o2 + i])
+ while (i < l && o1 + i < a1.length && o2 + i < a2.length && a1[o1 + i] == a2[o2 + i])
{
i++;
}
- return i == l;
- }
-
- private final boolean checkEnds(final int sipat, final boolean isSingleStart)
- {
- // if the remaining length of the string isn't the same as that found in the pattern
- // we do not match
- final int l = lpat - sipat; // calculate length of comparison
- final int ostr = lstr - l; // calculate offset into string
- if(ostr >= 0 && strncmp(apat, sipat, astr, ostr, l)) {
- if( isSingleStart )
- {
- // if the ends matches make sure there isn't a PATHSEP in the candidate string part
- int i = ostr - istr;
- while( i > istr )
- {
- if( astr[--i] == PATHSEP )
- {
- return false; // we cannot match because of a PATHSEP in the matched part
- }
- }
- }
- add(new String(astr, istr, ostr - istr));
-
- return true;
- }
-
- // otherwise we do not match
- return false;
- }
- }
+ return i == l;
+ }
+
+ private final boolean checkEnds(final int sipat, final boolean isSingleStart)
+ {
+ // if the remaining length of the string isn't the same as that found in the pattern
+ // we do not match
+ final int l = lpat - sipat; // calculate length of comparison
+ final int ostr = lstr - l; // calculate offset into string
+ if (ostr >= 0 && strncmp(apat, sipat, astr, ostr, l))
+ {
+ if (isSingleStart)
+ {
+ // if the ends matches make sure there isn't a PATHSEP in the candidate string
+ // part
+ int i = ostr - istr;
+ while (i > istr)
+ {
+ if (astr[--i] == PATHSEP)
+ {
+ return false; // we cannot match because of a PATHSEP in the matched
+ // part
+ }
+ }
+ }
+ add(new String(astr, istr, ostr - istr));
+
+ return true;
+ }
+
+ // otherwise we do not match
+ return false;
+ }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Mon Oct 15 13:18:27 2007
@@ -24,9 +24,8 @@
import org.apache.wicket.markup.html.IHeaderResponse;
/**
- * Abstract class for handling Ajax roundtrips. This class serves as a base for
- * javascript specific implementations, like ones based on Dojo or
- * Scriptaculous, or Wicket's default.
+ * Abstract class for handling Ajax roundtrips. This class serves as a base for javascript specific
+ * implementations, like ones based on Dojo or Scriptaculous, or Wicket's default.
*
* @author Eelco Hillenius
* @author Ralf Ebert
@@ -64,17 +63,17 @@
throw new IllegalArgumentException("Argument hostComponent must be not null");
}
- if (this.component != null)
+ if (component != null)
{
- throw new IllegalStateException("this kind of handler cannot be attached to "
- + "multiple components; it is already attached to component " + this.component
- + ", but component " + hostComponent + " wants to be attached too");
+ throw new IllegalStateException("this kind of handler cannot be attached to " +
+ "multiple components; it is already attached to component " + component +
+ ", but component " + hostComponent + " wants to be attached too");
}
- this.component = hostComponent;
+ component = hostComponent;
- // call the calback
+ // call the callback
onBind();
}
@@ -92,8 +91,8 @@
* Gets the url that references this handler.
*
* @param onlyTargetActivePage
- * if true the callback to this behavior will be ignore if the
- * page is not the last one the user accessed
+ * if true the callback to this behavior will be ignore if the page is not the last
+ * one the user accessed
*
* @return the url that references this handler
*/
@@ -104,9 +103,9 @@
throw new IllegalArgumentException(
"Behavior must be bound to a component to create the URL");
}
-
+
final RequestListenerInterface rli;
-
+
if (onlyTargetActivePage)
{
rli = IActivePageBehaviorListener.INTERFACE;
@@ -115,7 +114,7 @@
{
rli = IBehaviorListener.INTERFACE;
}
-
+
return getComponent().urlFor(this, rli);
}
@@ -154,9 +153,8 @@
}
/**
- * Called any time a component that has this handler registered is rendering
- * the component tag. Use this method e.g. to bind to javascript event
- * handlers of the tag
+ * Called any time a component that has this handler registered is rendering the component tag.
+ * Use this method e.g. to bind to javascript event handlers of the tag
*
* @param tag
* the tag that is rendered
@@ -166,17 +164,16 @@
}
/**
- * Called when the component was bound to it's host component. You can get
- * the bound host component by calling getComponent.
+ * Called when the component was bound to it's host component. You can get the bound host
+ * component by calling getComponent.
*/
protected void onBind()
{
}
/**
- * Called to indicate that the component that has this handler registered
- * has been rendered. Use this method to do any cleaning up of temporary
- * state
+ * Called to indicate that the component that has this handler registered has been rendered. Use
+ * this method to do any cleaning up of temporary state
*/
protected void onComponentRendered()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java Mon Oct 15 13:18:27 2007
@@ -22,8 +22,8 @@
import org.apache.wicket.markup.html.IHeaderResponse;
/**
- * Adapter implementation of {@link org.apache.wicket.behavior.IBehavior}. It
- * is recommended to extend from this class instead of directly implementing
+ * Adapter implementation of {@link org.apache.wicket.behavior.IBehavior}. It is recommended to
+ * extend from this class instead of directly implementing
* {@link org.apache.wicket.behavior.IBehavior} as this class has an extra clean
*
* @author Ralf Ebert
@@ -59,9 +59,8 @@
/**
* This method is called either by {@link #onRendered(Component)} or
- * {@link #onException(Component, RuntimeException)} AFTER they called their
- * respective template methods. Override this template method to do any
- * necessary cleanup.
+ * {@link #onException(Component, RuntimeException)} AFTER they called their respective template
+ * methods. Override this template method to do any necessary cleanup.
*/
public void cleanup()
{
@@ -108,13 +107,12 @@
}
/**
- * In case an unexpected exception happened anywhere between
- * onComponentTag() and rendered(), onException() will be called for any
- * behavior.
+ * In case an unexpected exception happened anywhere between onComponentTag() and rendered(),
+ * onException() will be called for any behavior.
*
* @param component
- * the component that has a reference to this behavior and during
- * which processing the exception occured
+ * the component that has a reference to this behavior and during which processing
+ * the exception occurred
* @param exception
* the unexpected exception
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractHeaderContributor.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractHeaderContributor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractHeaderContributor.java Mon Oct 15 13:18:27 2007
@@ -20,9 +20,8 @@
import org.apache.wicket.markup.html.IHeaderResponse;
/**
- * Behaviour that delegates header contribution to a number of other
- * contributors. It checks the contributions that were made in the same request
- * to avoid double contributions.
+ * Behavior that delegates header contribution to a number of other contributors. It checks the
+ * contributions that were made in the same request to avoid double contributions.
*
* @author Eelco Hillenius
*/
@@ -63,7 +62,7 @@
for (int i = 0; i < contributors.length; i++)
{
- if (response.wasRendered(contributors[i]) == false)
+ if (response.wasRendered(contributors[i]) == false)
{
contributors[i].renderHead(response);
response.markRendered(contributors[i]);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java Mon Oct 15 13:18:27 2007
@@ -21,17 +21,14 @@
import org.apache.wicket.markup.ComponentTag;
/**
- * Behaviors are kind of plug-ins for Components. They allow to be added to a
- * component and get essential events forwarded by the component. they can be
- * bound to a concrete component (using the bind method is called when the
- * behavior is attached), but they don't need to. They can modify the components
- * markup by changing the rendered ComponentTag. Behaviors can have their own
- * models as well, and they are notified when these are to be detached by the
- * component.
+ * Behaviors are kind of plug-ins for Components. They allow to be added to a component and get
+ * essential events forwarded by the component. they can be bound to a concrete component (using the
+ * bind method is called when the behavior is attached), but they don't need to. They can modify the
+ * components markup by changing the rendered ComponentTag. Behaviors can have their own models as
+ * well, and they are notified when these are to be detached by the component.
* <p>
- * It is recommended that you extend from
- * {@link org.apache.wicket.behavior.AbstractBehavior} instead of directly
- * implementing this interface.
+ * It is recommended that you extend from {@link org.apache.wicket.behavior.AbstractBehavior}
+ * instead of directly implementing this interface.
* </p>
*
* @see org.apache.wicket.behavior.IBehaviorListener
@@ -60,15 +57,14 @@
* the component that has this behavior coupled
*/
void afterRender(Component component);
-
+
/**
- * Bind this handler to the given component. This method is called by the
- * host component immediately after this behavior is added to it. This
- * method is useful if you need to do initialization based on the component
- * it is attached and you can't wait to do it at render time. Keep in mind
- * that if you decide to keep a reference to the host component, it is not
- * thread safe anymore, and should thus only be used in situations where you
- * do not reuse the behavior for multiple components.
+ * Bind this handler to the given component. This method is called by the host component
+ * immediately after this behavior is added to it. This method is useful if you need to do
+ * initialization based on the component it is attached and you can't wait to do it at render
+ * time. Keep in mind that if you decide to keep a reference to the host component, it is not
+ * thread safe anymore, and should thus only be used in situations where you do not reuse the
+ * behavior for multiple components.
*
* @param component
* the component to bind to
@@ -76,32 +72,30 @@
void bind(Component component);
/**
- * Allows the behavior to detach any state it has attached during request
- * processing.
+ * Allows the behavior to detach any state it has attached during request processing.
*
* @param component
- * the component that initiates the detachement of this behavior
+ * the component that initiates the detachment of this behavior
*/
void detach(Component component);
/**
- * In case an unexpected exception happened anywhere between
- * onComponentTag() and rendered(), onException() will be called for any
- * behavior. Typically, if you clean up resources in
- * {@link #afterRender(Component)}, you should do the same in the
- * implementation of this method.
+ * In case an unexpected exception happened anywhere between onComponentTag() and rendered(),
+ * onException() will be called for any behavior. Typically, if you clean up resources in
+ * {@link #afterRender(Component)}, you should do the same in the implementation of this
+ * method.
*
* @param component
- * the component that has a reference to this behavior and during
- * which processing the exception occured
+ * the component that has a reference to this behavior and during which processing
+ * the exception occurred
* @param exception
* the unexpected exception
*/
void exception(Component component, RuntimeException exception);
/**
- * This method returns false if the behaviour generates a callback url (for
- * example ajax behaviours)
+ * This method returns false if the behavior generates a callback url (for example ajax
+ * behaviors)
*
* @param component
* the component that has this behavior coupled.
@@ -111,19 +105,18 @@
boolean getStatelessHint(Component component);
/**
- * Called when a components is rendering and wants to render this behavior.
- * If false is returned this behavior will be ignored.
+ * Called when a components is rendering and wants to render this behavior. If false is returned
+ * this behavior will be ignored.
*
* @param component
* the component that has this behavior coupled
*
- * @return true if this behaviour must be executed/rendered
+ * @return true if this behavior must be executed/rendered
*/
boolean isEnabled(Component component);
/**
- * Called any time a component that has this behavior registered is
- * rendering the component tag.
+ * Called any time a component that has this behavior registered is rendering the component tag.
*
* @param component
* the component that renders this tag currently
@@ -133,10 +126,9 @@
void onComponentTag(Component component, ComponentTag tag);
/**
- * Specifies whether or not this behavior is temporary. Temporary behaviors
- * are removed at the end of request. Such behaviors are useful for
- * modifying component rendering only when it renders next. Usecases include
- * javascript effects, initial clientside dom setup, etc.
+ * Specifies whether or not this behavior is temporary. Temporary behaviors are removed at the
+ * end of request. Such behaviors are useful for modifying component rendering only when it
+ * renders next. Usecases include javascript effects, initial clientside dom setup, etc.
*
* @return true if this behavior is temporary
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java Mon Oct 15 13:18:27 2007
@@ -31,8 +31,7 @@
/**
- * Holds list of feedback messages. The list can be added to, cleared, queried
- * and filtered.
+ * Holds list of feedback messages. The list can be added to, cleared, queried and filtered.
* <p>
* WARNING: This class should typically NOT be used directly.
* <p>
@@ -83,11 +82,10 @@
}
/**
- * Clears all messsages that are accepted by the filter.
+ * Clears all messages that are accepted by the filter.
*
* @param filter
- * Filter for selecting messages. If null, all messages will be
- * returned
+ * Filter for selecting messages. If null, all messages will be returned
* @return The number of messages deleted
*/
public final int clear(final IFeedbackMessageFilter filter)
@@ -145,13 +143,12 @@
}
/**
- * Convenience method that looks up whether the given component registered a
- * message with this list with the level ERROR.
+ * Convenience method that looks up whether the given component registered a message with this
+ * list with the level ERROR.
*
* @param component
* the component to look up whether it registered a message
- * @return whether the given component registered a message with this list
- * with level ERROR
+ * @return whether the given component registered a message with this list with level ERROR
*/
public final boolean hasErrorMessageFor(Component component)
{
@@ -181,15 +178,14 @@
}
/**
- * Looks up whether the given component registered a message with this list
- * with the given level.
+ * Looks up whether the given component registered a message with this list with the given
+ * level.
*
* @param component
* The component to look up whether it registered a message
* @param level
* The level of the message
- * @return Whether the given component registered a message with this list
- * with the given level
+ * @return Whether the given component registered a message with this list with the given level
*/
public final boolean hasMessageFor(Component component, int level)
{
@@ -235,8 +231,8 @@
*
* @param component
* the component to look up the message for
- * @return the message that is found for the given component (first match)
- * or null if none was found
+ * @return the message that is found for the given component (first match) or null if none was
+ * found
*/
public final FeedbackMessage messageForComponent(final Component component)
{
@@ -255,8 +251,7 @@
* Gets a list of messages from the page using a filter.
*
* @param filter
- * Filter for selecting messages. If null, all messages will be
- * returned
+ * Filter for selecting messages. If null, all messages will be returned
* @return The messages or an empty list if no messages are found
*/
public final List messages(final IFeedbackMessageFilter filter)
@@ -292,8 +287,7 @@
* Gets the number of messages.
*
* @param filter
- * Filter for counting messages. If null, the count of all
- * messages will be returned
+ * Filter for counting messages. If null, the count of all messages will be returned
*
* @return the number of messages
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java Mon Oct 15 13:18:27 2007
@@ -61,7 +61,7 @@
}
/**
- * Constructor. Creates a model for all feedback messags accepted by the given filter.
+ * Constructor. Creates a model for all feedback messages accepted by the given filter.
*
* @param filter
* The filter to apply
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java Mon Oct 15 13:18:27 2007
@@ -33,12 +33,12 @@
/**
* A list of markup elements associated with a Markup. Might be all elements of
* a markup resource, might be just the elements associated with a specific tag.
- *
+ *
* @see org.apache.wicket.markup.MarkupResourceData
* @see org.apache.wicket.markup.MarkupElement
* @see org.apache.wicket.markup.ComponentTag
* @see org.apache.wicket.markup.RawMarkup
- *
+ *
* @author Juergen Donnerstag
*/
public class Markup
@@ -68,7 +68,7 @@
/**
* Constructor
- *
+ *
* @param markupResourceData
* The associated Markup
*/
@@ -82,7 +82,7 @@
* For Wicket it would be sufficient for this method to be package
* protected. However to allow wicket-bench easy access to the information
* ...
- *
+ *
* @param index
* Index into markup list
* @return Markup element
@@ -94,7 +94,7 @@
/**
* Gets the associate markup
- *
+ *
* @return The associated markup
*/
public final MarkupResourceData getMarkupResourceData()
@@ -106,7 +106,7 @@
* For Wicket it would be sufficient for this method to be package
* protected. However to allow wicket-bench easy access to the information
* ...
- *
+ *
* @return Number of markup elements
*/
public int size()
@@ -116,7 +116,7 @@
/**
* Add a MarkupElement
- *
+ *
* @param markupElement
*/
final public void addMarkupElement(final MarkupElement markupElement)
@@ -126,7 +126,7 @@
/**
* Add a MarkupElement
- *
+ *
* @param pos
* @param markupElement
*/
@@ -136,7 +136,7 @@
}
/**
- * Make all tags immutable and the list of elements unmodifable.
+ * Make all tags immutable and the list of elements unmodifiable.
*/
final void makeImmutable()
{
@@ -157,7 +157,7 @@
/**
* Add the tag to the local cache if open or open-close and if wicket:id is
* present
- *
+ *
* @param index
* @param tag
*/
@@ -197,7 +197,7 @@
/**
* Set the components path within the markup and add the component tag to
* the local cache
- *
+ *
* @param componentPath
* @param tag
* @return componentPath
@@ -262,7 +262,7 @@
/**
* Find the markup element index of the component with 'path'
- *
+ *
* @param path
* The component path expression
* @param id
@@ -281,7 +281,7 @@
// for each list item. E.g. list:0:label. What we currently do is simply
// remove the number from the path and hope that no user uses an integer
// for a component id. This is a hack only. A much better solution would
- // delegate to the various components recursivly to search within there
+ // delegate to the various components recursively to search within there
// realm only for the components markup. ListItems could then simply
// do nothing and delegate to their parents.
String completePath = (path == null || path.length() == 0 ? id : path + ":" + id);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java Mon Oct 15 13:18:27 2007
@@ -44,9 +44,9 @@
* <p>
* MarkupCache is registered with {@link IMarkupSettings} and thus can be replaced with a subclassed
* version.
- *
+ *
* @see IMarkupSettings
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
@@ -72,7 +72,7 @@
/**
* Constructor.
- *
+ *
* @param application
*/
public MarkupCache(Application application)
@@ -95,7 +95,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.markup.IMarkupCache#shutdown()
*/
public void shutdown()
@@ -240,7 +240,7 @@
/**
* Get a unmodifiable map which contains the cached data. The map key is of type String and the
* value is of type Markup.
- *
+ *
* @return
*/
protected final ICache getMarkupCache()
@@ -250,10 +250,10 @@
/**
* THIS IS NOT PART OF WICKET'S PUBLIC API. DO NOT USE IT.
- *
+ *
* I still don't like this method being part of the API but I didn't find a suitable other
* solution.
- *
+ *
* @see org.apache.wicket.markup.IMarkupCache#getMarkup(org.apache.wicket.MarkupContainer,
* java.lang.Class, boolean)
*/
@@ -323,7 +323,7 @@
* Subclasses may change the default implementation. E.g. they might choose not update the cache
* to enforce reloading of any markup not found. This might be useful in very dynamic
* environments.
- *
+ *
* @param cacheKey
* @param container
* @return Markup.NO_MARKUP
@@ -342,7 +342,7 @@
/**
* Put the markup into the cache if cacheKey is not null and the cache does not yet contain the
* cacheKey. Return the markup stored in the cache if cacheKey is present already.
- *
+ *
* @param cacheKey
* If null, than ignore the cache
* @param markup
@@ -374,9 +374,9 @@
/**
* Wicket's default implementation just uses the cacheKey to retrieve the markup from the cache.
- * More sofisticated implementations may call a container method to e.g. ignore the cached
+ * More sophisticated implementations may call a container method to e.g. ignore the cached
* markup under certain situations.
- *
+ *
* @param cacheKey
* If null, than the cache will be ignored
* @param container
@@ -393,7 +393,7 @@
/**
* Loads markup from a resource stream.
- *
+ *
* @param container
* The original requesting markup container
* @param markupResourceStream
@@ -437,7 +437,7 @@
* Load markup from an IResourceStream and add an {@link IChangeListener}to the
* {@link ModificationWatcher} so that if the resource changes, we can remove it from the cache
* automatically and subsequently reload when needed.
- *
+ *
* @param container
* The original requesting markup container
* @param markupResourceStream
@@ -485,7 +485,7 @@
/**
* Get the markup cache key provider to be used
- *
+ *
* @param container
* The MarkupContainer requesting the markup resource stream
* @return IMarkupResourceStreamProvider
@@ -506,7 +506,7 @@
/**
* Get the markup resource stream provider to be used
- *
+ *
* @param container
* The MarkupContainer requesting the markup resource stream
* @return IMarkupResourceStreamProvider
@@ -528,7 +528,7 @@
/**
* In case there is a need to extend the default chain of MarkupLoaders
- *
+ *
* @return MarkupLoader
*/
protected IMarkupLoader getMarkupLoader()
@@ -543,7 +543,7 @@
/**
* Allows you to change the map implementation which will hold the cache data. By default it is
* a ConcurrentHashMap() in order to allow multiple thread to access the data in a secure way.
- *
+ *
* @return
*/
protected ICache newCacheImplementation()
@@ -554,7 +554,7 @@
/**
* MarkupCache allows you to implement you own cache implementation. ICache is the interface the
* implementation must comply with.
- *
+ *
* @see MarkupCache
*/
public interface ICache
@@ -566,7 +566,7 @@
/**
* Remove an entry from the cache.
- *
+ *
* @param key
* @return true, if found and removed
*/
@@ -574,7 +574,7 @@
/**
* Get the cache element associated with the key
- *
+ *
* @param key
* @return
*/
@@ -582,14 +582,14 @@
/**
* Get all the keys referencing cache entries
- *
+ *
* @return
*/
Collection getKeys();
/**
* Check if key is in the cache
- *
+ *
* @param key
* @return
*/
@@ -597,14 +597,14 @@
/**
* Get the number of cache entries
- *
+ *
* @return
*/
int size();
/**
* Put an entry into the cache
- *
+ *
* @param key
* The reference key to find the element
* @param value
@@ -619,7 +619,7 @@
}
/**
- *
+ *
*/
public class DefaultCacheImplementation implements ICache
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupElement.java Mon Oct 15 13:18:27 2007
@@ -28,7 +28,7 @@
* <li>RawMarkup, which is a section of unparsed markup having no meaning to
* Wicket.
* </ul>
- *
+ *
* @see MarkupResourceData
* @see org.apache.wicket.markup.RawMarkup
* @see ComponentTag
@@ -45,7 +45,7 @@
/**
* Gets whether this element closes the given element.
- *
+ *
* @param open
* The open tag
* @return True if this markup element closes the given open tag
@@ -59,7 +59,7 @@
* This is not an implementation of equals because we don't care about
* hashCodes for MarkupElements yet. Also, this method only compares the
* namespace, name and attributes of the given MarkupElements.
- *
+ *
* @param element
* The markup element to compare with
* @return True if the other element equals this one
@@ -67,13 +67,13 @@
public abstract boolean equalTo(MarkupElement element);
/**
- * @return Gets the charseqence representation of this element
+ * @return Gets the charsequence representation of this element
*/
public abstract CharSequence toCharSequence();
/**
- * Gets a string represenetation.
- *
+ * Gets a string representation.
+ *
* @return A string representation suitable for displaying to the user when
* something goes wrong.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupParser.java Mon Oct 15 13:18:27 2007
@@ -50,12 +50,12 @@
* <p>
* The result will be an Markup object, which is basically a list, containing Wicket relevant tags
* and RawMarkup.
- *
+ *
* @see IMarkupFilter
* @see IMarkupParserFactory
* @see IMarkupSettings
* @see MarkupResourceData
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
*/
@@ -79,7 +79,7 @@
/**
* Constructor.
- *
+ *
* @param resource
* The markup resource (file)
*/
@@ -90,7 +90,7 @@
/**
* Constructor. Usually for testing purposes only
- *
+ *
* @param markup
* The markup resource.
*/
@@ -101,7 +101,7 @@
/**
* Constructor.
- *
+ *
* @param xmlParser
* The streaming xml parser to read and parse the markup
* @param resource
@@ -124,7 +124,7 @@
/**
* In case you want to analyze markup which BY DEFAULT does not use "wicket" to find relevant
* tags.
- *
+ *
* @param namespace
*/
public final void setWicketNamespace(final String namespace)
@@ -135,7 +135,7 @@
/**
* Applications which subclass initFilterChain() might also wish to access the markup resource
* stream.
- *
+ *
* @return The markup resource stream
*/
protected MarkupResourceStream getMarkupResourceStream()
@@ -185,7 +185,7 @@
/**
* By default don't do anything. Subclasses may append additional markup filters if required.
- *
+ *
* @see #appendMarkupFilter(IMarkupFilter)
* @deprecated since 1.3
*/
@@ -196,7 +196,7 @@
/**
* Append a new filter to the list of already pre-configured markup filters.
- *
+ *
* @param filter
* The filter to be appended
*/
@@ -208,7 +208,7 @@
/**
* Append a new filter to the list of already pre-configured markup filters. Add the new filter
* before the "beforeFilter" which is identified by its class.
- *
+ *
* @param filter
* The filter to be appended
* @param beforeFilter
@@ -246,7 +246,7 @@
/**
* Reads and parses markup from a file.
- *
+ *
* @return The markup
* @throws IOException
* @throws ResourceStreamNotFoundException
@@ -271,7 +271,7 @@
/**
* Get the next tag from the markup file
- *
+ *
* @return The next tag
* @throws ParseException
*/
@@ -282,7 +282,7 @@
/**
* Scans the given markup and extracts balancing tags.
- *
+ *
*/
private void parseMarkup()
{
@@ -392,13 +392,13 @@
markup.addMarkupElement(new RawMarkup(rawMarkup));
}
- // Make all tags immutable and the list of elements unmodifable
+ // Make all tags immutable and the list of elements unmodifiable
markup.makeImmutable();
}
/**
- * Remove whitespaces from the raw markup
- *
+ * Remove whitespace from the raw markup
+ *
* @param rawMarkup
* @return rawMarkup
*/
@@ -426,7 +426,7 @@
nonPre = nonPre.replaceAll("( ?[\\r\\n] ?)+", "\n");
// Don't create a StringBuffer if we don't actually need one.
- // This optimises the trivial common case where there is no <pre>
+ // This optimizes the trivial common case where there is no <pre>
// tag at all down to just doing the replaceAlls above.
if (lastend == 0)
{
@@ -456,8 +456,8 @@
/**
* Remove all comment sections (<!-- .. -->) from the raw markup. For reasons I don't
* understand, the following regex <code>"<!--(.|\n|\r)*?-->"<code>
- * causes a stack overflow in some circumstances (jdk 1.5)
- *
+ * causes a stack overflow in some circumstances (jdk 1.5)
+ *
* @param rawMarkup
* @return raw markup
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java Mon Oct 15 13:18:27 2007
@@ -29,7 +29,7 @@
/**
* An IResourceStream implementation with specific extensions for markup
* resource streams.
- *
+ *
* @author Juergen Donnerstag
*/
public class MarkupResourceStream implements IResourceStream
@@ -56,14 +56,14 @@
/**
* Construct.
- *
+ *
* @param resourceStream
*/
public MarkupResourceStream(final IResourceStream resourceStream)
{
this.resourceStream = resourceStream;
- this.containerInfo = null;
- this.markupClassName = null;
+ containerInfo = null;
+ markupClassName = null;
if (resourceStream == null)
{
@@ -73,7 +73,7 @@
/**
* Construct.
- *
+ *
* @param resourceStream
* @param containerInfo
* @param markupClass
@@ -83,7 +83,7 @@
{
this.resourceStream = resourceStream;
this.containerInfo = containerInfo;
- this.markupClassName = markupClass == null ? null : markupClass.getName();
+ markupClassName = markupClass == null ? null : markupClass.getName();
if (resourceStream == null)
{
@@ -92,7 +92,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#close()
*/
public void close() throws IOException
@@ -101,7 +101,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#getContentType()
*/
public String getContentType()
@@ -110,7 +110,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#getInputStream()
*/
public InputStream getInputStream() throws ResourceStreamNotFoundException
@@ -119,7 +119,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#getLocale()
*/
public Locale getLocale()
@@ -128,7 +128,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.watch.IModifiable#lastModifiedTime()
*/
public Time lastModifiedTime()
@@ -137,7 +137,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#length()
*/
public long length()
@@ -146,7 +146,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.util.resource.IResourceStream#setLocale(java.util.Locale)
*/
public void setLocale(Locale locale)
@@ -157,7 +157,7 @@
/**
* Get the actual component class the markup is directly associated with.
* Note: it not necessarily must be the container class.
- *
+ *
* @return The directly associated class
*/
public Class getMarkupClass()
@@ -166,8 +166,8 @@
}
/**
- * Get the container infos associated with the markup
- *
+ * Get the container info associated with the markup
+ *
* @return ContainerInfo
*/
public ContainerInfo getContainerInfo()
@@ -194,7 +194,7 @@
}
/**
- *
+ *
* @see java.lang.Object#toString()
*/
public String toString()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Mon Oct 15 13:18:27 2007
@@ -21,7 +21,7 @@
/**
- * A stream of {@link org.apache.wicket.markup.MarkupElement}s, subclases of
+ * A stream of {@link org.apache.wicket.markup.MarkupElement}s, subclasses of
* which are {@link org.apache.wicket.markup.ComponentTag} and
* {@link org.apache.wicket.markup.RawMarkup}. A markup stream has a current
* index in the list of markup elements. The next markup element can be
@@ -31,7 +31,7 @@
* The current markup element can be accessed with get() and as a ComponentTag
* with getTag().
* <p>
- * The stream can be seeked to a particular location with setCurrentIndex().
+ * The stream can be sought to a particular location with setCurrentIndex().
* <p>
* Convenience methods also exist to skip component tags (and any potentially
* nested markup) or raw markup.
@@ -41,7 +41,7 @@
* <p>
* The resource from which the markup was loaded can be retrieved with
* getResource().
- *
+ *
* @author Jonathan Locke
*/
public final class MarkupStream
@@ -57,7 +57,7 @@
/**
* Constructor
- *
+ *
* @param markup
* List of markup elements
*/
@@ -127,7 +127,7 @@
/**
* Compare this markup stream with another one
- *
+ *
* @param that
* The other markup stream
* @return True if each MarkupElement in this matches each element in that
@@ -177,7 +177,7 @@
/**
* True, if associate markup is the same. It will change e.g. if the markup
* file has been re-loaded or the locale has been changed.
- *
+ *
* @param markupStream
* The markup stream to compare with.
* @return true, if markup has not changed
@@ -193,7 +193,7 @@
/**
* Find the markup element index of the component with 'path'
- *
+ *
* @param path
* The component path expression
* @param id
@@ -226,7 +226,7 @@
/**
* Get the component/container's Class which is directly associated with the
* stream.
- *
+ *
* @return The component's class
*/
public final Class getContainerClass()
@@ -246,7 +246,7 @@
* Gets the markup encoding. A markup encoding may be specified in a markup
* file with an XML encoding specifier of the form <?xml ...
* encoding="..." ?>.
- *
+ *
* @return The encoding, or null if not found
*/
public final String getEncoding()
@@ -279,7 +279,7 @@
/**
* Get the wicket namespace valid for this specific markup
- *
+ *
* @return wicket namespace
*/
public final String getWicketNamespace()
@@ -289,7 +289,7 @@
/**
* Return the XML declaration string, in case if found in the markup.
- *
+ *
* @return Null, if not found.
*/
public String getXmlDeclaration()
@@ -306,7 +306,7 @@
}
/**
- *
+ *
* @return true, if underlying markup has been merged (inheritance)
*/
public final boolean isMergedMarkup()
@@ -316,7 +316,7 @@
/**
* Note:
- *
+ *
* @return The next markup element in the stream
*/
public MarkupElement next()
@@ -414,7 +414,7 @@
/**
* Skips any markup at the current position until the wicket tag name is
* found.
- *
+ *
* @param wicketTagName
* wicket tag name to seek
*/
@@ -438,7 +438,7 @@
/**
* Renders markup until a closing tag for openTag is reached.
- *
+ *
* @param openTag
* The open tag
*/
@@ -462,7 +462,7 @@
/**
* Throws a new markup exception
- *
+ *
* @param message
* The exception message
* @throws MarkupException
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/WicketTag.java Mon Oct 15 13:18:27 2007
@@ -24,18 +24,18 @@
* "wicket", so wicket tags are then of the form <wicket:*>
* <p>
* Note 1: you need to add an XHTML doctype to your markup and use <html
- * xmlns:wicket> to create a XHTML conformant namespace for such tags.
+ * xmlns:wicket> to create a XHTML conform namespace for such tags.
* <p>
* Note 2: The namespace name is configurable. E.g. <html
* xmlns:wcn="http://wicket">
- *
+ *
* @author Juergen Donnerstag
*/
public class WicketTag extends ComponentTag
{
/**
* Constructor
- *
+ *
* @param tag
* The XML tag which this wicket tag is based upon.
*/
@@ -46,7 +46,7 @@
/**
* Constructor
- *
+ *
* @param tag
* The ComponentTag tag which this wicket tag is based upon.
*/
@@ -59,7 +59,7 @@
/**
* Get the tag's name attribute: e.g. <wicket:region name=panel>
- *
+ *
* @return The tag's name attribute
*/
public final String getNameAttribute()
@@ -174,7 +174,7 @@
/**
* Gets this tag if it is already mutable, or a mutable copy of this tag if
* it is immutable.
- *
+ *
* @return This tag if it is already mutable, or a mutable copy of this tag
* if it is immutable.
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java Mon Oct 15 13:18:27 2007
@@ -32,7 +32,7 @@
/**
* A Wicket internal helper class to handle wicket:head tags.
- *
+ *
* @author Juergen Donnerstag
*/
public class ContainerWithAssociatedMarkupHelper extends AbstractBehavior
@@ -62,7 +62,7 @@
* of its components might wish to contribute.
* <p>
* The headers contributed are rendered in the standard way.
- *
+ *
* @param htmlContainer
* The HtmlHeaderContainer added to the Page
*/
@@ -79,7 +79,7 @@
}
// Position pointer at current (first) header
- this.noMoreWicketHeadTagsAllowed = false;
+ noMoreWicketHeadTagsAllowed = false;
while (nextHeaderMarkup(markupStream) != -1)
{
Class markupClass = ((WicketTag)markupStream.getTag()).getMarkupClass();
@@ -94,7 +94,7 @@
{
// A component's header section must only be added once,
// no matter how often the same Component has been added
- // to the page or any other container in the hierachy.
+ // to the page or any other container in the hierarchy.
if (htmlContainer.okToRenderComponent(headerPart.getScope(), headerPart.getId()))
{
htmlContainer.autoAdd(headerPart, null);
@@ -126,7 +126,7 @@
/**
* Gets the header part of the Panel/Border. Returns null if it doesn't have
* a header tag.
- *
+ *
* @param index
* A unique index
* @param markupClass
@@ -138,7 +138,7 @@
{
// Gracefully getAssociateMarkupStream. Throws no exception in case
// markup is not found
- final MarkupStream markupStream = this.container.getAssociatedMarkupStream(false);
+ final MarkupStream markupStream = container.getAssociatedMarkupStream(false);
// Position markup stream at beginning of header tag
markupStream.setCurrentIndex(index);
@@ -154,13 +154,13 @@
// create a unique id for the HtmlHeaderContainer to be
// created
final String headerId = "_" + Classes.simpleName(markupClass)
- + this.container.getVariation() + "Header" + index;
+ + container.getVariation() + "Header" + index;
// Create the header container and associate the markup with
// it
String scope = wTag.getAttributes().getString(
markupStream.getWicketNamespace() + ":scope");
- final HeaderPartContainer headerContainer = ((IHeaderPartContainerProvider)this.container)
+ final HeaderPartContainer headerContainer = ((IHeaderPartContainerProvider)container)
.newHeaderPartContainer(headerId, scope);
headerContainer.setMyMarkupStream(markupStream);
headerContainer.setRenderBodyOnly(true);
@@ -176,7 +176,7 @@
/**
* Process next header markup fragment.
- *
+ *
* @param associatedMarkupStream
* @return index or -1 when done
*/
@@ -197,7 +197,7 @@
WicketTag tag = (WicketTag)elem;
if (tag.isOpen() && tag.isHeadTag())
{
- if (this.noMoreWicketHeadTagsAllowed == true)
+ if (noMoreWicketHeadTagsAllowed == true)
{
throw new MarkupException(
"<wicket:head> tags are only allowed before <body>, </head>, <wicket:panel> etc. tag");
@@ -208,7 +208,7 @@
else if (tag.isOpen()
&& (tag.isPanelTag() || tag.isBorderTag() || tag.isExtendTag()))
{
- this.noMoreWicketHeadTagsAllowed = true;
+ noMoreWicketHeadTagsAllowed = true;
}
}
else if (elem instanceof ComponentTag)
@@ -217,12 +217,12 @@
// wicket:head must be before </head>
if (tag.isClose() && TagUtils.isHeadTag(tag))
{
- this.noMoreWicketHeadTagsAllowed = true;
+ noMoreWicketHeadTagsAllowed = true;
}
// wicket:head must be before <body>
else if (tag.isOpen() && TagUtils.isBodyTag(tag))
{
- this.noMoreWicketHeadTagsAllowed = true;
+ noMoreWicketHeadTagsAllowed = true;
}
}
elem = associatedMarkupStream.next();
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderPartContainerProvider.java Mon Oct 15 13:18:27 2007
@@ -19,15 +19,15 @@
/**
* WebMarkupContainers that implement this know how to provide header parts for
* wicket:head fragments.
- *
+ *
* @author eelcohillenius
*/
public interface IHeaderPartContainerProvider
{
/**
* Create a new HeaderPartContainer. Users may wish to do that to
- * implemented more sophisticated header scoping stragegies.
- *
+ * implemented more sophisticated header scoping strategies.
+ *
* @param id
* The header component's id
* @param scope
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/IHeaderResponse.java Mon Oct 15 13:18:27 2007
@@ -21,17 +21,17 @@
/**
* Interface that is used to render header elements (usually javascript and CSS references).
- *
+ *
* Implementation of this interface is responsible for filtering duplicate contributions (so that
* for example the same javascript is not loaded twice) during the same request.
- *
+ *
* @author Matej Knopp
*/
public interface IHeaderResponse
{
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param reference
* resource reference pointing to the javascript resource
*/
@@ -39,7 +39,7 @@
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param reference
* resource reference pointing to the javascript resource
* @param id
@@ -50,7 +50,7 @@
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param url
* url of the the javascript resource
*/
@@ -58,7 +58,7 @@
/**
* Writes a javascript reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param url
* url of the the javascript resource
* @param id
@@ -70,12 +70,12 @@
/**
* Renders javascript code to the response, if the javascript has not already been rendered.
- *
+ *
* the necessary surrounding <code>script</code> tags will be added to the output.
- *
+ *
* @param javascript
- * javacript content to be rendered.
- *
+ * javascript content to be rendered.
+ *
* @param id
* unique id for the javascript element. This can be null, however in that case the
* ajax header contribution can't detect duplicate script fragments.
@@ -84,7 +84,7 @@
/**
* Writes a CSS reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param reference
* resource reference pointing to the CSS resource
*/
@@ -92,7 +92,7 @@
/**
* Writes a CSS reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param url
* url of the CSS resource
*/
@@ -100,7 +100,7 @@
/**
* Writes a CSS reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param reference
* resource reference pointing to the CSS resource
* @param media
@@ -110,7 +110,7 @@
/**
* Writes a CSS reference, if the specified reference hasn't been rendered yet.
- *
+ *
* @param url
* url of the CSS resource
* @param media
@@ -124,7 +124,7 @@
* <p>
* Note: This method is kind of dangerous as users are able to write to the output whatever they
* like.
- *
+ *
* @param string
* string to be rendered to head
*/
@@ -134,7 +134,7 @@
* Marks the given object as rendered. The object can be anything (string, resource reference,
* etc...). The purpose of this function is to allow user to manually keep track of rendered
* items. This can be useful for items that are expensive to generate (like interpolated text).
- *
+ *
* @param object
* object to be marked as rendered.
*/
@@ -150,7 +150,7 @@
* <li>Method <code>renderString</code> marks the whole string as rendered.
* <li>Method <code>markRendered</code> can be used to mark an arbitrary object as rendered
* </ul>
- *
+ *
* @param object
* Object that is queried to be rendered
* @return Whether the object has been marked as rendered during the request
@@ -162,29 +162,29 @@
* <p>
* Note: This method is kind of dangerous as users are able to write to the output whatever they
* like.
- *
- * @return Reponse
+ *
+ * @return Response
*/
public Response getResponse();
/**
* Renders javascript that is executed right after the DOM is built, before external resources
* (e.g. images) are loaded.
- *
+ *
* @param javascript
*/
public void renderOnDomReadyJavascript(String javascript);
/**
* Renders javascript that is executed after the entire page is loaded.
- *
+ *
* @param javascript
*/
public void renderOnLoadJavascript(String javascript);
/**
* Renders javascript that is executed after the given event happens on specified target
- *
+ *
* @param target
* @param event
* @param javascript
@@ -196,7 +196,7 @@
* If some kind of buffering is used internally, this action will mark that the contents has to be flushed out.
*/
public void close();
-
+
/**
* @return if header rendering is completed and subsequent usage will be ignored
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java Mon Oct 15 13:18:27 2007
@@ -35,17 +35,17 @@
/**
- * Package resource for javascript files. It strips comments and whitespaces
+ * Package resource for javascript files. It strips comments and whitespace
* from javascript and gzips the content. The stripped and gzipped version is
* cached.
- *
+ *
* @author Matej Knopp
*/
public class JavascriptPackageResource extends CompressedPackageResource
{
/**
* Resource Stream that caches the stripped content.
- *
+ *
* @author Matej Knopp
*/
protected abstract class FilteringResourceStream implements IResourceStream
@@ -161,7 +161,7 @@
/**
* Gets the resource for a given set of criteria. Only one resource will be
* loaded for the same criteria.
- *
+ *
* @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.
@@ -195,7 +195,7 @@
/**
* Creates a new javascript package resource.
- *
+ *
* @param scope
* @param path
* @param locale
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java Mon Oct 15 13:18:27 2007
@@ -55,15 +55,15 @@
* Represents a localizable static resource.
* <p>
* Use like eg:
- *
+ *
* <pre>
* PackageResource IMG_UNKNOWN = PackageResource.get(EditPage.class, "questionmark.gif");
* </pre>
- *
+ *
* where the static resource references image 'questionmark.gif' from the the package that EditPage
* is in to get a package resource.
* </p>
- *
+ *
* @author Jonathan Locke
* @author Eelco Hillenius
*/
@@ -78,7 +78,7 @@
/**
* Construct.
- *
+ *
* @param message
*/
public PackageResourceBlockedException(String message)
@@ -89,14 +89,14 @@
/**
* common extension pattern for css files; matches all files with extension 'css'.
- *
+ *
* @deprecated Will be removed in 2.0; contribute resources one by one instead
*/
public static final Pattern EXTENSION_CSS = Pattern.compile(".*\\.css");
/**
* common extension pattern for javascript files; matches all files with extension 'js'.
- *
+ *
* @deprecated Will be removed in 2.0; contribute resources one by one instead
*/
public static final Pattern EXTENSION_JS = Pattern.compile(".*\\.js");
@@ -109,7 +109,7 @@
/**
* Binds the resources that match the provided pattern to the given application object. Will
* create any resources if not already in the shared resources of the application object.
- *
+ *
* @param application
* The application to bind to.
* @param scope
@@ -118,7 +118,7 @@
* A regular expression to match against the contents of the package of the provided
* scope class (eg ".*\\.js" will add all the files with extension
* "js" from that package).
- *
+ *
* @deprecated Since Wicket 1.2.1 this method is effectively a no-op.
* {@link PackageResource package resources} are automatically tried and bound as
* shared resources so that they don't have to be pre-registered anymore. Will be
@@ -133,7 +133,7 @@
* create any resources if not already in the shared resources of the application object and
* does that recursively when the recurse parameter is true, or just for the scoped package if
* that parameter is false
- *
+ *
* @param application
* The application to bind to.
* @param scope
@@ -144,7 +144,7 @@
* "js" from that package).
* @param recurse
* Whether this method should recurse into sub packages
- *
+ *
* @deprecated Since Wicket 1.2.1 this method is effectively a no-op.
* {@link PackageResource package resources} are automatically tried and bound as
* shared resources so that they don't have to be pre-registered anymore. Will be
@@ -157,7 +157,7 @@
/**
* Binds a resource to the given application object. Will create the resource if not already in
* the shared resources of the application object.
- *
+ *
* @param application
* The application to bind to.
* @param scope
@@ -174,7 +174,7 @@
/**
* Binds a resource to the given application object. Will create the resource if not already in
* the shared resources of the application object.
- *
+ *
* @param application
* The application to bind to.
* @param scope
@@ -193,7 +193,7 @@
/**
* Binds a resource to the given application object. Will create the resource if not already in
* the shared resources of the application object.
- *
+ *
* @param application
* The application to bind to.
* @param scope
@@ -231,7 +231,7 @@
/**
* Gets whether a resource for a given set of criteria exists.
- *
+ *
* @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. Typically this is the class in
@@ -256,7 +256,7 @@
* Gets non-localized resources for a given set of criteria. Multiple resource can be loaded for
* the same criteria if they match the pattern. If no resources were found, this method returns
* null.
- *
+ *
* @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. Typically this is the calling
@@ -275,7 +275,7 @@
* Gets non-localized resources for a given set of criteria. Multiple resource can be loaded for
* the same criteria if they match the pattern. If no resources were found, this method returns
* null.
- *
+ *
* @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. Typically this is the calling
@@ -326,7 +326,7 @@
catch (IllegalArgumentException e)
{
log.debug("Can't construct the uri as a file: " + absolutePath);
- // if this is throwen then the path is not really a
+ // if this is thrown then the path is not really a
// file. but could be a zip.
String jarZipPart = uri.getSchemeSpecificPart();
// lowercased for testing if jar/zip, but leave the real
@@ -369,7 +369,7 @@
/**
* Gets a non-localized resource for a given set of criteria. Only one resource will be loaded
* for the same criteria.
- *
+ *
* @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. Typically this is the calling
@@ -386,7 +386,7 @@
/**
* Gets the resource for a given set of criteria. Only one resource will be loaded for the same
* criteria.
- *
+ *
* @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. Typically this is the class in
@@ -451,7 +451,7 @@
/**
* Hidden constructor.
- *
+ *
* @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
@@ -485,7 +485,7 @@
{
/*
* Get the resource stream so that the real locale that could be resolved is set.
- * Silently ignore unresolvable resources as we are not serving the resource for now
+ * Silently ignore not resolvable resources as we are not serving the resource for now
*/
getResourceStream(false);
@@ -496,7 +496,7 @@
/**
* Gets the absolute path of the resource.
- *
+ *
* @return the absolute resource path
*/
public final String getAbsolutePath()
@@ -506,7 +506,7 @@
/**
* Gets the locale.
- *
+ *
* @return The Locale of this package resource
*/
public final Locale getLocale()
@@ -516,7 +516,7 @@
/**
* Gets the path this resource was created with.
- *
+ *
* @return the path
*/
public final String getPath()
@@ -578,7 +578,7 @@
/**
* Gets the scoping class, used for class loading and to determine the package.
- *
+ *
* @return the scoping class
*/
public final Class getScope()
@@ -588,7 +588,7 @@
/**
* Gets the style.
- *
+ *
* @return the style
*/
public final String getStyle()
@@ -601,8 +601,8 @@
/**
* Returns the last modified time of resource
- *
- * @return last modified time or nulll if the time can not be determined
+ *
+ * @return last modified time or null if the time can not be determined
*/
public Time lastModifiedTime()
{