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 [4/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/markup/html/form/validation/FormComponentFeedbackIndicator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackIndicator.java Mon Oct 15 13:18:27 2007
@@ -31,7 +31,7 @@
* component has an error. The default content for this indicator is a red star,
* but you can subclass this panel and provide your own markup to give any
* custom look you desire.
- *
+ *
* @author Jonathan Locke
*/
public class FormComponentFeedbackIndicator extends Panel implements IFeedback
@@ -43,7 +43,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
*/
@@ -70,7 +70,7 @@
}
/**
- * Set the component's visibility according to the existance (or not) of feedback messages
+ * Set the component's visibility according to the existence (or not) of feedback messages
*/
public void updateFeedback()
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/RenderedDynamicImageResource.java Mon Oct 15 13:18:27 2007
@@ -24,7 +24,7 @@
/**
- * A DynamicImageResource subclass that allows easy rendering of regenenerable
+ * A DynamicImageResource subclass that allows easy rendering of regeneratable
* (unbuffered) dynamic images. A RenderedDynamicImageResource implements the
* abstract method render(Graphics2D) to create/re-create a given image
* on-the-fly. When a RenderedDynamicImageResource is serialized, the image
@@ -34,7 +34,7 @@
* The format of the image (and therefore the resource's extension) can be
* specified with setFormat(String). The default format is "PNG" because JPEG is
* lossy and makes generated images look bad and GIF has patent issues.
- *
+ *
* @see org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource
* @see org.apache.wicket.markup.html.image.resource.DefaultButtonImageResourceFactory
* @author Jonathan Locke
@@ -59,7 +59,7 @@
/**
* Constructor.
- *
+ *
* @param width
* Width of image
* @param height
@@ -73,7 +73,7 @@
/**
* Constructor.
- *
+ *
* @param width
* Width of image
* @param height
@@ -114,7 +114,7 @@
/**
* Causes the image to be redrawn the next time its requested.
- *
+ *
* @see org.apache.wicket.Resource#invalidate()
*/
public synchronized void invalidate()
@@ -171,7 +171,7 @@
/**
* Renders this image
- *
+ *
* @return The image data
*/
protected byte[] render()
@@ -188,7 +188,7 @@
/**
* Override this method to provide your rendering code
- *
+ *
* @param graphics
* The graphics context to render on
* @return True if the image was rendered. False if the image size was
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/include/Include.java Mon Oct 15 13:18:27 2007
@@ -50,23 +50,23 @@
* webapplication.
* </p>
* <p>
- * The following example shows how to integrate a header and footer, comming
+ * The following example shows how to integrate a header and footer, coming
* from a plain HTML source on the same server is integrated using this
* component. The files footer.html and header.html would be located in the web
* application root directory
* </p>
* <p>
* Java:
- *
+ *
* <pre>
* ...
* add(new Include("header", "header.html"));
* add(new Include("footer", "footer.html"));
* ...
* </pre>
- *
+ *
* Html:
- *
+ *
* <pre>
* ...
* <div>
@@ -76,9 +76,9 @@
* </div>
* ...
* </pre>
- *
+ *
* </p>
- *
+ *
* @author Eelco Hillenius
*/
public class Include extends WebComponent
@@ -107,7 +107,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
*/
@@ -118,7 +118,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param model
@@ -131,7 +131,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param modelObject
@@ -144,7 +144,7 @@
/**
* Imports the contents of the url of the model object.
- *
+ *
* @return the imported contents
*/
protected String importAsString()
@@ -175,7 +175,7 @@
/**
* Gets whether the given url is absolute (<tt>true</tt>) or relative (<tt>false</tt>).
- *
+ *
* @param url
* the url
* @return whether the given url is absolute (<tt>true</tt>) or relative (<tt>false</tt>)
@@ -210,7 +210,7 @@
/**
* Imports from a relative url.
- *
+ *
* @param url
* the url to import
* @return the imported url's contents
@@ -236,7 +236,7 @@
/**
* Imports from an absolute url.
- *
+ *
* @param url
* the url to import
* @return the imported url's contents
@@ -255,7 +255,7 @@
/**
* Imports the contents from the given url.
- *
+ *
* @param url
* the url
* @return the imported contents
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Mon Oct 15 13:18:27 2007
@@ -59,11 +59,11 @@
* <li> <wicket:head> makes sense in Panels, Borders and inherited markup
* (of Panels, Borders and Pages)</li>
* <li> components within <wicket:head> must be added by means of add(),
- * like allways with Wicket. No difference.</li>
+ * like always with Wicket. No difference.</li>
* <li> <wicket:head> and it's content is copied to the output. Components
* contained in <org.apache.wicket.head> are rendered as usual</li>
* </ul>
- *
+ *
* @author Juergen Donnerstag
*/
public class HtmlHeaderContainer extends WebMarkupContainer
@@ -87,7 +87,7 @@
/**
* Construct
- *
+ *
* @see Component#Component(String)
*/
public HtmlHeaderContainer(final String id)
@@ -106,8 +106,8 @@
/**
* First render the body of the component. And if it is the header component
* of a Page (compared to a Panel or Border), than get the header sections
- * from all component in the hierachie and render them as well.
- *
+ * from all component in the hierarchy and render them as well.
+ *
* @see org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
@@ -120,19 +120,19 @@
// web response.
// Temporarily replace the web response with a String response
- final Response webResponse = this.getResponse();
+ final Response webResponse = getResponse();
try
{
final StringResponse response = new StringResponse();
- this.getRequestCycle().setResponse(response);
+ getRequestCycle().setResponse(response);
IHeaderResponse headerResponse = getHeaderResponse();
if (!response.equals(headerResponse.getResponse()))
{
- this.getRequestCycle().setResponse(headerResponse.getResponse());
+ getRequestCycle().setResponse(headerResponse.getResponse());
}
-
+
// In any case, first render the header section directly associated
// with the markup
super.onComponentTagBody(markupStream, openTag);
@@ -181,7 +181,7 @@
finally
{
// Restore the original response
- this.getRequestCycle().setResponse(webResponse);
+ getRequestCycle().setResponse(webResponse);
}
}
@@ -190,13 +190,13 @@
* to the <head> section of the HTML output. Every component
* interested must implement IHeaderContributor.
* <p>
- * Note: HtmlHeaderContainer will be removed from the component hierachie at
+ * Note: HtmlHeaderContainer will be removed from the component hierarchy at
* the end of the request (@see #onEndRequest()) and thus can not transport
* status from one request to the next. This is true for all components
* added to the header.
- *
+ *
* @param page
- * Usually it is the page object, but there might also be that a WebMarkupContainer has been attached to the <html> tag
+ * Usually it is the page object, but there might also be that a WebMarkupContainer has been attached to the <html> tag
* @param container
* The header component container
*/
@@ -235,7 +235,7 @@
/**
* Check if the header component is ok to render within the scope given.
- *
+ *
* @param scope
* The scope of the header component
* @param id
@@ -244,9 +244,9 @@
*/
public final boolean okToRenderComponent(final String scope, final String id)
{
- if (this.renderedComponentsPerScope == null)
+ if (renderedComponentsPerScope == null)
{
- this.renderedComponentsPerScope = new HashMap();
+ renderedComponentsPerScope = new HashMap();
}
// if (scope == null)
@@ -254,11 +254,11 @@
// scope = header.getMarkupStream().getContainerClass().getName();
// }
- List componentScope = (List)this.renderedComponentsPerScope.get(scope);
+ List componentScope = (List)renderedComponentsPerScope.get(scope);
if (componentScope == null)
{
componentScope = new ArrayList();
- this.renderedComponentsPerScope.put(scope, componentScope);
+ renderedComponentsPerScope.put(scope, componentScope);
}
if (componentScope.contains(id))
@@ -273,13 +273,13 @@
{
super.onDetach();
- this.renderedComponentsPerScope = null;
- this.headerResponse = null;
+ renderedComponentsPerScope = null;
+ headerResponse = null;
}
/**
* Factory method for creating header response
- *
+ *
* @return new header response
*/
protected IHeaderResponse newHeaderResponse()
@@ -301,12 +301,12 @@
/**
* Returns the header response.
- *
+ *
* @return header response
*/
public IHeaderResponse getHeaderResponse()
{
- if (this.headerResponse == null)
+ if (headerResponse == null)
{
headerResponse = newHeaderResponse();
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java Mon Oct 15 13:18:27 2007
@@ -34,43 +34,43 @@
* onclick javascript event handler attribute will be generated.
* <p>
* You can use a link like:
- *
+ *
* <pre>
* add(new Link("myLink")
* {
* public void onClick(RequestCycle cycle)
* {
- * // do something here...
+ * // do something here...
* }
* );
* </pre>
- *
+ *
* and in your HTML file:
- *
+ *
* <pre>
* <a href="#" wicket:id="myLink">click here</a>
* </pre>
- *
+ *
* or:
- *
+ *
* <pre>
* <td wicket:id="myLink">my clickable column</td>
* </pre>
- *
+ *
* </p>
* The following snippet shows how to pass a parameter from the Page creating
* the Page to the Page responded by the Link.
- *
+ *
* <pre>
- * add(new Link("link", listItem.getModel())
+ * add(new Link("link", listItem.getModel())
* {
- * public void onClick()
+ * public void onClick()
* {
* MyObject obj = (MyObject)getModelObject();
* setResponsePage(new MyPage(obj.getId(), ... ));
* }
* </pre>
- *
+ *
* @author Jonathan Locke
* @author Eelco Hillenius
*/
@@ -86,7 +86,7 @@
/**
* Construct.
- *
+ *
* @param anchor
*/
public AnchorChange(Component anchor)
@@ -142,7 +142,7 @@
/**
* Gets any anchor component.
- *
+ *
* @return Any anchor component to jump to, might be null
*/
public Component getAnchor()
@@ -153,7 +153,7 @@
/**
* Gets whether link should automatically enable/disable based on current
* page.
- *
+ *
* @return Whether this link should automatically enable/disable based on
* current page.
*/
@@ -166,7 +166,7 @@
* Gets the popup specification. If not-null, a javascript on-click event
* handler will be generated that opens a new window using the popup
* properties.
- *
+ *
* @return the popup specification.
*/
public PopupSettings getPopupSettings()
@@ -201,11 +201,11 @@
/**
* THIS METHOD IS NOT PART OF THE WICKET API. DO NOT ATTEMPT TO OVERRIDE OR
* CALL IT.
- *
+ *
* Called when a link is clicked. The implementation of this method is
* currently to simply call onClick(), but this may be augmented in the
* future.
- *
+ *
* @see ILinkListener
*/
public final void onLinkClicked()
@@ -230,7 +230,7 @@
* {@link Component#getOutputMarkupId()} flag true, or it must be attached
* to a <a tag with a href attribute of more than one character starting
* with '#' ('<a href="#someAnchor" ... ').
- *
+ *
* @param anchor
* The anchor
* @return this
@@ -245,7 +245,7 @@
/**
* Sets whether this link should automatically enable/disable based on
* current page.
- *
+ *
* @param autoEnable
* whether this link should automatically enable/disable based on
* current page.
@@ -261,7 +261,7 @@
* Sets the popup specification. If not-null, a javascript on-click event
* handler will be generated that opens a new window using the popup
* properties.
- *
+ *
* @param popupSettings
* the popup specification.
* @return This
@@ -280,7 +280,7 @@
* {@link Component#getMarkupId()} if {@link Component#getOutputMarkupId()}
* returns true, or if the anchor component does not output it's id, this
* method will try to retrieve the id from the markup directly. If neither
- * is found, an {@link WicketRuntimeException excpeption} is thrown. If no
+ * is found, an {@link WicketRuntimeException exception} is thrown. If no
* anchor component was set, but the link component is attached to a <a
* element, this method will append what is in the href attribute <i>if</i>
* there is one, starts with a '#' and has more than one character.
@@ -289,7 +289,7 @@
* whatever is done with any set anchor component yourself. You also have to
* manually append the '#' at the right place.
* </p>
- *
+ *
* @param tag
* The component tag
* @param url
@@ -370,7 +370,7 @@
/**
* Gets the url to use for this link.
- *
+ *
* @return The URL that this link links to
*/
protected CharSequence getURL()
@@ -380,7 +380,7 @@
/**
* Whether this link refers to the given page.
- *
+ *
* @param page
* A page
* @return True if this link goes to the given page
@@ -392,7 +392,7 @@
/**
* Handles this link's tag. OVERRIDES MUST CALL SUPER.
- *
+ *
* @param tag
* the component tag
* @see org.apache.wicket.Component#onComponentTag(ComponentTag)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java Mon Oct 15 13:18:27 2007
@@ -31,13 +31,13 @@
* handler that opens a new window with the links' URL.
* <p>
* You can 'or' display flags together like this:
- *
+ *
* <pre>
* new PopupSettings(PopupSettings.RESIZABLE | PopupSettings.SCROLLBARS);
* </pre>
- *
+ *
* </p>
- *
+ *
* @author Jonathan Locke
* @author Eelco Hillenius
*/
@@ -107,9 +107,9 @@
* Construct. If you are not using these popup settings with an external
* link - in which case we don't need to know about a page map - you should
* use one of the constructors with a {@link PageMap} argument. Typically,
- * you should put any popup in a seperate page map as Wicket holds
+ * you should put any popup in a separate page map as Wicket holds
* references to a limited number of pages/ versions only. If you don't put
- * your popup in a seperate page map, the user might get page expired
+ * your popup in a separate page map, the user might get page expired
* exceptions when getting back to the main window again.
*/
public PopupSettings()
@@ -118,7 +118,7 @@
/**
* Construct.
- *
+ *
* @param displayFlags
* Display flags
*/
@@ -129,29 +129,29 @@
/**
* Construct.
- *
+ *
* @param pagemap
* The pagemap where this popup must be in. Typically, you should
- * put any popup in a seperate page map as Wicket holds
+ * put any popup in a separate page map as Wicket holds
* references to a limited number of pages/ versions only. If you
- * don't put your popup in a seperate page map, the user might
+ * don't put your popup in a separate page map, the user might
* get page expired exceptions when getting back to the main
* window again.
*/
public PopupSettings(IPageMap pagemap)
{
- this.pageMapName = pagemap.getName();
- this.windowName = pageMapName;
+ pageMapName = pagemap.getName();
+ windowName = pageMapName;
}
/**
* Construct.
- *
+ *
* @param pagemap
* The pagemap where this popup must be in. Typically, you should
- * put any popup in a seperate page map as Wicket holds
+ * put any popup in a separate page map as Wicket holds
* references to a limited number of pages/ versions only. If you
- * don't put your popup in a seperate page map, the user might
+ * don't put your popup in a separate page map, the user might
* get page expired exceptions when getting back to the main
* window again.
* @param displayFlags
@@ -160,13 +160,13 @@
public PopupSettings(IPageMap pagemap, final int displayFlags)
{
this.displayFlags = displayFlags;
- this.pageMapName = pagemap.getName();
- this.windowName = pageMapName;
+ pageMapName = pagemap.getName();
+ windowName = pageMapName;
}
/**
* Get the onClick javascript event handler.
- *
+ *
* @return the onClick javascript event handler
*/
public String getPopupJavaScript()
@@ -220,27 +220,27 @@
/**
* Sets the popup window height.
- *
+ *
* @param popupHeight
* the popup window height.
* @return This
*/
public PopupSettings setHeight(int popupHeight)
{
- this.height = popupHeight;
+ height = popupHeight;
return this;
}
/**
* Sets the left position of the popup window.
- *
+ *
* @param popupPositionLeft
* the left position of the popup window.
* @return This
*/
public PopupSettings setLeft(int popupPositionLeft)
{
- this.left = popupPositionLeft;
+ left = popupPositionLeft;
return this;
}
@@ -248,7 +248,7 @@
* Sets the target of the link. The default implementation simply refers to
* the href element, but clients may want to override this (e.g. when the
* HTML element is not an anchor) by setting the target explicitly.
- *
+ *
* @param target
* the target of the link
*/
@@ -259,27 +259,27 @@
/**
* Sets the top position of the popup window.
- *
+ *
* @param popupPositionTop
* the top position of the popup window.
* @return This
*/
public PopupSettings setTop(int popupPositionTop)
{
- this.top = popupPositionTop;
+ top = popupPositionTop;
return this;
}
/**
* Sets the popup window width.
- *
+ *
* @param popupWidth
* the popup window width.
* @return This
*/
public PopupSettings setWidth(int popupWidth)
{
- this.width = popupWidth;
+ width = popupWidth;
return this;
}
@@ -289,7 +289,7 @@
* (no spaces or punctuation). If you have a window already open and call
* window.open a second time using the same windowName, the first window
* will be reused rather than opening a second window
- *
+ *
* @param popupWindowName
* window name.
* @return This
@@ -298,14 +298,14 @@
{
if (popupWindowName != null)
{
- this.windowName = popupWindowName;
+ windowName = popupWindowName;
if (pageMapName != null && (!pageMapName.equals(popupWindowName)))
{
log.warn("the page map and window name should be the same. The page map was "
+ pageMapName + ", and the requested window name is " + popupWindowName
+ "; changing the page map to " + popupWindowName);
}
- this.pageMapName = popupWindowName;
+ pageMapName = popupWindowName;
}
return this;
}
@@ -317,12 +317,12 @@
*/
private String flagToString(final int flag)
{
- return (this.displayFlags & flag) != 0 ? "yes" : "no";
+ return (displayFlags & flag) != 0 ? "yes" : "no";
}
/**
* Gets the pagemap where the popup page must be created in.
- *
+ *
* @return The pagemap where the popup page must be created in
* @deprecated will be removed in Wicket 2.0; use
* {@link #getPageMap(Component)} instead
@@ -343,7 +343,7 @@
/**
* Gets the pagemap where the popup page must be created in.
- *
+ *
* @param callee
* Calling component
* @return The pagemap where the popup page must be created in
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java Mon Oct 15 13:18:27 2007
@@ -35,31 +35,31 @@
* are situations where it is necessary to work with other collection types, for repeaters that
* might work better with non-list or database-driven collections see the
* org.apache.wicket.markup.repeater package.
- *
+ *
* Also notice that in a list the item's uniqueness/primary key/id is identified as its index in the
* list. If this is not the case you should either override {@link #getListItemModel(IModel, int)}
* to return a model that will work with the item's true primary key, or use a different repeater
* that does not rely on the list index.
- *
- *
+ *
+ *
* A ListView holds ListItem children. Items can be re-ordered and deleted, either one at a time or
* many at a time.
* <p>
* Example:
- *
+ *
* <pre>
* <tbody>
* <tr wicket:id="rows" class="even">
* <td><span wicket:id="id">Test ID</span></td>
- * ...
+ * ...
* </pre>
- *
+ *
* <p>
* Though this example is about a HTML table, ListView is not at all limited to HTML tables. Any
* kind of list can be rendered using ListView.
* <p>
* The related Java code:
- *
+ *
* <pre>
* add(new ListView("rows", listData)
* {
@@ -70,18 +70,18 @@
* }
* });
* </pre>
- *
+ *
* <p>
* <strong>NOTE:</strong>
- *
- * When you want to change the default generated markup it is important to realise that the ListView
+ *
+ * When you want to change the default generated markup it is important to realize that the ListView
* instance itself does not correspond to any markup, however, the generated ListItems do.<br/>
- *
+ *
* This means that methods like {@link #setRenderBodyOnly(boolean)} and
* {@link #add(org.apache.wicket.behavior.IBehavior)} should be invoked on the {@link ListItem} that
* is given in {@link #populateItem(ListItem)} method.
* </p>
- *
+ *
* <p>
* <strong>WARNING:</strong> though you can nest ListViews within Forms, you HAVE to set the
* setReuseItems property to true in order to have validation work properly. By default,
@@ -95,7 +95,7 @@
* components are replaced by new ones, your user will never see the wrong data when setReuseItems
* is false.
* </p>
- *
+ *
* @author Jonathan Locke
* @author Juergen Donnerstag
* @author Johan Compagner
@@ -104,7 +104,7 @@
public abstract class ListView extends AbstractRepeater
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -165,7 +165,7 @@
* Gets the list of items in the listView. This method is final because it is not designed to be
* overridden. If it were allowed to be overridden, the values returned by getModelObject() and
* getList() might not coincide.
- *
+ *
* @return The list of items in this list view.
*/
public final List getList()
@@ -184,7 +184,7 @@
* than you must manually call listView.removeAll() in order to rebuild the ListItems. If you
* nest a ListView in a Form, ALLWAYS set this property to true, as otherwise validation will
* not work properly.
- *
+ *
* @return Whether to reuse items
*/
public boolean getReuseItems()
@@ -194,7 +194,7 @@
/**
* Get index of first cell in page. Default is: 0.
- *
+ *
* @return Index of first cell in page. Default is: 0
*/
public final int getStartIndex()
@@ -207,7 +207,7 @@
* really will be. E.g. default for viewSize is Integer.MAX_VALUE, if not set via setViewSize().
* If the underlying list has 10 elements, the value returned by getViewSize() will be 10 if
* startIndex = 0.
- *
+ *
* @return The number of items to be populated and rendered.
*/
public int getViewSize()
@@ -244,7 +244,7 @@
/**
* Returns a link that will move the given item "down" (towards the end) in the listView.
- *
+ *
* @param id
* Name of move-down link component to create
* @param item
@@ -300,7 +300,7 @@
/**
* Returns a link that will move the given item "up" (towards the beginning) in the listView.
- *
+ *
* @param id
* Name of move-up link component to create
* @param item
@@ -357,7 +357,7 @@
/**
* Returns a link that will remove this ListItem from the ListView that holds it.
- *
+ *
* @param id
* Name of remove link component to create
* @param item
@@ -402,7 +402,7 @@
/**
* Sets the model as the provided list and removes all children, so that the next render will be
* using the contents of the model.
- *
+ *
* @param list
* The list for the new model. The list must implement {@link Serializable}.
* @return This for chaining
@@ -415,11 +415,11 @@
/**
* Sets the model and removes all current children, so that the next render will be using the
* contents of the model.
- *
+ *
* @param model
* The new model
* @return This for chaining
- *
+ *
* @see org.apache.wicket.MarkupContainer#setModel(org.apache.wicket.model.IModel)
*/
public Component setModel(IModel model)
@@ -433,7 +433,7 @@
* than you must manually call listView.removeAll() in order to rebuild the ListItems. If you
* nest a ListView in a Form, ALLWAYS set this property to true, as otherwise validation will
* not work properly.
- *
+ *
* @param reuseItems
* Whether to reuse the child items.
* @return this
@@ -446,7 +446,7 @@
/**
* Set the index of the first item to render
- *
+ *
* @param startIndex
* First index of model object's list to display
* @return This
@@ -469,7 +469,7 @@
/**
* Define the maximum number of items to render. Default: render all.
- *
+ *
* @param size
* Number of items to display
* @return This
@@ -492,7 +492,7 @@
* the underlying list changes a lot (many users using the application), it may not longer be
* appropriate. In that case your own ListItemModel implementation should use an id (e.g. the
* database' record id) to identify and load the list item model object.
- *
+ *
* @param listViewModel
* The ListView's model
* @param index
@@ -506,7 +506,7 @@
/**
* Create a new ListItem for list item at index.
- *
+ *
* @param index
* @return ListItem
*/
@@ -582,7 +582,7 @@
* Comes handy for ready made ListView based components which must implement populateItem() but
* you don't want to lose compile time error checking reminding the user to implement abstract
* populateItem().
- *
+ *
* @param item
*/
protected void onBeginPopulateItem(final ListItem item)
@@ -592,20 +592,20 @@
/**
* Populate a given item.
* <p>
- * <b>be carefull</b> to add any components to the list item. So, don't do:
- *
+ * <b>be careful</b> to add any components to the list item. So, don't do:
+ *
* <pre>
* add(new Label("foo", "bar"));
* </pre>
- *
+ *
* but:
- *
+ *
* <pre>
* item.add(new Label("foo", "bar"));
* </pre>
- *
+ *
* </p>
- *
+ *
* @param item
* The item to populate
*/
@@ -622,7 +622,7 @@
/**
* Render a single item.
- *
+ *
* @param item
* The item to be rendered
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java Mon Oct 15 13:18:27 2007
@@ -27,13 +27,13 @@
* PageableListView is similar to ListView but provides in addition pageable
* views. A PageableListView holds pageable rows of information. The rows can be
* re-ordered and deleted, either one at a time or many at a time.
- *
+ *
* @author Jonathan Locke
*/
public abstract class PageableListView extends ListView implements IPageable
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -45,7 +45,7 @@
/**
* Constructor
- *
+ *
* @param id
* See Component
* @param model
@@ -60,9 +60,9 @@
}
/**
- * Creates a pagable list view having the given number of rows per page that
+ * Creates a pageable list view having the given number of rows per page that
* uses the provided object as a simple model.
- *
+ *
* @param id
* See Component
* @param list
@@ -79,7 +79,7 @@
/**
* Gets the index of the current page being displayed by this list view.
- *
+ *
* @return Returns the currentPage.
*/
public final int getCurrentPage()
@@ -95,7 +95,7 @@
/**
* Gets the number of pages in this list view.
- *
+ *
* @return The number of pages in this list view
*/
public final int getPageCount()
@@ -105,7 +105,7 @@
/**
* Gets the maximum number of rows on each page.
- *
+ *
* @return the maximum number of rows on each page.
*/
public final int getRowsPerPage()
@@ -115,7 +115,7 @@
/**
* Sets the maximum number of rows on each page.
- *
+ *
* @param rowsPerPage the maximum number of rows on each page.
*/
public final void setRowsPerPage(int rowsPerPage)
@@ -134,10 +134,10 @@
*/
public int getViewSize()
{
- if (this.getModelObject() != null)
+ if (getModelObject() != null)
{
- super.setStartIndex(this.getCurrentPage() * this.getRowsPerPage());
- super.setViewSize(this.getRowsPerPage());
+ super.setStartIndex(getCurrentPage() * getRowsPerPage());
+ super.setViewSize(getRowsPerPage());
}
return super.getViewSize();
@@ -145,7 +145,7 @@
/**
* Sets the current page that this list view should show.
- *
+ *
* @param currentPage
* The currentPage to set.
*/
@@ -161,15 +161,15 @@
{
currentPage = pageCount - 1;
}
-
+
addStateChange(new CurrentPageChange(this.currentPage));
this.currentPage = currentPage;
}
/**
- * Prevent users from accidentially using it.
- *
+ * Prevent users from accidentally using it.
+ *
* @see org.apache.wicket.markup.html.list.ListView#setStartIndex(int)
* @throws UnsupportedOperationException always
*/
@@ -180,8 +180,8 @@
}
/**
- * Prevent users from accidentially using it.
- *
+ * Prevent users from accidentally using it.
+ *
* @param size
* the view size
* @return This
@@ -193,14 +193,14 @@
throw new UnsupportedOperationException(
"You must not use setViewSize() with PageableListView");
}
-
+
/**
* Records the changing of the current page.
*/
private class CurrentPageChange extends Change
{
private static final long serialVersionUID = 1L;
-
+
/** the former 'current' page. */
private final int currentPage;
@@ -230,18 +230,18 @@
}
/**
- * Records the changing of the nbr of rows per page.
+ * Records the changing of the number of rows per page.
*/
private class RowsPerPageChange extends Change
{
private static final long serialVersionUID = 1L;
-
- /** the former nbr of rows per page. */
+
+ /** the former number of rows per page. */
private final int rowsPerPage;
/**
* Construct.
- * @param rowsPerPage the former nbr of rows per page
+ * @param rowsPerPage the former number of rows per page
*/
RowsPerPageChange(int rowsPerPage)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Mon Oct 15 13:18:27 2007
@@ -50,7 +50,7 @@
* which in turn uses {@link IRequestCycleSettings#getGatherExtendedBrowserInfo() a setting} to
* determine whether this page should be redirected to (it does when it is true).
* </p>
- *
+ *
* @author Eelco Hillenius
*/
public class BrowserInfoPage extends WebPage
@@ -67,7 +67,7 @@
* Bookmarkable constructor. This is not for normal framework client use. It will be called
* whenever Javascript is not supported, and the browser info page's meta refresh fires to this
* page. Prior to this, the other constructor should already have been called.
- *
+ *
* @param parameters
* page parameters with the original url in it
*/
@@ -104,7 +104,7 @@
/**
* Constructor. The page will redirect to the given url after waiting for the given number of
* seconds.
- *
+ *
* @param continueTo
* the url to redirect to when the browser info is handled
*/
@@ -160,14 +160,14 @@
*/
protected final void continueToPrevious()
{
- // continue to original distination
+ // continue to original destination
RequestCycle.get().setRequestTarget(new RedirectRequestTarget(continueTo));
}
/**
* Log a warning that for in order to use this page, you should really be using
* {@link WebClientInfo}.
- *
+ *
* @param clientInfo
* the actual client info object
*/
@@ -180,7 +180,7 @@
/**
* Set the url to continue to after this page.
- *
+ *
* @param continueTo
* the url
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java Mon Oct 15 13:18:27 2007
@@ -36,17 +36,17 @@
* Fragments provide a means to maintain the panels tiny piece of markup. Since it can be anywhere,
* the component whose markup contains the fragment's markup must be provided (markup provider).
* <p>
- *
+ *
* <pre>
* <span wicket:id="myPanel">Example input (will be removed)</span>
- *
+ *
* <wicket:fragment wicket:id="frag1">panel 1</wicket:fragment>
* <wicket:fragment wicket:id="frag2">panel 2</wicket:fragment>
- * </pre>
+ * </pre>
* <pre>
* add(new Fragment("myPanel1", "frag1", myPage);
* </pre>
- *
+ *
* @author Juergen Donnerstag
*/
public class Fragment extends WebMarkupContainerWithAssociatedMarkup
@@ -61,14 +61,14 @@
/**
* Constructor.
- *
+ *
* @see org.apache.wicket.Component#Component(String)
- *
+ *
* @param id
* The component id
* @param markupId
* The associated id of the associated markup fragment
- *
+ *
* @deprecated use {@link #Fragment(String, String, MarkupContainer)}
*/
public Fragment(final String id, final String markupId)
@@ -78,16 +78,16 @@
/**
* Constructor.
- *
+ *
* @see org.apache.wicket.Component#Component(String)
- *
+ *
* @param id
* The component id
* @param markupId
* The associated id of the associated markup fragment
* @param model
* The model for this fragment
- *
+ *
* @deprecated use {@link #Fragment(String, String, MarkupContainer, IModel)}
*/
public Fragment(final String id, final String markupId, final IModel model)
@@ -97,9 +97,9 @@
/**
* Constructor.
- *
+ *
* @see org.apache.wicket.Component#Component(String)
- *
+ *
* @param id
* The component id
* @param markupId
@@ -114,9 +114,9 @@
/**
* Constructor.
- *
+ *
* @see org.apache.wicket.Component#Component(String)
- *
+ *
* @param id
* The component id
* @param markupId
@@ -142,7 +142,7 @@
/**
* The associated markup fragment can be modified
- *
+ *
* @param markupId
*/
public final void setMarkupTagReferenceId(final String markupId)
@@ -170,7 +170,7 @@
/**
* Make sure we open up open-close tags to open-body-close
- *
+ *
* @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
*/
protected void onComponentTag(final ComponentTag tag)
@@ -183,7 +183,7 @@
}
/**
- *
+ *
* @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
@@ -208,7 +208,7 @@
/**
* Get the markup stream which shall be used to search for the fragment
- *
+ *
* @param markupStream
* The markup stream is associated with the component (not the fragment)
* @return The markup stream to be used to find the fragment markup
@@ -237,9 +237,9 @@
/**
* Render the markup starting at the current position of the markup strean
- *
+ *
* @see #onComponentTagBody(MarkupStream, ComponentTag)
- *
+ *
* @param providerMarkupStream
* @param openTag
*/
@@ -284,7 +284,7 @@
/**
* Position the markup stream at the child component relative to the <b>provider</b> markup
- *
+ *
* @param path
* @return
*/
@@ -332,7 +332,7 @@
stream = super.getAssociatedMarkupStream(false);
}
- // if self doesnt have markup stream try the parent's
+ // if self doesn't have markup stream try the parent's
if ((stream == null) && (getParent() != null))
{
stream = getParent().getAssociatedMarkupStream(false);
@@ -351,7 +351,7 @@
/**
* Returns markup provider associated with this fragment
- *
+ *
* @return markup provider
*/
public final MarkupContainer getMarkupProvider()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java Mon Oct 15 13:18:27 2007
@@ -24,7 +24,7 @@
/**
* Link to a packaged JavaScript file.
- *
+ *
* @author Eelco Hillenius
*/
public class JavaScriptReference extends PackagedResourceReference
@@ -33,12 +33,12 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param referer
- * the class that is refering; is used as the relative root for
- * gettting the resource
+ * the class that is referring; is used as the relative root for
+ * getting the resource
* @param file
* reference as a string
*/
@@ -49,12 +49,12 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param referer
- * the class that is refering; is used as the relative root for
- * gettting the resource
+ * the class that is referring; is used as the relative root for
+ * getting the resource
* @param file
* reference as a string. The model must provide an instance of
* {@link String}
@@ -66,7 +66,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param resourceReference
@@ -79,7 +79,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param resourceReference
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java Mon Oct 15 13:18:27 2007
@@ -25,9 +25,9 @@
/**
- * Static resource reference for javacript resources. The resources are filtered
+ * Static resource reference for javascript resources. The resources are filtered
* (stripped comments and whitespace) and gzipped.
- *
+ *
* @author Matej Knopp
*/
public class JavascriptResourceReference extends ResourceReference
@@ -64,7 +64,7 @@
{
super(name);
}
-
+
protected Resource newResource()
{
PackageResource packageResource = JavascriptPackageResource.get(getScope(), getName(),
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java Mon Oct 15 13:18:27 2007
@@ -25,7 +25,7 @@
/**
* Base class for components that render references to packaged resources.
- *
+ *
* @author Eelco Hillenius
*/
public class PackagedResourceReference extends WebMarkupContainer
@@ -34,11 +34,11 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param referer
- * the class that is refering; is used as the relative root for gettting the resource
+ * the class that is referring; is used as the relative root for getting the resource
* @param file
* relative location of the packaged file
* @param attributeToReplace
@@ -52,11 +52,11 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param referer
- * the class that is refering; is used as the relative root for gettting the resource
+ * the class that is referring; is used as the relative root for getting the resource
* @param file
* model that supplies the relative location of the packaged file. Must return an
* instance of {@link String}
@@ -106,7 +106,7 @@
/**
* Creates new package resource reference.
- *
+ *
* @param app
* @param scope
* @param name
@@ -122,7 +122,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param resourceReference
@@ -138,7 +138,7 @@
/**
* Construct.
- *
+ *
* @param id
* component id
* @param resourceReference
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java Mon Oct 15 13:18:27 2007
@@ -33,8 +33,8 @@
/**
* Construct.
* @param id component id
- * @param referer the class that is refering; is used as the relative
- * root for gettting the resource
+ * @param referer the class that is referring; is used as the relative
+ * root for getting the resource
* @param file reference as a string
*/
public StyleSheetReference(String id, Class referer, String file)
@@ -45,8 +45,8 @@
/**
* Construct.
* @param id component id
- * @param referer the class that is refering; is used as the relative
- * root for gettting the resource
+ * @param referer the class that is referring; is used as the relative
+ * root for getting the resource
* @param file reference. The model must provide an instance
* of {@link String}
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Mon Oct 15 13:18:27 2007
@@ -50,14 +50,14 @@
* This class encapsulates the logic for displaying and (partial) updating the tree. Actual
* presentation is out of scope of this class. User should derive they own tree (if needed) from
* {@link BaseTree} (recommended).
- *
+ *
* @author Matej Knopp
*/
public abstract class AbstractTree extends Panel implements ITreeStateListener, TreeModelListener
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -68,7 +68,7 @@
{
/**
* Visits the tree item.
- *
+ *
* @param item
* the item to visit
*/
@@ -101,7 +101,7 @@
/**
* Construct.
- *
+ *
* @param id
* The component id
* @param node
@@ -145,7 +145,7 @@
*/
public String getMarkupId()
{
- // this is overriden to produce id that begins with id of tree
+ // this is overridden to produce id that begins with id of tree
// if the tree has set (shorter) id in markup, we can use it to
// shorten the id of individual TreeItems
return AbstractTree.this.getMarkupId() + "_" + getId();
@@ -161,7 +161,7 @@
/**
* Sets the children.
- *
+ *
* @param children
* The children
*/
@@ -172,7 +172,7 @@
/**
* Whether to render children.
- *
+ *
* @return whether to render children
*/
protected final boolean isRenderChildren()
@@ -189,7 +189,7 @@
if (this == rootItem && isRootLess() == true)
{
// yes, write empty div with id
- // this is necesary for createElement js to work correctly
+ // this is necessary for createElement js to work correctly
getResponse().write(
"<div style=\"display:none\" id=\"" + getMarkupId() + "\"></div>");
markupStream.skipComponent();
@@ -216,7 +216,7 @@
item.onRender(markupStream);
}
});
- //
+ //
}
}
}
@@ -319,7 +319,7 @@
}
/**
- * Components that holds tree items. This is similiar to ListView, but it renders tree items in
+ * Components that holds tree items. This is similar to ListView, but it renders tree items in
* the right order.
*/
private class TreeItemContainer extends WebMarkupContainer
@@ -328,7 +328,7 @@
/**
* Construct.
- *
+ *
* @param id
* The component id
*/
@@ -353,7 +353,7 @@
/**
* renders the tree items, making sure that items are rendered in the order they should be
- *
+ *
* @param markupStream
*/
protected void onRender(final MarkupStream markupStream)
@@ -400,7 +400,7 @@
/**
* Returns an iterator that iterates trough the enumeration.
- *
+ *
* @param enumeration
* The enumeration to iterate through
* @return The iterator
@@ -439,7 +439,7 @@
private boolean dirtyAll = false;
/**
- * list of dirty items. if children property of these items is null, the chilren will be
+ * list of dirty items. if children property of these items is null, the children will be
* rebuild.
*/
private final List dirtyItems = new ArrayList();
@@ -456,14 +456,14 @@
private TreeItemContainer itemContainer;
/**
- * map that maps TreeNode to TreeItem. TreeItems only exists for TreeNodes, that are visibled
+ * map that maps TreeNode to TreeItem. TreeItems only exists for TreeNodes, that are visible
* (their parents are not collapsed).
*/
private final Map nodeToItemMap = new HashMap();
/**
* we need to track previous model. if the model changes, we unregister the tree from listeners
- * of old model and register the tree as litener of new model.
+ * of old model and register the tree as listener of new model.
*/
private TreeModel previousModel = null;
@@ -478,7 +478,7 @@
/**
* Tree constructor
- *
+ *
* @param id
* The component id
*/
@@ -490,7 +490,7 @@
/**
* Tree constructor
- *
+ *
* @param id
* The component id
* @param model
@@ -508,7 +508,7 @@
invalidateAll();
}
- /** called when all nodes are expaned. */
+ /** called when all nodes are expanded. */
public final void allNodesExpanded()
{
invalidateAll();
@@ -516,7 +516,7 @@
/**
* Returns the TreeState of this tree.
- *
+ *
* @return Tree state instance
*/
public ITreeState getTreeState()
@@ -550,14 +550,14 @@
checkModel();
- // Do we have to rebuld the whole tree?
+ // Do we have to rebuild the whole tree?
if (dirtyAll && rootItem != null)
{
clearAllItem();
}
else
{
- // rebuild chilren of dirty nodes that need it
+ // rebuild children of dirty nodes that need it
rebuildDirty();
}
@@ -669,7 +669,7 @@
/**
* Determines whether the TreeNode needs to be rebuilt if it is selected or deselected
- *
+ *
* @return true if the node should be rebuilt after (de)selection, false otherwise
*/
protected boolean isForceRebuildOnSelectionChange()
@@ -679,7 +679,7 @@
/**
* Sets whether the root of the tree should be visible.
- *
+ *
* @param rootLess
* whether the root should be visible
*/
@@ -734,10 +734,10 @@
/**
* Marks the last but one visible child node of the given item as dirty, if give child is the
* last item of parent.
- *
- * We need this to refresh the previous visible item in case the inserted / deleteditem was
- * last. The reason is that the line shape of previous item chages from L to |- .
- *
+ *
+ * We need this to refresh the previous visible item in case the inserted / deleted item was
+ * last. The reason is that the line shape of previous item changes from L to |- .
+ *
* @param parent
* @param child
*/
@@ -745,7 +745,7 @@
{
if (parent.getChildren().indexOf(child) == parent.getChildren().size() - 1)
{
- // go through the childrend backwards, start at the last but one
+ // go through the children backwards, start at the last but one
// item
for (int i = parent.getChildren().size() - 2; i >= 0; --i)
{
@@ -816,7 +816,7 @@
{
removeItem(item);
- // unselect the node
+ // deselect the node
getTreeState().selectNode((TreeNode)item.getModelObject(), false);
}
});
@@ -867,7 +867,7 @@
* the component on page. Make sure that the tree model has fired the proper listener functions.
* <p>
* <b>You can only call this method once in a request.</b>
- *
+ *
* @param target
* Ajax request target used to send the update to the page
*/
@@ -957,7 +957,7 @@
// does the item need to rebuild children?
if (item.getChildren() == null)
{
- // rebuld the children
+ // rebuild the children
buildItemChildren(item);
// set flag on item so that it renders itself together with
@@ -976,7 +976,7 @@
/**
* Returns whether the given node is expanded.
- *
+ *
* @param node
* The node to inspect
* @return true if the node is expanded, false otherwise
@@ -995,7 +995,7 @@
/**
* Creates the TreeState, which is an object where the current state of tree (which nodes are
* expanded / collapsed, selected, ...) is stored.
- *
+ *
* @return Tree state instance
*/
protected ITreeState newTreeState()
@@ -1016,10 +1016,10 @@
/**
* This method is called after creating every TreeItem. This is the place for adding components
* on item (junction links, labels, icons...)
- *
+ *
* @param item
* newly created tree item. The node can be obtained as item.getModelObject()
- *
+ *
* @param level
* how deep the component is in tree hierarchy (0 for root item)
*/
@@ -1028,7 +1028,7 @@
/**
* Builds the children for given TreeItem. It recursively traverses children of it's TreeNode
* and creates TreeItem for every visible TreeNode.
- *
+ *
* @param item
* The parent tree item
*/
@@ -1054,7 +1054,7 @@
/**
* Builds (recursively) TreeItems for the given Iterator of TreeNodes.
- *
+ *
* @param nodes
* The nodes to build tree items for
* @param level
@@ -1084,7 +1084,7 @@
}
/**
- * Checks whether the model has been chaned, and if so unregister and register listeners.
+ * Checks whether the model has been changed, and if so unregister and register listeners.
*/
private final void checkModel()
{
@@ -1125,7 +1125,7 @@
/**
* Returns the javascript used to delete removed elements.
- *
+ *
* @return The javascript
*/
private String getElementsDeleteJavascript()
@@ -1160,7 +1160,7 @@
/**
* returns the short version of item id (just the number part).
- *
+ *
* @param item
* The tree item
* @return The id
@@ -1197,7 +1197,7 @@
/**
* Invalidates single node (without children). On the next render, this node will be updated.
* Node will not be rebuilt, unless forceRebuild is true.
- *
+ *
* @param node
* The node to invalidate
* @param forceRebuild
@@ -1261,7 +1261,7 @@
/**
* Invalidates node and it's children. On the next render, the node and children will be
* updated. Node children will be rebuilt.
- *
+ *
* @param node
* The node to invalidate
*/
@@ -1294,8 +1294,8 @@
}
/**
- * Returns whether the given node is visibled, e.g. all it's parents are expanded.
- *
+ * Returns whether the given node is visible, e.g. all it's parents are expanded.
+ *
* @param node
* The node to inspect
* @return true if the node is visible, false otherwise
@@ -1315,7 +1315,7 @@
/**
* Creates a tree item for given node.
- *
+ *
* @param node
* The tree node
* @param level
@@ -1329,7 +1329,7 @@
/**
* Creates a tree item for given node with specified id.
- *
+ *
* @param node
* The tree node
* @param level
@@ -1345,7 +1345,7 @@
/**
* Return the representation of node children as Iterator interface.
- *
+ *
* @param node
* The tree node
* @return iterable presentation of node children
@@ -1365,7 +1365,7 @@
for (Iterator i = dirtyItems.iterator(); i.hasNext();)
{
TreeItem item = (TreeItem)i.next();
- // item chilren need to be rebuilt
+ // item children need to be rebuilt
if (item.getChildren() == null)
{
buildItemChildren(item);
@@ -1376,7 +1376,7 @@
/**
* Removes the item, appends it's id to deleteIds. This is called when a items parent is being
* deleted or rebuilt.
- *
+ *
* @param item
* The item to remove
*/
@@ -1417,8 +1417,8 @@
}
/**
- * Call the callback#visitItem method for the given item and all it's chilren.
- *
+ * Call the callback#visitItem method for the given item and all it's children.
+ *
* @param item
* The tree item
* @param callback
@@ -1432,7 +1432,7 @@
/**
* Call the callback#visitItem method for every child of given item.
- *
+ *
* @param item
* The tree item
* @param callback
@@ -1453,7 +1453,7 @@
/**
* Returns the component associated with given node, or null, if node is not visible. This is
* useful in situations when you want to touch the node element in html.
- *
+ *
* @param node
* Tree node
* @return Component associated with given node, or null if node is not visible.
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Mon Oct 15 13:18:27 2007
@@ -41,17 +41,17 @@
/**
* An abstract Tree component that should serve as a base for custom Tree
* Components.
- *
+ *
* It has one abstract method - {@link #newNodeComponent(String, IModel)} that
- * needs to be overriden.
- *
+ * needs to be overridden.
+ *
* @author Matej Knopp
*/
public abstract class BaseTree extends AbstractTree
{
/**
* Construct.
- *
+ *
* @param id
*/
public BaseTree(String id)
@@ -61,7 +61,7 @@
/**
* Construct.
- *
+ *
* @param id
* @param model
*/
@@ -82,7 +82,7 @@
/**
* Returns the stylesheet reference
- *
+ *
* @return stylesheet reference
*/
protected ResourceReference getCSS()
@@ -101,7 +101,7 @@
*/
protected void populateTreeItem(WebMarkupContainer item, int level)
{
- // add juunction link
+ // add junction link
TreeNode node = (TreeNode)item.getModelObject();
Component junctionLink = newJunctionLink(item, JUNCTION_LINK_ID, node);
junctionLink.setComponentBorder(new JunctionBorder(node, level));
@@ -138,7 +138,7 @@
/**
* Returns the class name that will be added to row's CSS class for selected
* rows
- *
+ *
* @return CSS class name
*/
protected String getSelectedClass()
@@ -148,7 +148,7 @@
/**
* Creates a new component for the given TreeNode.
- *
+ *
* @param id
* component ID
* @param model
@@ -159,7 +159,7 @@
/**
* Returns whether the provided node is last child of it's parent.
- *
+ *
* @param node
* The node
* @return whether the provided node is the last child
@@ -190,7 +190,7 @@
/**
* Construct.
- *
+ *
* @param node
* @param level
*/
@@ -245,7 +245,7 @@
* Creates the junction link for given node. Also (optionally) creates the
* junction image. If the node is a leaf (it has no children), the created
* junction link is non-functional.
- *
+ *
* @param parent parent component of the link
* @param id wicket:id of the component
* @param node tree node for which the link should be created.
@@ -317,10 +317,10 @@
/**
* Callback function called after user clicked on an junction link. The node
* has already been expanded/collapsed (depending on previous status).
- *
+ *
* @param target
* Request target - may be null on non-ajax call
- *
+ *
* @param node
* Node for which this callback is relevant
*/
@@ -364,7 +364,7 @@
/**
* Construct.
- *
+ *
* @param name the name of the type of the link
*/
public LinkType(String name)
@@ -375,14 +375,14 @@
/**
* Helper class for calling an action from a link.
- *
+ *
* @author Matej Knopp
*/
public interface ILinkCallback extends IClusterable
{
/**
* Called when the click is executed.
- *
+ *
* @param target
* The ajax request target
*/
@@ -392,7 +392,7 @@
/**
* Creates a link of type specified by current linkType. When the links is
* clicked it calls the specified callback.
- *
+ *
* @param id
* The component id
* @param callback
@@ -450,7 +450,7 @@
/**
* Returns the current type of links on tree items.
- *
+ *
* @return The link type
*/
public LinkType getLinkType()
@@ -461,7 +461,7 @@
/**
* Sets the type of links on tree items. After the link type is changed, the
* whole tree is rebuild and re-rendered.
- *
+ *
* @param linkType
* type of links
*/
@@ -473,7 +473,7 @@
invalidateAll();
}
}
-
+
/**
* @see org.apache.wicket.markup.html.tree.AbstractTree#isForceRebuildOnSelectionChange()
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java Mon Oct 15 13:18:27 2007
@@ -32,7 +32,7 @@
* Default implementation of TreeState.
* <p>
* This implementation tries to be as lightweight as possible.
- *
+ *
* @author Matej Knopp
*/
public class DefaultTreeState implements ITreeState, IClusterable
@@ -47,7 +47,7 @@
/**
* set of nodes which are collapsed or expanded (depends on nodesCollapsed
- * veriable).
+ * variable).
*/
private final Set nodes = new HashSet();
@@ -84,7 +84,7 @@
nodesCollapsed = false;
Object[] listenersCopy = listeners.toArray();
- for(int i = 0; i < listenersCopy.length; i++)
+ for(int i = 0; i < listenersCopy.length; i++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[i];
l.allNodesCollapsed();
@@ -107,7 +107,7 @@
}
Object[] listenersCopy = listeners.toArray();
- for(int i = 0; i < listenersCopy.length; i++)
+ for(int i = 0; i < listenersCopy.length; i++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[i];
l.nodeCollapsed(node);
@@ -130,7 +130,7 @@
nodesCollapsed = true;
Object[] listenersCopy = listeners.toArray();
- for(int i = 0; i < listenersCopy.length; i++)
+ for(int i = 0; i < listenersCopy.length; i++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[i];
l.allNodesCollapsed();
@@ -153,7 +153,7 @@
}
Object[] listenersCopy = listeners.toArray();
- for(int i = 0; i < listenersCopy.length; i++)
+ for(int i = 0; i < listenersCopy.length; i++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[i];
l.nodeExpanded(node);
@@ -213,17 +213,17 @@
*/
public void selectNode(TreeNode node, boolean selected)
{
-
+
if (isAllowSelectMultiple() == false && selectedNodes.size() > 0)
{
for (Iterator i = selectedNodes.iterator(); i.hasNext();)
{
TreeNode current = (TreeNode)i.next();
- if (current.equals(node) == false)
+ if (current.equals(node) == false)
{
i.remove();
Object[] listenersCopy = listeners.toArray();
- for(int j = 0; j < listenersCopy.length; j++)
+ for(int j = 0; j < listenersCopy.length; j++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[j];
l.nodeUnselected(current);
@@ -231,13 +231,13 @@
}
}
}
-
+
if (selected == true && selectedNodes.contains(node) == false)
{
-
+
selectedNodes.add(node);
Object[] listenersCopy = listeners.toArray();
- for(int i = 0; i < listenersCopy.length; i++)
+ for(int i = 0; i < listenersCopy.length; i++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[i];
l.nodeSelected(node);
@@ -247,7 +247,7 @@
{
selectedNodes.remove(node);
Object[] listenersCopy = listeners.toArray();
- for(int i = 0; i < listenersCopy.length; i++)
+ for(int i = 0; i < listenersCopy.length; i++)
{
ITreeStateListener l = (ITreeStateListener)listenersCopy[i];
l.nodeUnselected(node);
@@ -260,6 +260,6 @@
*/
public void setAllowSelectMultiple(boolean value)
{
- this.allowSelectMultiple = value;
+ allowSelectMultiple = value;
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java Mon Oct 15 13:18:27 2007
@@ -24,7 +24,7 @@
* Tree state holds information about a tree such as which nodes are expanded /
* collapsed and which nodes are selected, It can also fire callbacks on
* listener in case any of the information changed.
- *
+ *
* @author Matej Knopp
*/
public interface ITreeState
@@ -32,7 +32,7 @@
/**
* Adds a tree state listener. On state change events on the listener are
* fired.
- *
+ *
* @param l
* Listener to add
*/
@@ -45,7 +45,7 @@
/**
* Collapses the given node.
- *
+ *
* @param node
* Node to collapse
*/
@@ -58,7 +58,7 @@
/**
* Expands the given node.
- *
+ *
* @param node
* Node to expand
*/
@@ -66,21 +66,21 @@
/**
* Returns the collection of all selected nodes.
- *
+ *
* @return The collection of selected nodes
*/
Collection getSelectedNodes();
/**
* Returns whether multiple nodes can be selected.
- *
- * @return True if mutliple nodes can be selected
+ *
+ * @return True if multiple nodes can be selected
*/
boolean isAllowSelectMultiple();
/**
* Returns true if the given node is expanded.
- *
+ *
* @param node
* The node to inspect
* @return True if the node is expanded
@@ -89,7 +89,7 @@
/**
* Returns true if the given node is selected, false otherwise.
- *
+ *
* @param node
* The node to inspect
* @return True if the node is selected
@@ -98,7 +98,7 @@
/**
* Removes a tree state listener.
- *
+ *
* @param l
* The listener to remove
*/
@@ -111,7 +111,7 @@
* <p>
* If tree is in single selection mode and a new node is selected, old node
* is automatically unselected (and the event is fired on listeners).
- *
+ *
* @param node
* The node to select or deselect
* @param selected
@@ -122,7 +122,7 @@
/**
* Sets whether multiple nodes can be selected.
- *
+ *
* @param value
* If true, multiple nodes can be selected. If false, only one
* node at a time can be selected
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java Mon Oct 15 13:18:27 2007
@@ -23,9 +23,9 @@
/**
* Base class for markup filters
- *
+ *
* @see org.apache.wicket.markup.MarkupParser
- *
+ *
* @author Jonathan Locke
*/
public abstract class AbstractMarkupFilter implements IMarkupFilter
@@ -42,7 +42,7 @@
/**
* Construct.
- *
+ *
* @param parent
* The parent of this component The next element in the chain.
*/
@@ -61,7 +61,7 @@
/**
* Set new parent.
- *
+ *
* @param parent
* The parent of this component The next element in the chain
*/
@@ -71,9 +71,9 @@
}
/**
- * A convinience function to retrieve the next tag (same as nextTag()),
+ * A convenience function to retrieve the next tag (same as nextTag()),
* however assuming that it is a ComponentTag.
- *
+ *
* @return ComponentTag
* @throws ParseException
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java?rev=584893&r1=584892&r2=584893&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java Mon Oct 15 13:18:27 2007
@@ -25,7 +25,7 @@
/**
* The interface of a streaming XML parser as required by Wicket.
- *
+ *
* @author Juergen Donnerstag
* @author Jonathan Locke
*/
@@ -33,25 +33,25 @@
{
/**
* Return the encoding applied while reading the markup resource. The
- * encoding is determined by analysing the <?xml version=".."
+ * encoding is determined by analyzing the <?xml version=".."
* encoding=".." ?> tag.
- *
+ *
* @return if null, JVM defaults have been used.
*/
String getEncoding();
/**
* Return the XML declaration string, in case if found in the markup.
- *
+ *
* @return Null, if not found.
*/
String getXmlDeclaration();
/**
* Wicket dissects the markup into Wicket relevant tags and raw markup,
- * which is not further analysed by Wicket. The method
+ * which is not further analyzed by Wicket. The method
* getInputFromPositionMarker() is used to access the raw markup.
- *
+ *
* @param toPos
* To position
* @return The raw markup in between the position marker and toPos
@@ -60,9 +60,9 @@
/**
* Wicket dissects the markup into Wicket relevant tags and raw markup,
- * which is not further analysed by Wicket. The getInputSubsequence() method
+ * which is not further analyzed by Wicket. The getInputSubsequence() method
* is used to access the raw markup.
- *
+ *
* @param fromPos
* From position
* @param toPos
@@ -72,11 +72,11 @@
CharSequence getInput(final int fromPos, final int toPos);
/**
- * Dissect the XML markup into tags and text. Tags are further analysed into
+ * Dissect the XML markup into tags and text. Tags are further analyzed into
* comments, CDATA, processing instruction etc as well as "standard" tags.
* By means of getType() the type of the current element can be retrieved
- * and the appropriate getters must used to get hold of the informantion.
- *
+ * and the appropriate getters must used to get hold of the information.
+ *
* @return false, if end-of-file as been reached. If true, than use
* getType() to determine what has been found.
* @throws ParseException
@@ -89,7 +89,7 @@
* <p>
* Note: xml character encoding is NOT applied. It is assumed the input
* provided does have the correct encoding already.
- *
+ *
* @param string
* The markup to be parsed
* @throws IOException
@@ -103,7 +103,7 @@
* Reads and parses markup from an input stream, using UTF-8 encoding by
* default when not specified in XML declaration. Use nextTag() to access
* the tags contained, one after another.
- *
+ *
* @param inputStream
* The input stream to read and parse
* @throws IOException
@@ -117,7 +117,7 @@
/**
* Reads and parses markup from an input stream. Use nextTag() to access the
* tags contained, one after another.
- *
+ *
* @param inputStream
* A resource like e.g. a file
* @param encoding
@@ -137,7 +137,7 @@
/**
* Set the position marker of the markup
- *
+ *
* @param pos
*/
void setPositionMarker(final int pos);