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/16 00:46:23 UTC
svn commit: r584952 [3/5] - in /wicket/trunk/jdk-1.4/wicket-extensions:
.settings/ src/main/java/org/apache/wicket/extensions/ajax/markup/html/
src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/
src/main/java/org/apache/wicket/ex...
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java Mon Oct 15 15:46:09 2007
@@ -29,14 +29,13 @@
/**
- * Component that represents a <code><select></code> box. Elements are
- * provided by one or more <code>SelectChoice</code> or
- * <code>SelectOptions</code> components in the hierarchy below the
- * <code>Select</code> component.
+ * Component that represents a <code><select></code> box. Elements are provided by one or
+ * more <code>SelectChoice</code> or <code>SelectOptions</code> components in the hierarchy
+ * below the <code>Select</code> component.
*
- * Advantages to the standard choice components is that the user has a lot more
- * control over the markup between the <select> tag and its children
- * <option> tags: allowing for such things as <optgroup> tags.
+ * Advantages to the standard choice components is that the user has a lot more control over the
+ * markup between the <select> tag and its children <option> tags: allowing for such
+ * things as <optgroup> tags.
*
* TODO Post 1.2: General: Example
*
@@ -73,9 +72,8 @@
boolean supportsMultiple = getModelObject() instanceof Collection;
/*
- * the input contains an array of full path of the selected option
- * components unless nothing was selected in which case the input
- * contains null
+ * the input contains an array of full path of the selected option components unless nothing
+ * was selected in which case the input contains null
*/
String[] paths = getInputAsArray();
@@ -88,16 +86,16 @@
if (!supportsMultiple && paths.length > 1)
{
throw new WicketRuntimeException(
- "The model of Select component ["
- + getPath()
- + "] is not of type java.util.Collection, but more then one SelectOption component has been selected. Either remove the multiple attribute from the select tag or make the model of the Select component a collection");
+ "The model of Select component [" +
+ getPath() +
+ "] is not of type java.util.Collection, but more then one SelectOption component has been selected. Either remove the multiple attribute from the select tag or make the model of the Select component a collection");
}
List converted = new ArrayList(paths.length);
/*
- * if the input is null we do not need to do anything since the model
- * collection has already been cleared
+ * if the input is null we do not need to do anything since the model collection has already
+ * been cleared
*/
for (int i = 0; i < paths.length; i++)
{
@@ -105,9 +103,8 @@
if (!Strings.isEmpty(path))
{
/*
- * option component path sans select component path = relative
- * path from group to option since we know the option is child
- * of select
+ * option component path sans select component path = relative path from group to
+ * option since we know the option is child of select
*/
path = path.substring(getPath().length() + 1);
@@ -117,13 +114,13 @@
if (option == null)
{
throw new WicketRuntimeException(
- "submitted http post value ["
- + paths.toString()
- + "] for SelectOption component ["
- + getPath()
- + "] contains an illegal relative path element ["
- + path
- + "] which does not point to an SelectOption component. Due to this the Select component cannot resolve the selected SelectOption component pointed to by the illegal value. A possible reason is that component hierarchy changed between rendering and form submission.");
+ "submitted http post value [" +
+ paths.toString() +
+ "] for SelectOption component [" +
+ getPath() +
+ "] contains an illegal relative path element [" +
+ path +
+ "] which does not point to an SelectOption component. Due to this the Select component cannot resolve the selected SelectOption component pointed to by the illegal value. A possible reason is that component hierarchy changed between rendering and form submission.");
}
converted.add(option.getModelObject());
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java Mon Oct 15 15:46:09 2007
@@ -26,7 +26,7 @@
* Component representing a single <code><option></code> html element
*
* TODO Post 1.2: General: Example
- *
+ *
* @see Select
*
* @author Igor Vaynberg
@@ -67,16 +67,16 @@
if (select == null)
{
throw new WicketRuntimeException(
- "SelectOption component ["
- + getPath()
- + "] cannot find its parent Select. All SelectOption components must be a child of or below in the hierarchy of a Select component.");
+ "SelectOption component [" +
+ getPath() +
+ "] cannot find its parent Select. All SelectOption components must be a child of or below in the hierarchy of a Select component.");
}
// assign name and value
tag.put("value", getPath());
- boolean isSelected=false;
-
+ boolean isSelected = false;
+
if (select.isSelected(this))
{
tag.put("selected", "true");
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Mon Oct 15 15:46:09 2007
@@ -59,7 +59,7 @@
* Constructor
*
* @param id
- * @param elements
+ * @param elements
* @param renderer
*/
public SelectOptions(String id, Collection elements, IOptionRenderer renderer)
@@ -95,7 +95,8 @@
{
if (!(modelObject instanceof Collection))
{
- throw new WicketRuntimeException("Model object " + modelObject + " not a collection");
+ throw new WicketRuntimeException("Model object " + modelObject +
+ " not a collection");
}
// iterator over model objects for SelectOption components
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java Mon Oct 15 15:46:09 2007
@@ -33,11 +33,10 @@
/**
- * Image resource that dynamically scales the given original resource to a thumbnail.
- * It is scaled either using the given maxSize as width or height, depending on
- * its shape. If both the width and height are less than maxSize, no scaling is
- * performed.
- *
+ * Image resource that dynamically scales the given original resource to a thumbnail. It is scaled
+ * either using the given maxSize as width or height, depending on its shape. If both the width and
+ * height are less than maxSize, no scaling is performed.
+ *
* @author Eelco Hillenius
*/
public class ThumbnailImageResource extends DynamicImageResource
@@ -62,8 +61,11 @@
/**
* Construct.
- * @param unscaledImageResource the unscaled, original image resource. Must be not null
- * @param maxSize maximum size (width or height) for resize operation
+ *
+ * @param unscaledImageResource
+ * the unscaled, original image resource. Must be not null
+ * @param maxSize
+ * maximum size (width or height) for resize operation
*/
public ThumbnailImageResource(WebResource unscaledImageResource, int maxSize)
{
@@ -86,12 +88,13 @@
final BufferedImage image = getScaledImageInstance();
thumbnail = toImageData(image);
setLastModifiedTime(Time.now());
- }
+ }
return thumbnail;
}
/**
* get resized image instance.
+ *
* @return BufferedImage
*/
protected final BufferedImage getScaledImageInstance()
@@ -120,14 +123,21 @@
{
if (is != null)
{
- try { is.close(); } catch (IOException e) { log.error(e.getMessage(), e); }
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ log.error(e.getMessage(), e);
+ }
}
}
int originalWidth = originalImage.getWidth();
int originalHeight = originalImage.getHeight();
- if (originalWidth > maxSize || originalHeight > maxSize)
+ if (originalWidth > maxSize || originalHeight > maxSize)
{
final int newWidth;
final int newHeight;
@@ -158,14 +168,16 @@
/**
* Sets hint(s) for the scale operation.
- * @param scaleHints hint(s) for the scale operation
+ *
+ * @param scaleHints
+ * hint(s) for the scale operation
*/
public synchronized final void setScaleHints(int scaleHints)
{
this.scaleHints = scaleHints;
invalidate();
}
-
+
/**
* @see org.apache.wicket.markup.html.DynamicWebResource#invalidate()
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java Mon Oct 15 15:46:09 2007
@@ -31,9 +31,8 @@
/**
- * Acts as a base for data-grid views. Unlike a data view a data-grid view
- * populates both rows and columns. The columns are populated by an array of
- * provided ICellPopulator objects.
+ * Acts as a base for data-grid views. Unlike a data view a data-grid view populates both rows and
+ * columns. The columns are populated by an array of provided ICellPopulator objects.
*
* @see DataGridView
*
@@ -57,8 +56,7 @@
* @param id
* component id
* @param populators
- * array of ICellPopulator objects that will be used to populate
- * cell items
+ * array of ICellPopulator objects that will be used to populate cell items
* @param dataProvider
* data provider
*/
@@ -70,9 +68,8 @@
}
/**
- * Returns iterator over ICellPopulator elements in the populators array.
- * This method caches the iterator implemenation in a transient member
- * instance.
+ * Returns iterator over ICellPopulator elements in the populators array. This method caches the
+ * iterator implemenation in a transient member instance.
*
* @return iterator over ICellPopulator elements in the populators array
*/
@@ -173,7 +170,7 @@
for (int i = 0; populators.hasNext(); i++)
{
- IModel populatorModel=(IModel)populators.next();
+ IModel populatorModel = (IModel)populators.next();
Item cellItem = newCellItem(cells.newChildId(), i, populatorModel);
cells.add(cellItem);
@@ -183,10 +180,10 @@
if (cellItem.get("cell") == null)
{
throw new WicketRuntimeException(
- populator.getClass().getName()
- + ".populateItem() failed to add a component with id ["
- + CELL_ITEM_ID
- + "] to the provided [cellItem] object. Make sure you call add() on cellItem ( cellItem.add(new MyComponent(componentId, rowModel) )");
+ populator.getClass().getName() +
+ ".populateItem() failed to add a component with id [" +
+ CELL_ITEM_ID +
+ "] to the provided [cellItem] object. Make sure you call add() on cellItem ( cellItem.add(new MyComponent(componentId, rowModel) )");
}
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java Mon Oct 15 15:46:09 2007
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.repeater.data.IDataProvider;
-
/**
* Simple concrete implementation of {@link AbstractDataGridView}
*
@@ -39,8 +38,8 @@
* </pre>
*
* <p>
- * Though this example is about a HTML table, DataGridView is not at all limited
- * to HTML tables. Any kind of grid can be rendered using DataGridView.
+ * Though this example is about a HTML table, DataGridView is not at all limited to HTML tables. Any
+ * kind of grid can be rendered using DataGridView.
* <p>
* And the related Java code:
*
@@ -86,8 +85,7 @@
/**
* Constructor
*
- * Notice cells are created in the same order as cell populators in the
- * array
+ * Notice cells are created in the same order as cell populators in the array
*
* @param id
* component id
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/ICellPopulator.java Mon Oct 15 15:46:09 2007
@@ -22,8 +22,8 @@
import org.apache.wicket.model.IModel;
/**
- * Represents an object that is capable of populating an {@link Item} container
- * representing a cell in a {@link DataGridView} with components.
+ * Represents an object that is capable of populating an {@link Item} container representing a cell
+ * in a {@link DataGridView} with components.
* <p>
* Example
* <p>
@@ -31,16 +31,16 @@
* <pre>
* class NamePopulator implements ICellPopulator
* {
- * void populateItem(final Item cellItem, final String componentId, final IModel rowModel) {
+ * void populateItem(final Item cellItem, final String componentId, final IModel rowModel) {
* User user=(User)rowModel.getObject(cellItem);
* String name=user.getFirstName()+" "+user.getLastName();
* cellItem.add(new Label(componentId, name);
* }}
* </pre>
*
- * In this example the IDataProvider assigned to the DataGridView retrieves User
- * objects from the database. The cell populator adds a label to the cell that
- * will display the full name of the user.
+ * In this example the IDataProvider assigned to the DataGridView retrieves User objects from the
+ * database. The cell populator adds a label to the cell that will display the full name of the
+ * user.
*
* @see DataGridView
* @see Item
@@ -53,18 +53,17 @@
/**
* Method used to populate a cell in the {@link DataGridView}
*
- * <b>Implementation MUST add a component to the cellItem using the
- * component id provided by componentId argument, otherwise a
- * WicketRuntimeException will be thrown</b>
+ * <b>Implementation MUST add a component to the cellItem using the component id provided by
+ * componentId argument, otherwise a WicketRuntimeException will be thrown</b>
*
* @param cellItem
* the item representing the current table cell being rendered
* @param componentId
- * the id of the component used to render the cell (only one
- * component should be added to the cell)
+ * the id of the component used to render the cell (only one component should be
+ * added to the cell)
* @param rowModel
- * the model of the row item being rendered. this model usually
- * contains the model provided by the data provider.
+ * the model of the row item being rendered. this model usually contains the model
+ * provided by the data provider.
*
* @see Item
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java Mon Oct 15 15:46:09 2007
@@ -22,9 +22,9 @@
import org.apache.wicket.model.PropertyModel;
/**
- * A convinience implementation of {@link ICellPopulator} that adds a label that
- * will display the value of the specified property. Non-string properties will
- * be converted to a string before display.
+ * A convinience implementation of {@link ICellPopulator} that adds a label that will display the
+ * value of the specified property. Non-string properties will be converted to a string before
+ * display.
* <p>
* Example
*
@@ -44,8 +44,8 @@
* Constructor
*
* @param property
- * property whose value will be displayed in the cell. uses
- * wicket's {@link PropertyModel} notation.
+ * property whose value will be displayed in the cell. uses wicket's
+ * {@link PropertyModel} notation.
*/
public PropertyPopulator(String property)
{
@@ -60,7 +60,7 @@
* @see org.apache.wicket.model.IDetachable#detach()
*/
public void detach()
- {
+ {
}
/**
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortState.java Mon Oct 15 15:46:09 2007
@@ -19,8 +19,7 @@
import org.apache.wicket.IClusterable;
/**
- * Interface used by OrderByLink to interact with any object that keeps track of
- * sorting state
+ * Interface used by OrderByLink to interact with any object that keeps track of sorting state
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -46,8 +45,7 @@
* @param property
* the name of the property to sort on
* @param state
- * new sort state of the property. must be one of ASCENDING,
- * DESCENDING, or NONE
+ * new sort state of the property. must be one of ASCENDING, DESCENDING, or NONE
*/
public void setPropertySortOrder(String property, int state);
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/ISortStateLocator.java Mon Oct 15 15:46:09 2007
@@ -20,8 +20,8 @@
/**
- * Locator interface for ISortState implementations. OrderByLink uses this
- * interface to locate and version ISortState objects.
+ * Locator interface for ISortState implementations. OrderByLink uses this interface to locate and
+ * version ISortState objects.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java Mon Oct 15 15:46:09 2007
@@ -19,9 +19,9 @@
import org.apache.wicket.markup.html.border.Border;
/**
- * A component that wraps markup with an OrderByLink. This has the advantage of
- * being able to add the attribute modifier to the wrapping element as opposed
- * to the link, so that it can be attached to <th> or any other element.
+ * A component that wraps markup with an OrderByLink. This has the advantage of being able to add
+ * the attribute modifier to the wrapping element as opposed to the link, so that it can be attached
+ * to <th> or any other element.
*
* For example:
*
@@ -70,8 +70,7 @@
}
/**
- * This method is a hook for subclasses to perform an action after sort has
- * changed
+ * This method is a hook for subclasses to perform an action after sort has changed
*/
protected void onSortChanged()
{
@@ -80,14 +79,11 @@
/**
* @param id
- * see
- * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
+ * see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
* @param property
- * see
- * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
+ * see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
* @param stateLocator
- * see
- * {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
+ * see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
*/
public OrderByBorder(String id, String property, ISortStateLocator stateLocator)
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java Mon Oct 15 15:46:09 2007
@@ -25,8 +25,8 @@
import org.apache.wicket.version.undo.Change;
/**
- * A component that represents a sort header. When the link is clicked it will
- * toggle the state of a sortable property within the sort state object.
+ * A component that represents a sort header. When the link is clicked it will toggle the state of a
+ * sortable property within the sort state object.
*
* @author Phil Kulak
* @author Igor Vaynberg (ivaynberg)
@@ -47,13 +47,12 @@
* @param id
* the component id of the link
* @param property
- * the name of the sortable property this link represents. this
- * value will be used as parameter for sort state object methods.
- * sort state object will be located via the stateLocator
- * argument.
+ * the name of the sortable property this link represents. this value will be used as
+ * parameter for sort state object methods. sort state object will be located via the
+ * stateLocator argument.
* @param stateLocator
- * locator used to locate sort state object that this will use to
- * read/write state of sorted properties
+ * locator used to locate sort state object that this will use to read/write state of
+ * sorted properties
*/
public OrderByLink(String id, String property, ISortStateLocator stateLocator)
{
@@ -66,16 +65,14 @@
* @param id
* the component id of the link
* @param property
- * the name of the sortable property this link represents. this
- * value will be used as parameter for sort state object methods.
- * sort state object will be located via the stateLocator
- * argument.
+ * the name of the sortable property this link represents. this value will be used as
+ * parameter for sort state object methods. sort state object will be located via the
+ * stateLocator argument.
* @param stateLocator
- * locator used to locate sort state object that this will use to
- * read/write state of sorted properties
+ * locator used to locate sort state object that this will use to read/write state of
+ * sorted properties
* @param cssProvider
- * CSS provider that will be used generate the value of class
- * attribute for this link
+ * CSS provider that will be used generate the value of class attribute for this link
*
* @see OrderByLink.ICssProvider
*
@@ -110,8 +107,7 @@
}
/**
- * This method is a hook for subclasses to perform an action after sort has
- * changed
+ * This method is a hook for subclasses to perform an action after sort has changed
*/
protected void onSortChanged()
{
@@ -221,8 +217,8 @@
/**
- * Interface used to generate values of css class attribute for the anchor
- * tag If the generated value is null class attribute will not be added
+ * Interface used to generate values of css class attribute for the anchor tag If the generated
+ * value is null class attribute will not be added
*
* @author igor
*/
@@ -233,8 +229,8 @@
* current sort state
* @param property
* sort property represented by the {@link OrderByLink}
- * @return the value of the "class" attribute for the given sort
- * state/sort property combination
+ * @return the value of the "class" attribute for the given sort state/sort property
+ * combination
*/
public String getClassAttributeValue(ISortState state, String property);
}
@@ -294,8 +290,8 @@
}
/**
- * Convineince implementation of ICssProvider that always returns a null and
- * so never adds a class attribute
+ * Convineince implementation of ICssProvider that always returns a null and so never adds a
+ * class attribute
*
* @author Igor Vaynberg ( ivaynberg )
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java Mon Oct 15 15:46:09 2007
@@ -91,13 +91,13 @@
* @see org.apache.wicket.model.IDetachable#detach()
*/
public void detach()
- {
+ {
if (displayModel != null)
{
displayModel.detach();
}
}
-
+
/**
* @ssee {@link IStyledColumn#getCssClass()}
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Mon Oct 15 15:46:09 2007
@@ -34,13 +34,11 @@
/**
- * A data table builds on data grid view to introduce toolbars. Toolbars can be
- * used to display sortable column headers, paging information, filter controls,
- * and other information.
+ * A data table builds on data grid view to introduce toolbars. Toolbars can be used to display
+ * sortable column headers, paging information, filter controls, and other information.
* <p>
- * Data table also provides its own markup for an html table so the user does
- * not need to provide it himself. This makes it very simple to add a datatable
- * to the markup, however, some flexibility.
+ * Data table also provides its own markup for an html table so the user does not need to provide it
+ * himself. This makes it very simple to add a datatable to the markup, however, some flexibility.
* <p>
* Example
*
@@ -48,8 +46,8 @@
* <table wicket:id="datatable"></table>
* </pre>
*
- * And the related Java code: ( the first column will be sortable because its
- * sort property is specified, the second column will not )
+ * And the related Java code: ( the first column will be sortable because its sort property is
+ * specified, the second column will not )
*
* <pre>
*
@@ -103,8 +101,7 @@
}
/**
- * The component id that toolbars must be created with in order to be added
- * to the data table
+ * The component id that toolbars must be created with in order to be added to the data table
*/
public static final String TOOLBAR_COMPONENT_ID = "toolbar";
@@ -274,8 +271,7 @@
/**
- * Sets the item reuse strategy. This strategy controls the creation of
- * {@link Item}s.
+ * Sets the item reuse strategy. This strategy controls the creation of {@link Item}s.
*
* @see RefreshingView#setItemReuseStrategy(IItemReuseStrategy)
* @see IItemReuseStrategy
@@ -326,8 +322,7 @@
}
/**
- * Factory method for Item container that represents a cell in the
- * underlying DataGridView
+ * Factory method for Item container that represents a cell in the underlying DataGridView
*
* @see Item
*
@@ -346,8 +341,7 @@
}
/**
- * Factory method for Item container that represents a row in the underlying
- * DataGridView
+ * Factory method for Item container that represents a row in the underlying DataGridView
*
* @see Item
*
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java Mon Oct 15 15:46:09 2007
@@ -24,13 +24,11 @@
/**
- * An implementation of the DataTable that aims to solve the 90% usecase by
- * adding navigation, headers, an no-records-found toolbars to a standard
- * {@link DataTable}.
+ * An implementation of the DataTable that aims to solve the 90% usecase by adding navigation,
+ * headers, an no-records-found toolbars to a standard {@link DataTable}.
* <p>
- * The {@link NavigationToolbar} and the {@link HeadersToolbar} are added as top
- * toolbars, while the {@link NoRecordsToolbar} toolbar is added as a bottom
- * toolbar.
+ * The {@link NavigationToolbar} and the {@link HeadersToolbar} are added as top toolbars, while the
+ * {@link NoRecordsToolbar} toolbar is added as a bottom toolbar.
*
* @see DataTable
* @see HeadersToolbar
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java Mon Oct 15 15:46:09 2007
@@ -23,8 +23,8 @@
/**
- * Toolbars that displays column headers. If the column is sortable a sortable
- * header will be displayed.
+ * Toolbars that displays column headers. If the column is sortable a sortable header will be
+ * displayed.
*
* @see DefaultDataTable
*
@@ -34,15 +34,14 @@
public class HeadersToolbar extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
-
+
/**
* Constructor
*
* @param table
* data table this toolbar will be attached to
* @param stateLocator
- * locator for the ISortState implementation used by sortable
- * headers
+ * locator for the ISortState implementation used by sortable headers
*/
public HeadersToolbar(final DataTable table, final ISortStateLocator stateLocator)
{
@@ -69,20 +68,20 @@
{
header = new WebMarkupContainer("header");
}
-
+
if (column instanceof IStyledColumn)
{
- header.add(new DataTable.CssAttributeBehavior()
+ header.add(new DataTable.CssAttributeBehavior()
{
private static final long serialVersionUID = 1L;
-
+
protected String getCssClass()
{
return ((IStyledColumn)column).getCssClass();
}
});
}
-
+
item.add(header);
item.setRenderBodyOnly(true);
header.add(column.getHeader("label"));
@@ -91,9 +90,8 @@
}
/**
- * Factory method for sortable header components. A sortable header
- * component must have id of <code>headerId</code> and conform to markup
- * specified in <code>HeadersToolbar.html</code>
+ * Factory method for sortable header components. A sortable header component must have id of
+ * <code>headerId</code> and conform to markup specified in <code>HeadersToolbar.html</code>
*
* @param headerId
* header component id
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java Mon Oct 15 15:46:09 2007
@@ -40,8 +40,8 @@
Component getHeader(String componentId);
/**
- * Returns the name of the property that this header sorts. If null is
- * returned the header will be unsortable.
+ * Returns the name of the property that this header sorts. If null is returned the header will
+ * be unsortable.
*
* @return a string representing the sort property
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java Mon Oct 15 15:46:09 2007
@@ -18,7 +18,7 @@
package org.apache.wicket.extensions.markup.html.repeater.data.table;
/**
- * Interface that allows styling individuals DataTable columns
+ * Interface that allows styling individuals DataTable columns
*
* @author Matej Knopp
*/
@@ -26,6 +26,7 @@
{
/**
* Returns the css class for this column.
+ *
* @return CSS class name
*/
public String getCssClass();
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java Mon Oct 15 15:46:09 2007
@@ -23,9 +23,8 @@
import org.apache.wicket.model.Model;
/**
- * Toolbar that displays links used to navigate the pages of the datatable as
- * well as a message about which rows are being displayed and their total number
- * in the data table.
+ * Toolbar that displays links used to navigate the pages of the datatable as well as a message
+ * about which rows are being displayed and their total number in the data table.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -58,8 +57,7 @@
/**
- * Factory method used to create the paging navigator that will be used by
- * the datatable
+ * Factory method used to create the paging navigator that will be used by the datatable
*
* @param navigatorId
* component id the navigator should be created with
@@ -73,8 +71,7 @@
}
/**
- * Factory method used to create the navigator label that will be used by
- * the datatable
+ * Factory method used to create the navigator label that will be used by the datatable
*
* @param navigatorId
* component id navigator label should be created with
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java Mon Oct 15 15:46:09 2007
@@ -126,23 +126,25 @@
private NavigatorLabel(final String id, final PageableComponent table)
{
super(id);
- setModel(new StringResourceModel("NavigatorLabel", this, new Model(new LabelModelObject(table)), "Showing ${from} to ${to} of ${of}"));
+ setModel(new StringResourceModel("NavigatorLabel", this, new Model(new LabelModelObject(
+ table)), "Showing ${from} to ${to} of ${of}"));
}
private class LabelModelObject implements IClusterable
{
private static final long serialVersionUID = 1L;
private PageableComponent table;
-
+
/**
* Construct.
+ *
* @param table
*/
public LabelModelObject(PageableComponent table)
{
this.table = table;
}
-
+
/**
* @return "z" in "Showing x to y of z"
*/
@@ -150,7 +152,7 @@
{
return table.getRowCount();
}
-
+
/**
* @return "x" in "Showing x to y of z"
*/
@@ -162,7 +164,7 @@
}
return (table.getCurrentPage() * table.getRowsPerPage()) + 1;
}
-
+
/**
* @return "y" in "Showing x to y of z"
*/
@@ -172,8 +174,8 @@
{
return 0;
}
- return Math.min(getOf(), getFrom() + table.getRowsPerPage()-1);
+ return Math.min(getOf(), getFrom() + table.getRowsPerPage() - 1);
}
-
+
}
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java Mon Oct 15 15:46:09 2007
@@ -24,8 +24,7 @@
import org.apache.wicket.model.ResourceModel;
/**
- * A toolbar that displays a "no records found" message when the data table
- * contains no rows.
+ * A toolbar that displays a "no records found" message when the data table contains no rows.
* <p>
* The message can be overridden by providing a resource with key
* <code>datatable.no-records-found</code>
@@ -57,8 +56,7 @@
* @param table
* data table this toolbar will be attached to
* @param messageModel
- * model that will be used to display the "no records found"
- * message
+ * model that will be used to display the "no records found" message
*/
public NoRecordsToolbar(final DataTable table, IModel messageModel)
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java Mon Oct 15 15:46:09 2007
@@ -24,10 +24,9 @@
/**
- * A convinience implementation of column that adds a label to the cell whose
- * model is determined by the provided wicket property expression (same as used
- * by {@link PropertyModel}) that is evaluated against the current row's model
- * object
+ * A convinience implementation of column that adds a label to the cell whose model is determined by
+ * the provided wicket property expression (same as used by {@link PropertyModel}) that is
+ * evaluated against the current row's model object
* <p>
* Example
*
@@ -35,8 +34,8 @@
* columns[0] = new PropertyColumn(new Model("First Name"), "name.first");
* </pre>
*
- * The above will attach a label to the cell with a property model for the
- * expression "name.first"
+ * The above will attach a label to the cell with a property model for the expression
+ * "name.first"
*
* @see PropertyModel
*
@@ -81,8 +80,8 @@
}
/**
- * Implementation of populateItem which adds a label to the cell whose model
- * is the provided property expression evaluated agains rowModelObject
+ * Implementation of populateItem which adds a label to the cell whose model is the provided
+ * property expression evaluated agains rowModelObject
*
* @see ICellPopulator#populateItem(Item, String, IModel)
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java Mon Oct 15 15:46:09 2007
@@ -45,10 +45,9 @@
}
/**
- * Enables the tracking of focus for the specified form component. This
- * allows the filter form to restore focus to the component which caused the
- * form submission. Great for when you are inside a filter textbox and use
- * the enter key to submit the filter.
+ * Enables the tracking of focus for the specified form component. This allows the filter form
+ * to restore focus to the component which caused the form submission. Great for when you are
+ * inside a filter textbox and use the enter key to submit the filter.
*
* @param fc
* form component for which focus tracking will be enabled
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java Mon Oct 15 15:46:09 2007
@@ -132,8 +132,7 @@
}
/**
- * @return the DropDownChoice form component created to represent this
- * filter
+ * @return the DropDownChoice form component created to represent this filter
*/
public DropDownChoice getChoice()
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java Mon Oct 15 15:46:09 2007
@@ -22,10 +22,10 @@
import org.apache.wicket.model.PropertyModel;
/**
- * A filtered property column that creates a textfield filter component. The
- * default model of the created textfield is a property model with the same
- * property expression as the one used to display data. This works well when the
- * filter state object is of the same type as the objects in the data table.
+ * A filtered property column that creates a textfield filter component. The default model of the
+ * created textfield is a property model with the same property expression as the one used to
+ * display data. This works well when the filter state object is of the same type as the objects in
+ * the data table.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -92,8 +92,8 @@
}
/**
- * Returns the model that will be passed on to the text filter. Users can
- * override this method to change the model.
+ * Returns the model that will be passed on to the text filter. Users can override this method
+ * to change the model.
*
* @param form
* filter form
@@ -105,8 +105,8 @@
}
/**
- * Returns true if the constructed choice filter should autosubmit the form
- * when its value is changed.
+ * Returns true if the constructed choice filter should autosubmit the form when its value is
+ * changed.
*
* @return true to make choice filter autosubmit, false otherwise
*/
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Mon Oct 15 15:46:09 2007
@@ -54,7 +54,7 @@
// add hidden field used for managing current focus
hidden = new HiddenField("focus-tracker", new Model());
-
+
hidden.add(new AbstractBehavior()
{
private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@
}
});
add(hidden);
-
+
// add javascript to restore focus to a filter component
add(new WebMarkupContainer("focus-restore")
{
@@ -74,16 +74,16 @@
protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
- AppendingStringBuffer script = new AppendingStringBuffer("<script>_filter_focus_restore('").append(
- getFocusTrackerFieldCssId()).append("');</script>");
+ AppendingStringBuffer script = new AppendingStringBuffer(
+ "<script>_filter_focus_restore('").append(getFocusTrackerFieldCssId())
+ .append("');</script>");
replaceComponentTagBody(markupStream, openTag, script);
}
});
}
/**
- * @return css id of the hidden form input that keeps track of the focused
- * input field
+ * @return css id of the hidden form input that keeps track of the focused input field
*/
public final String getFocusTrackerFieldCssId()
{
@@ -100,8 +100,8 @@
}
/**
- * Adds behavior to the form component to allow this form to keep track of
- * the component's focus which will be restored after a form submit.
+ * Adds behavior to the form component to allow this form to keep track of the component's focus
+ * which will be restored after a form submit.
*
* @param fc
* form component
@@ -122,19 +122,18 @@
}
/**
- * Returns the javascript focus handler necessary to notify the form of
- * focus tracking changes on the component
+ * Returns the javascript focus handler necessary to notify the form of focus tracking changes
+ * on the component
*
- * Useful when components want to participate in focus tracking but want to
- * add the handler their own way.
+ * Useful when components want to participate in focus tracking but want to add the handler
+ * their own way.
*
- * A unique css id is required on the form component for focus tracking to
- * work.
+ * A unique css id is required on the form component for focus tracking to work.
*
* @param component
- * component to
- * @return the javascript focus handler necessary to notify the form of
- * focus tracking changes on the component
+ * component to
+ * @return the javascript focus handler necessary to notify the form of focus tracking changes
+ * on the component
*/
public final String getFocusTrackingHandler(Component component)
{
@@ -157,8 +156,7 @@
* Constructor
*
* @param locator
- * IFilterStateLocator implementation used to provide model
- * object for this model
+ * IFilterStateLocator implementation used to provide model object for this model
*/
public FilterStateModel(IFilterStateLocator locator)
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java Mon Oct 15 15:46:09 2007
@@ -19,8 +19,7 @@
import org.apache.wicket.model.Model;
/**
- * Model that wraps filter state locator to make its use transparent to wicket
- * components.
+ * Model that wraps filter state locator to make its use transparent to wicket components.
* <p>
* Example:
*
@@ -29,8 +28,7 @@
* TextField tf = new TextField("tf", new FilterStateModel(locator));
* </pre>
*
- * Text field tf will now user the object that filter state locator locates as
- * its underlying model.
+ * Text field tf will now user the object that filter state locator locates as its underlying model.
* </p>
*
* @author Igor Vaynberg (ivaynberg)
@@ -45,8 +43,7 @@
* Constructor
*
* @param locator
- * IFilterStateLocator implementation used to provide model
- * object for this model
+ * IFilterStateLocator implementation used to provide model object for this model
*/
public FilterStateModel(IFilterStateLocator locator)
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java Mon Oct 15 15:46:09 2007
@@ -25,9 +25,8 @@
/**
- * Toolbar that creates a form to hold form components used to filter data in
- * the data table. Form components are provided by columns that implement
- * IFilteredColumn.
+ * Toolbar that creates a form to hold form components used to filter data in the data table. Form
+ * components are provided by columns that implement IFilteredColumn.
*
* @author Igor Vaynberg (ivaynber)
*
@@ -43,10 +42,10 @@
* @param table
* data table this toolbar will be added to
* @param stateLocator
- * locator responsible for finding object used to store filter's
- * state
+ * locator responsible for finding object used to store filter's state
*/
- public FilterToolbar(final DataTable table, final FilterForm form, final IFilterStateLocator stateLocator)
+ public FilterToolbar(final DataTable table, final FilterForm form,
+ final IFilterStateLocator stateLocator)
{
super(table);
@@ -73,13 +72,13 @@
IColumn col = cols[i];
Component filter = null;
-
+
if (col instanceof IFilteredColumn)
{
IFilteredColumn filteredCol = (IFilteredColumn)col;
filter = filteredCol.getFilter(FILTER_COMPONENT_ID, form);
}
-
+
if (filter == null)
{
filter = new NoFilter(FILTER_COMPONENT_ID);
@@ -89,15 +88,18 @@
if (!filter.getId().equals(FILTER_COMPONENT_ID))
{
throw new IllegalStateException(
- "filter component returned with an invalid component id. invalid component id ["
- + filter.getId() + "] required component id ["
- + FILTER_COMPONENT_ID + "] generating column ["
- + col.toString() + "] ");
+ "filter component returned with an invalid component id. invalid component id [" +
+ filter.getId() +
+ "] required component id [" +
+ FILTER_COMPONENT_ID +
+ "] generating column [" +
+ col.toString() +
+ "] ");
}
}
item.add(filter);
-
+
filters.add(item);
}
@@ -105,11 +107,11 @@
protected void onBeforeRender()
{
- if (findParent(FilterForm.class)==null)
- {
+ if (findParent(FilterForm.class) == null)
+ {
throw new IllegalStateException("FilterToolbar must be contained within a Form");
}
super.onBeforeRender();
}
-
+
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java Mon Oct 15 15:46:09 2007
@@ -18,7 +18,6 @@
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
/**
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java Mon Oct 15 15:46:09 2007
@@ -40,11 +40,9 @@
* @param displayModel
* model used to construct header text
* @param sortProperty
- * sort property this column represents, if null this column will
- * not be sortable
+ * sort property this column represents, if null this column will not be sortable
* @param propertyExpression
- * wicket property expression for the column, see
- * {@link PropertyModel} for details
+ * wicket property expression for the column, see {@link PropertyModel} for details
*/
public FilteredPropertyColumn(IModel displayModel, String sortProperty,
String propertyExpression)
@@ -56,8 +54,7 @@
* @param displayModel
* model used to construct header text
* @param propertyExpression
- * wicket property expression for the column, see
- * {@link PropertyModel} for details
+ * wicket property expression for the column, see {@link PropertyModel} for details
*/
public FilteredPropertyColumn(IModel displayModel, String propertyExpression)
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java Mon Oct 15 15:46:09 2007
@@ -40,8 +40,7 @@
/**
* Constructor
*
- * This constructor will use default models for the 'clear' and 'go' button
- * labels
+ * This constructor will use default models for the 'clear' and 'go' button labels
*
* @param id
* component id
@@ -95,14 +94,14 @@
}
/**
- * This method should be implemented by subclasses to provide behavior for
- * the clear button.
+ * This method should be implemented by subclasses to provide behavior for the clear button.
*
* @param button
* the 'clear' button
*
*/
- protected void onClearSubmit(Button button) {
+ protected void onClearSubmit(Button button)
+ {
button.getForm().setModelObject(Objects.cloneModel(originalState));
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java Mon Oct 15 15:46:09 2007
@@ -22,8 +22,7 @@
import org.apache.wicket.model.Model;
/**
- * Filter component that generates a 'go' button that when pressed submits the
- * filter form
+ * Filter component that generates a 'go' button that when pressed submits the filter form
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -80,13 +79,12 @@
}
/**
- * This method can be overridden by subclasses to provide non-standard
- * behavior for the 'go' button.
+ * This method can be overridden by subclasses to provide non-standard behavior for the 'go'
+ * button.
*
* @param button
- * the 'go' button, can be used to get to the Form object and
- * through that to the filter state object by retrieving the
- * form's model object
+ * the 'go' button, can be used to get to the Form object and through that to the
+ * filter state object by retrieving the form's model object
*
*/
protected void onGoSubmit(Button button)
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilterStateLocator.java Mon Oct 15 15:46:09 2007
@@ -19,11 +19,10 @@
import org.apache.wicket.IClusterable;
/**
- * Locator that locates the object that represents the state of the filter.
- * Usually it is convinient to let the data provider object implement this
- * interface so that the data provider can be itself used to locate the filter
- * state object. This also makes it easy for the data provider to locate the
- * filter state which it will most likely need to filter the data.
+ * Locator that locates the object that represents the state of the filter. Usually it is convinient
+ * to let the data provider object implement this interface so that the data provider can be itself
+ * used to locate the filter state object. This also makes it easy for the data provider to locate
+ * the filter state which it will most likely need to filter the data.
* <p>
* Example
*
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java Mon Oct 15 15:46:09 2007
@@ -21,8 +21,8 @@
/**
- * Represents a data table column that can be filtered. The filter is
- * represented by a component returned from the getFilter() method.
+ * Represents a data table column that can be filtered. The filter is represented by a component
+ * returned from the getFilter() method.
*
* @see IColumn
*
@@ -32,18 +32,18 @@
public interface IFilteredColumn extends IColumn
{
/**
- * Returns the component used by user to filter the column. If null is
- * returned, no filter will be added.
+ * Returns the component used by user to filter the column. If null is returned, no filter will
+ * be added.
*
* @param componentId
* component id for returned filter component
* @param form
- * FilterForm object for the toolbar. components can use this
- * form's model to access properties of the state object (<code>PropertyModel(form.getModel(), "property"</code>)
+ * FilterForm object for the toolbar. components can use this form's model to access
+ * properties of the state object (<code>PropertyModel(form.getModel(), "property"</code>)
* or retrieve the {@link IFilterStateLocator} object by using
* {@link FilterForm#getStateLocator() }
- * @return component that will be used to represent a filter for this
- * column, or null if no such component is desired
+ * @return component that will be used to represent a filter for this column, or null if no such
+ * component is desired
*/
Component getFilter(String componentId, FilterForm form);
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java Mon Oct 15 15:46:09 2007
@@ -19,8 +19,8 @@
import org.apache.wicket.markup.html.panel.Panel;
/**
- * Component used to represent a filter component when no filter is provided.
- * This component generates a blank space.
+ * Component used to represent a filter component when no filter is provided. This component
+ * generates a blank space.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java Mon Oct 15 15:46:09 2007
@@ -50,8 +50,7 @@
}
/**
- * @return underlying {@link TextField} form component that represents this
- * filter
+ * @return underlying {@link TextField} form component that represents this filter
*/
public final TextField getFilter()
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java Mon Oct 15 15:46:09 2007
@@ -21,10 +21,10 @@
import org.apache.wicket.model.PropertyModel;
/**
- * A filtered property column that creates a textfield filter component. The
- * default model of the created textfield is a property model with the same
- * property expression as the one used to display data. This works well when the
- * filter state object is of the same type as the objects in the data table.
+ * A filtered property column that creates a textfield filter component. The default model of the
+ * created textfield is a property model with the same property expression as the one used to
+ * display data. This works well when the filter state object is of the same type as the objects in
+ * the data table.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -63,8 +63,8 @@
}
/**
- * Returns the model that will be passed on to the text filter. Users can
- * override this method to change the model.
+ * Returns the model that will be passed on to the text filter. Users can override this method
+ * to change the model.
*
* @param form
* filter form
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java Mon Oct 15 15:46:09 2007
@@ -21,8 +21,7 @@
/**
- * Implementation of ISortState that can keep track of sort information for a
- * single property.
+ * Implementation of ISortState that can keep track of sort information for a single property.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java Mon Oct 15 15:46:09 2007
@@ -66,8 +66,8 @@
if (rhs instanceof SortParam)
{
SortParam param = (SortParam)rhs;
- return getProperty().equals(param.getProperty())
- && isAscending() == param.isAscending();
+ return getProperty().equals(param.getProperty()) &&
+ isAscending() == param.isAscending();
}
return false;
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java Mon Oct 15 15:46:09 2007
@@ -21,12 +21,11 @@
/**
- * Convenience implementation of a data provider that can also act as a locator
- * for a {@link SingleSortState} object.
+ * Convenience implementation of a data provider that can also act as a locator for a
+ * {@link SingleSortState} object.
*
- * Most times it is convenient to keep sort and filtering information inside the
- * data provider implementation because it makes that information easy to access
- * within the data provider.
+ * Most times it is convenient to keep sort and filtering information inside the data provider
+ * implementation because it makes that information easy to access within the data provider.
*
* @author Igor Vaynberg (ivaynberg at apache dot org)
*/
@@ -54,8 +53,8 @@
if (!(state instanceof SingleSortState))
{
throw new IllegalArgumentException(
- "argument [state] must be an instance of SingleSortState, but it is ["
- + state.getClass().getName() + "]:[" + state.toString() + "]");
+ "argument [state] must be an instance of SingleSortState, but it is [" +
+ state.getClass().getName() + "]:[" + state.toString() + "]");
}
this.state = (SingleSortState)state;
}
@@ -101,5 +100,5 @@
{
}
-
+
}
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java Mon Oct 15 15:46:09 2007
@@ -39,8 +39,7 @@
* Constructor
*
* @param title
- * IModel used to represent the title of the tab. Must contain a
- * string
+ * IModel used to represent the title of the tab. Must contain a string
*/
public AbstractTab(IModel title)
{
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ITab.java Mon Oct 15 15:46:09 2007
@@ -32,8 +32,7 @@
public interface ITab extends IClusterable
{
/**
- * @return IModel used to represent the title of the tab. Must contain a
- * string.
+ * @return IModel used to represent the title of the tab. Must contain a string.
*/
IModel getTitle();
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java Mon Oct 15 15:46:09 2007
@@ -20,8 +20,7 @@
import org.apache.wicket.model.IModel;
/**
- * A simple decorator that will cache the panel returned from the first call to
- * getPanel()
+ * A simple decorator that will cache the panel returned from the first call to getPanel()
*
* @see org.apache.wicket.extensions.markup.html.tabs.ITab
* @see org.apache.wicket.extensions.markup.html.tabs.TabbedPanel
Modified: wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=584952&r1=584951&r2=584952&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Mon Oct 15 15:46:09 2007
@@ -32,8 +32,8 @@
/**
- * TabbedPanel component represets a panel with tabs that are used to switch
- * between different content panels inside the TabbedPanel panel.
+ * TabbedPanel component represets a panel with tabs that are used to switch between different
+ * content panels inside the TabbedPanel panel.
* <p>
* Example:
*
@@ -69,8 +69,7 @@
* </p>
*
* <p>
- * For a complete example see the component references in wicket-examples
- * project
+ * For a complete example see the component references in wicket-examples project
* </p>
*
* @see org.apache.wicket.extensions.markup.html.tabs.ITab
@@ -106,7 +105,7 @@
{
throw new IllegalArgumentException("argument [tabs] cannot be null");
}
-
+
this.tabs = tabs;
final IModel tabCount = new AbstractReadOnlyModel()
@@ -180,20 +179,21 @@
});
}
-
- //@see org.apache.wicket.Component#onAttach()
+
+ // @see org.apache.wicket.Component#onAttach()
protected void onBeforeRender()
{
super.onBeforeRender();
- if (!hasBeenRendered() && getSelectedTab() == -1) {
+ if (!hasBeenRendered() && getSelectedTab() == -1)
+ {
// select the first tab by default
setSelectedTab(0);
}
}
/**
- * @return the value of css class attribute that will be added to a div
- * containing the tabs. The default value is <code>tab-row</code>
+ * @return the value of css class attribute that will be added to a div containing the tabs. The
+ * default value is <code>tab-row</code>
*/
protected String getTabContainerCssClass()
{
@@ -201,8 +201,7 @@
}
/**
- * @return list of tabs that can be used by the user to add/remove/reorder
- * tabs in the panel
+ * @return list of tabs that can be used by the user to add/remove/reorder tabs in the panel
*/
public final List getTabs()
{
@@ -210,8 +209,8 @@
}
/**
- * Factory method for tab titles. Returned component can be anything that
- * can attach to span tags such as a fragment, panel, or a label
+ * Factory method for tab titles. Returned component can be anything that can attach to span
+ * tags such as a fragment, panel, or a label
*
* @param titleId
* id of title component
@@ -230,8 +229,8 @@
/**
* Factory method for links used to switch between tabs.
*
- * The created component is attached to the following markup. Label
- * component with id: title will be added for you by the tabbed panel.
+ * The created component is attached to the following markup. Label component with id: title
+ * will be added for you by the tabbed panel.
*
* <pre>
* <a href="#" wicket:id="link"><span wicket:id="title">[[tab title]]</span></a>
@@ -257,8 +256,8 @@
* @param linkId
* component id with which the link should be created
* @param index
- * index of the tab that should be activated when this link is
- * clicked. See {@link #setSelectedTab(int)}.
+ * index of the tab that should be activated when this link is clicked. See
+ * {@link #setSelectedTab(int)}.
* @return created link component
*/
protected WebMarkupContainer newLink(String linkId, final int index)
@@ -296,18 +295,18 @@
if (panel == null)
{
- throw new WicketRuntimeException("ITab.getPanel() returned null. TabbedPanel ["
- + getPath() + "] ITab index [" + index + "]");
+ throw new WicketRuntimeException("ITab.getPanel() returned null. TabbedPanel [" +
+ getPath() + "] ITab index [" + index + "]");
}
if (!panel.getId().equals(TAB_PANEL_ID))
{
throw new WicketRuntimeException(
- "ITab.getPanel() returned a panel with invalid id ["
- + panel.getId()
- + "]. You must always return a panel with id equal to the provided panelId parameter. TabbedPanel ["
- + getPath() + "] ITab index [" + index + "]");
+ "ITab.getPanel() returned a panel with invalid id [" +
+ panel.getId() +
+ "]. You must always return a panel with id equal to the provided panelId parameter. TabbedPanel [" +
+ getPath() + "] ITab index [" + index + "]");
}