You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/01/23 11:44:36 UTC
svn commit: r1062370 [3/4] - in /wicket/trunk/wicket-extensions/src:
main/java/org/apache/wicket/extensions/
main/java/org/apache/wicket/extensions/ajax/markup/html/
main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/
main/java/org/ap...
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DefaultDataTable.java Sun Jan 23 10:44:31 2011
@@ -55,8 +55,8 @@ public class DefaultDataTable<T> extends
* @param rowsPerPage
* number of rows per page
*/
- public DefaultDataTable(String id, final List<IColumn<T>> columns,
- ISortableDataProvider<T> dataProvider, int rowsPerPage)
+ public DefaultDataTable(final String id, final List<IColumn<T>> columns,
+ final ISortableDataProvider<T> dataProvider, final int rowsPerPage)
{
super(id, columns, dataProvider, rowsPerPage);
@@ -66,7 +66,7 @@ public class DefaultDataTable<T> extends
}
@Override
- protected Item<T> newRowItem(String id, int index, IModel<T> model)
+ protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
return new OddEvenItem<T>(id, index, model);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java Sun Jan 23 10:44:31 2011
@@ -41,7 +41,7 @@ public abstract class HeaderlessColumn<T
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn#getHeader(java.lang.String)
*/
@Override
- public Component getHeader(String componentId)
+ public Component getHeader(final String componentId)
{
Component header = super.getHeader(componentId);
return header.setEscapeModelStrings(false);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java Sun Jan 23 10:44:31 2011
@@ -104,8 +104,8 @@ public class HeadersToolbar extends Abst
* sort state locator
* @return created header component
*/
- protected WebMarkupContainer newSortableHeader(String headerId, String property,
- ISortStateLocator locator)
+ protected WebMarkupContainer newSortableHeader(final String headerId, final String property,
+ final ISortStateLocator locator)
{
return new OrderByBorder(headerId, property, locator)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java Sun Jan 23 10:44:31 2011
@@ -60,7 +60,7 @@ public class NavigationToolbar extends A
* dataview used by datatable
* @return paging navigator that will be used to navigate the data table
*/
- protected PagingNavigator newPagingNavigator(String navigatorId, final DataTable<?> table)
+ protected PagingNavigator newPagingNavigator(final String navigatorId, final DataTable<?> table)
{
return new PagingNavigator(navigatorId, table);
}
@@ -75,7 +75,7 @@ public class NavigationToolbar extends A
* @return navigator label that will be used to navigate the data table
*
*/
- protected WebComponent newNavigatorLabel(String navigatorId, final DataTable<?> table)
+ protected WebComponent newNavigatorLabel(final String navigatorId, final DataTable<?> table)
{
return new NavigatorLabel(navigatorId, table);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigatorLabel.java Sun Jan 23 10:44:31 2011
@@ -37,6 +37,12 @@ public class NavigatorLabel extends Labe
{
private static final long serialVersionUID = 1L;
+ /**
+ * Construct.
+ *
+ * @param id
+ * @param pageable
+ */
public NavigatorLabel(final String id, final IPageableItems pageable)
{
super(id);
@@ -55,7 +61,7 @@ public class NavigatorLabel extends Labe
*
* @param table
*/
- public LabelModelObject(IPageableItems table)
+ public LabelModelObject(final IPageableItems table)
{
pageable = table;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java Sun Jan 23 10:44:31 2011
@@ -58,7 +58,7 @@ public class NoRecordsToolbar extends Ab
* @param messageModel
* model that will be used to display the "no records found" message
*/
- public NoRecordsToolbar(final DataTable<?> table, IModel<String> messageModel)
+ public NoRecordsToolbar(final DataTable<?> table, final IModel<String> messageModel)
{
super(table);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/PropertyColumn.java Sun Jan 23 10:44:31 2011
@@ -59,8 +59,8 @@ public class PropertyColumn<T> extends A
* @param propertyExpression
* wicket property expression used by PropertyModel
*/
- public PropertyColumn(IModel<String> displayModel, String sortProperty,
- String propertyExpression)
+ public PropertyColumn(final IModel<String> displayModel, final String sortProperty,
+ final String propertyExpression)
{
super(displayModel, sortProperty);
this.propertyExpression = propertyExpression;
@@ -75,7 +75,7 @@ public class PropertyColumn<T> extends A
* wicket property expression
* @see PropertyModel
*/
- public PropertyColumn(IModel<String> displayModel, String propertyExpression)
+ public PropertyColumn(final IModel<String> displayModel, final String propertyExpression)
{
super(displayModel, null);
this.propertyExpression = propertyExpression;
@@ -87,7 +87,8 @@ public class PropertyColumn<T> extends A
*
* @see ICellPopulator#populateItem(Item, String, IModel)
*/
- public void populateItem(Item<ICellPopulator<T>> item, String componentId, IModel<T> rowModel)
+ public void populateItem(final Item<ICellPopulator<T>> item, final String componentId,
+ final IModel<T> rowModel)
{
item.add(new Label(componentId, createLabelModel(rowModel)));
}
@@ -100,7 +101,7 @@ public class PropertyColumn<T> extends A
* @return model
*/
@SuppressWarnings("unchecked")
- protected IModel<?> createLabelModel(IModel<T> rowModel)
+ protected IModel<?> createLabelModel(final IModel<T> rowModel)
{
return new PropertyModel(rowModel, propertyExpression);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java Sun Jan 23 10:44:31 2011
@@ -37,7 +37,7 @@ public class AbstractFilter extends Pane
* @param form
* filter form of the filter toolbar
*/
- public AbstractFilter(String id, FilterForm<?> form)
+ public AbstractFilter(final String id, final FilterForm<?> form)
{
super(id);
this.form = form;
@@ -51,7 +51,7 @@ public class AbstractFilter extends Pane
* @param fc
* form component for which focus tracking will be enabled
*/
- protected void enableFocusTracking(FormComponent<?> fc)
+ protected void enableFocusTracking(final FormComponent<?> fc)
{
form.enableFocusTracking(fc);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilter.java Sun Jan 23 10:44:31 2011
@@ -48,8 +48,8 @@ public class ChoiceFilter<T> extends Abs
* @param choices
* @param autoSubmit
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm<?> form,
- IModel<List<? extends T>> choices, boolean autoSubmit)
+ public ChoiceFilter(final String id, final IModel<T> model, final FilterForm<?> form,
+ final IModel<List<? extends T>> choices, final boolean autoSubmit)
{
this(id, model, form, choices, new ChoiceRenderer<T>(), autoSubmit);
}
@@ -61,8 +61,8 @@ public class ChoiceFilter<T> extends Abs
* @param choices
* @param autoSubmit
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm<?> form, List<? extends T> choices,
- boolean autoSubmit)
+ public ChoiceFilter(final String id, final IModel<T> model, final FilterForm<?> form,
+ final List<? extends T> choices, final boolean autoSubmit)
{
this(id, model, form, Model.ofList(choices), new ChoiceRenderer<T>(), autoSubmit);
}
@@ -75,8 +75,8 @@ public class ChoiceFilter<T> extends Abs
* @param renderer
* @param autoSubmit
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm<?> form, List<? extends T> choices,
- IChoiceRenderer<T> renderer, boolean autoSubmit)
+ public ChoiceFilter(final String id, final IModel<T> model, final FilterForm<?> form,
+ final List<? extends T> choices, final IChoiceRenderer<T> renderer, final boolean autoSubmit)
{
this(id, model, form, Model.ofList(choices), renderer, autoSubmit);
}
@@ -96,8 +96,9 @@ public class ChoiceFilter<T> extends Abs
* if true this filter will submit the form on selection change
* @see DropDownChoice
*/
- public ChoiceFilter(String id, IModel<T> model, FilterForm<?> form,
- IModel<List<? extends T>> choices, IChoiceRenderer<T> renderer, boolean autoSubmit)
+ public ChoiceFilter(final String id, final IModel<T> model, final FilterForm<?> form,
+ final IModel<List<? extends T>> choices, final IChoiceRenderer<T> renderer,
+ final boolean autoSubmit)
{
super(id, form);
@@ -126,8 +127,8 @@ public class ChoiceFilter<T> extends Abs
* choice renderer
* @return created drop down component
*/
- protected DropDownChoice<T> newDropDownChoice(String id, IModel<T> model,
- IModel<List<? extends T>> choices, IChoiceRenderer<T> renderer)
+ protected DropDownChoice<T> newDropDownChoice(final String id, final IModel<T> model,
+ final IModel<List<? extends T>> choices, final IChoiceRenderer<T> renderer)
{
return new DropDownChoice<T>(id, model, choices, renderer);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java Sun Jan 23 10:44:31 2011
@@ -48,8 +48,9 @@ public class ChoiceFilteredPropertyColum
* @param filterChoices
* collection choices used in the choice filter
*/
- public ChoiceFilteredPropertyColumn(IModel<String> displayModel, String sortProperty,
- String propertyExpression, IModel<List<? extends Y>> filterChoices)
+ public ChoiceFilteredPropertyColumn(final IModel<String> displayModel,
+ final String sortProperty, final String propertyExpression,
+ final IModel<List<? extends Y>> filterChoices)
{
super(displayModel, sortProperty, propertyExpression);
this.filterChoices = filterChoices;
@@ -61,8 +62,8 @@ public class ChoiceFilteredPropertyColum
* @param filterChoices
* collection of choices used in the choice filter
*/
- public ChoiceFilteredPropertyColumn(IModel<String> displayModel, String propertyExpression,
- IModel<List<? extends Y>> filterChoices)
+ public ChoiceFilteredPropertyColumn(final IModel<String> displayModel,
+ final String propertyExpression, final IModel<List<? extends Y>> filterChoices)
{
super(displayModel, propertyExpression);
this.filterChoices = filterChoices;
@@ -85,7 +86,7 @@ public class ChoiceFilteredPropertyColum
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.filter.IFilteredColumn#getFilter(java.lang.String,
* org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm)
*/
- public Component getFilter(String componentId, FilterForm<?> form)
+ public Component getFilter(final String componentId, final FilterForm<?> form)
{
ChoiceFilter<Y> filter = new ChoiceFilter<Y>(componentId, getFilterModel(form), form,
filterChoices, enableAutoSubmit());
@@ -106,7 +107,7 @@ public class ChoiceFilteredPropertyColum
* filter form
* @return model passed on to the text filter
*/
- protected IModel<Y> getFilterModel(FilterForm<?> form)
+ protected IModel<Y> getFilterModel(final FilterForm<?> form)
{
return new PropertyModel<Y>(form.getDefaultModel(), getPropertyExpression());
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Sun Jan 23 10:44:31 2011
@@ -44,7 +44,7 @@ public class FilterForm<T> extends Form<
* @param locator
* filter state locator
*/
- public FilterForm(String id, IFilterStateLocator<T> locator)
+ public FilterForm(final String id, final IFilterStateLocator<T> locator)
{
super(id, new FilterStateModel<T>(locator));
@@ -52,7 +52,7 @@ public class FilterForm<T> extends Form<
}
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(final IHeaderResponse response)
{
super.renderHead(response);
response.renderOnLoadJavaScript("_filter_focus_restore('" + getFocusTrackerFieldCssId() +
@@ -63,7 +63,7 @@ public class FilterForm<T> extends Form<
* {@inheritDoc}
*/
@Override
- public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
super.onComponentTagBody(markupStream, openTag);
String id = Strings.escapeMarkup(getFocusTrackerFieldCssId()).toString();
@@ -96,14 +96,14 @@ public class FilterForm<T> extends Form<
* @param fc
* form component
*/
- public final void enableFocusTracking(FormComponent<?> fc)
+ public final void enableFocusTracking(final FormComponent<?> fc)
{
fc.add(new Behavior()
{
private static final long serialVersionUID = 1L;
@Override
- public void onComponentTag(Component component, ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
tag.put("id", component.getMarkupId());
tag.put("onfocus", getFocusTrackingHandler(component));
@@ -126,7 +126,7 @@ public class FilterForm<T> extends Form<
* @return the javascript focus handler necessary to notify the form of focus tracking changes
* on the component
*/
- public final String getFocusTrackingHandler(Component component)
+ public final String getFocusTrackingHandler(final Component component)
{
return ("_filter_focus(this, '" + getFocusTrackerFieldCssId() + "');");
}
@@ -150,7 +150,7 @@ public class FilterForm<T> extends Form<
* @param locator
* IFilterStateLocator implementation used to provide model object for this model
*/
- public FilterStateModel(IFilterStateLocator<T> locator)
+ public FilterStateModel(final IFilterStateLocator<T> locator)
{
if (locator == null)
{
@@ -170,7 +170,7 @@ public class FilterForm<T> extends Form<
/**
* @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
*/
- public void setObject(T object)
+ public void setObject(final T object)
{
locator.setFilterState(object);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java Sun Jan 23 10:44:31 2011
@@ -47,7 +47,7 @@ class FilterStateModel<T> implements IMo
* @param locator
* IFilterStateLocator implementation used to provide model object for this model
*/
- public FilterStateModel(IFilterStateLocator<T> locator)
+ public FilterStateModel(final IFilterStateLocator<T> locator)
{
this.locator = locator;
}
@@ -63,7 +63,7 @@ class FilterStateModel<T> implements IMo
/**
* @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
*/
- public void setObject(T object)
+ public void setObject(final T object)
{
locator.setFilterState(object);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredAbstractColumn.java Sun Jan 23 10:44:31 2011
@@ -42,7 +42,7 @@ public abstract class FilteredAbstractCo
* @param sortProperty
* sort property this column represents
*/
- public FilteredAbstractColumn(IModel<String> displayModel, String sortProperty)
+ public FilteredAbstractColumn(final IModel<String> displayModel, final String sortProperty)
{
super(displayModel, sortProperty);
}
@@ -53,7 +53,7 @@ public abstract class FilteredAbstractCo
* @param displayModel
* model used to display the header text of this column
*/
- public FilteredAbstractColumn(IModel<String> displayModel)
+ public FilteredAbstractColumn(final IModel<String> displayModel)
{
super(displayModel);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilteredPropertyColumn.java Sun Jan 23 10:44:31 2011
@@ -47,8 +47,8 @@ public abstract class FilteredPropertyCo
* @param propertyExpression
* wicket property expression for the column, see {@link PropertyModel} for details
*/
- public FilteredPropertyColumn(IModel<String> displayModel, String sortProperty,
- String propertyExpression)
+ public FilteredPropertyColumn(final IModel<String> displayModel, final String sortProperty,
+ final String propertyExpression)
{
super(displayModel, sortProperty, propertyExpression);
}
@@ -59,7 +59,7 @@ public abstract class FilteredPropertyCo
* @param propertyExpression
* wicket property expression for the column, see {@link PropertyModel} for details
*/
- public FilteredPropertyColumn(IModel<String> displayModel, String propertyExpression)
+ public FilteredPropertyColumn(final IModel<String> displayModel, final String propertyExpression)
{
super(displayModel, propertyExpression);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoAndClearFilter.java Sun Jan 23 10:44:31 2011
@@ -49,7 +49,7 @@ public class GoAndClearFilter extends Go
* @param form
* filter form of the filter toolbar
*/
- public GoAndClearFilter(String id, FilterForm<?> form)
+ public GoAndClearFilter(final String id, final FilterForm<?> form)
{
this(id, form, DEFAULT_GO_MODEL, DEFAULT_CLEAR_MODEL);
}
@@ -66,8 +66,8 @@ public class GoAndClearFilter extends Go
* @param clearModel
* model for the label of the 'clear' button
*/
- public GoAndClearFilter(String id, FilterForm<?> form, IModel<String> goModel,
- IModel<String> clearModel)
+ public GoAndClearFilter(final String id, final FilterForm<?> form,
+ final IModel<String> goModel, final IModel<String> clearModel)
{
super(id, goModel);
@@ -105,7 +105,7 @@ public class GoAndClearFilter extends Go
*
*/
@SuppressWarnings("unchecked")
- protected void onClearSubmit(Button button)
+ protected void onClearSubmit(final Button button)
{
Form<Object> form = (Form<Object>)button.getForm();
form.setDefaultModelObject(WicketObjects.cloneModel(originalState));
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/GoFilter.java Sun Jan 23 10:44:31 2011
@@ -44,7 +44,7 @@ public class GoFilter extends Panel
* @param id
* component id
*/
- public GoFilter(String id)
+ public GoFilter(final String id)
{
this(id, DEFAULT_GO_MODEL);
}
@@ -57,7 +57,7 @@ public class GoFilter extends Panel
* @param goModel
* model for the button's text
*/
- public GoFilter(String id, IModel<String> goModel)
+ public GoFilter(final String id, final IModel<String> goModel)
{
super(id);
@@ -89,7 +89,7 @@ public class GoFilter extends Panel
* filter state object by retrieving the form's model object
*
*/
- protected void onGoSubmit(Button button)
+ protected void onGoSubmit(final Button button)
{
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/NoFilter.java Sun Jan 23 10:44:31 2011
@@ -33,7 +33,7 @@ public class NoFilter extends Panel
* @param id
* component id
*/
- public NoFilter(String id)
+ public NoFilter(final String id)
{
super(id);
}
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilter.java Sun Jan 23 10:44:31 2011
@@ -43,7 +43,7 @@ public class TextFilter<T> extends Abstr
* @param form
* filter form this filter will be added to
*/
- public TextFilter(String id, IModel<T> model, FilterForm<?> form)
+ public TextFilter(final String id, final IModel<T> model, final FilterForm<?> form)
{
super(id, form);
filter = new TextField<T>("filter", model);
Modified: wicket/trunk/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/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java Sun Jan 23 10:44:31 2011
@@ -42,8 +42,8 @@ public class TextFilteredPropertyColumn<
* @param sortProperty
* @param propertyExpression
*/
- public TextFilteredPropertyColumn(IModel<String> displayModel, String sortProperty,
- String propertyExpression)
+ public TextFilteredPropertyColumn(final IModel<String> displayModel, final String sortProperty,
+ final String propertyExpression)
{
super(displayModel, sortProperty, propertyExpression);
}
@@ -52,7 +52,8 @@ public class TextFilteredPropertyColumn<
* @param displayModel
* @param propertyExpression
*/
- public TextFilteredPropertyColumn(IModel<String> displayModel, String propertyExpression)
+ public TextFilteredPropertyColumn(final IModel<String> displayModel,
+ final String propertyExpression)
{
super(displayModel, propertyExpression);
}
@@ -61,7 +62,7 @@ public class TextFilteredPropertyColumn<
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.filter.IFilteredColumn#getFilter(java.lang.String,
* org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm)
*/
- public Component getFilter(String componentId, FilterForm<?> form)
+ public Component getFilter(final String componentId, final FilterForm<?> form)
{
return new TextFilter<F>(componentId, getFilterModel(form), form);
}
@@ -74,7 +75,7 @@ public class TextFilteredPropertyColumn<
* filter form
* @return model passed on to the text filter
*/
- protected IModel<F> getFilterModel(FilterForm<?> form)
+ protected IModel<F> getFilterModel(final FilterForm<?> form)
{
return new PropertyModel<F>(form.getDefaultModel(), getPropertyExpression());
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java Sun Jan 23 10:44:31 2011
@@ -34,16 +34,17 @@ public class SingleSortState implements
SortParam param;
/**
- * @see org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState#setPropertySortOrder(String, org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder)
+ * @see org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState#setPropertySortOrder(String,
+ * org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder)
*/
- public void setPropertySortOrder(String property, SortOrder order)
+ public void setPropertySortOrder(final String property, final SortOrder order)
{
Args.notNull(property, "property");
Args.notNull(order, "order");
- if(order == SortOrder.NONE)
+ if (order == SortOrder.NONE)
{
- if (param != null && property.equals(param.getProperty()))
+ if ((param != null) && property.equals(param.getProperty()))
{
param = null;
}
@@ -57,11 +58,11 @@ public class SingleSortState implements
/**
* @see org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState#getPropertySortOrder(java.lang.String)
*/
- public SortOrder getPropertySortOrder(String property)
+ public SortOrder getPropertySortOrder(final String property)
{
Args.notNull(property, "property");
- if (param == null || param.getProperty().equals(property) == false)
+ if ((param == null) || (param.getProperty().equals(property) == false))
{
return SortOrder.NONE;
}
@@ -82,7 +83,7 @@ public class SingleSortState implements
* @param param
* parameter containing new sorting information
*/
- public void setSort(SortParam param)
+ public void setSort(final SortParam param)
{
this.param = param;
}
@@ -90,6 +91,7 @@ public class SingleSortState implements
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "[SingleSortState sort=" + ((param == null) ? "null" : param.toString()) + "]";
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortParam.java Sun Jan 23 10:44:31 2011
@@ -21,7 +21,7 @@ import org.apache.wicket.util.lang.Args;
/**
* Represents sorting information of a property
- *
+ *
* @author Igor Vaynberg ( ivaynberg )
*/
public class SortParam implements IClusterable
@@ -35,9 +35,10 @@ public class SortParam implements IClust
* @param property
* sort property
* @param ascending
- * <code>true<code> if sort order is ascending, <code>false</code> if sort order is descending
+ * <code>true<code> if sort order is ascending, <code>false</code> if sort order is
+ * descending
*/
- public SortParam(String property, boolean ascending)
+ public SortParam(final String property, final boolean ascending)
{
Args.notNull(property, "property");
this.property = property;
@@ -54,8 +55,9 @@ public class SortParam implements IClust
/**
* check if sort order is ascending
- *
- * @return <code>true<code> if sort order is ascending, <code>false</code> if sort order is descending
+ *
+ * @return <code>true<code> if sort order is ascending, <code>false</code> if sort order is
+ * descending
*/
public boolean isAscending()
{
@@ -63,16 +65,20 @@ public class SortParam implements IClust
}
@Override
- public boolean equals(Object o)
+ public boolean equals(final Object o)
{
if (this == o)
+ {
return true;
+ }
if (!(o instanceof SortParam))
+ {
return false;
+ }
SortParam sortParam = (SortParam)o;
- return ascending == sortParam.ascending && property.equals(sortParam.property);
+ return (ascending == sortParam.ascending) && property.equals(sortParam.property);
}
@Override
@@ -86,9 +92,14 @@ public class SortParam implements IClust
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
- return new StringBuilder().append("[SortParam property=").append(getProperty()).append(
- " ascending=").append(ascending).append("]").toString();
+ return new StringBuilder().append("[SortParam property=")
+ .append(getProperty())
+ .append(" ascending=")
+ .append(ascending)
+ .append("]")
+ .toString();
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java Sun Jan 23 10:44:31 2011
@@ -50,7 +50,7 @@ public abstract class SortableDataProvid
/**
* @see ISortableDataProvider#setSortState(org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState)
*/
- public final void setSortState(ISortState state)
+ public final void setSortState(final ISortState state)
{
if (!(state instanceof SingleSortState))
{
@@ -77,7 +77,7 @@ public abstract class SortableDataProvid
* @param param
* parameter containing new sorting information
*/
- public void setSort(SortParam param)
+ public void setSort(final SortParam param)
{
state.setSort(param);
}
@@ -90,7 +90,7 @@ public abstract class SortableDataProvid
* @param order
* sort order
*/
- public void setSort(String property, SortOrder order)
+ public void setSort(final String property, final SortOrder order)
{
state.setPropertySortOrder(property, order);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/AbstractTab.java Sun Jan 23 10:44:31 2011
@@ -38,7 +38,7 @@ public abstract class AbstractTab implem
* @param title
* IModel used to represent the title of the tab. Must contain a string
*/
- public AbstractTab(IModel<String> title)
+ public AbstractTab(final IModel<String> title)
{
this.title = title;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/PanelCachingTab.java Sun Jan 23 10:44:31 2011
@@ -42,7 +42,7 @@ public class PanelCachingTab implements
* @param delegate
* ITab implementation to decorate
*/
- public PanelCachingTab(ITab delegate)
+ public PanelCachingTab(final ITab delegate)
{
this.delegate = delegate;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Sun Jan 23 10:44:31 2011
@@ -126,7 +126,7 @@ public class TabbedPanel extends Panel
}
@Override
- protected LoopItem newItem(int iteration)
+ protected LoopItem newItem(final int iteration)
{
return newTabContainer(iteration);
}
@@ -169,7 +169,7 @@ public class TabbedPanel extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
String cssClass = (String)tag.getString("class");
@@ -209,7 +209,7 @@ public class TabbedPanel extends Panel
// force an empty container to be created every time if we have no tabs
setSelectedTab(0);
}
- else if (getSelectedTab() == -1 || isTabVisible(getSelectedTab()) == false)
+ else if ((getSelectedTab() == -1) || (isTabVisible(getSelectedTab()) == false))
{
// find first visible selected tab
int selected = 0;
@@ -268,7 +268,7 @@ public class TabbedPanel extends Panel
* index of tab
* @return title component
*/
- protected Component newTitle(String titleId, IModel<?> titleModel, int index)
+ protected Component newTitle(final String titleId, final IModel<?> titleModel, final int index)
{
return new Label(titleId, titleModel);
}
@@ -307,7 +307,7 @@ public class TabbedPanel extends Panel
* {@link #setSelectedTab(int)}.
* @return created link component
*/
- protected WebMarkupContainer newLink(String linkId, final int index)
+ protected WebMarkupContainer newLink(final String linkId, final int index)
{
return new Link<Void>(linkId)
{
@@ -330,7 +330,7 @@ public class TabbedPanel extends Panel
*/
public TabbedPanel setSelectedTab(final int index)
{
- if (index < 0 || (index >= tabs.size() && index > 0))
+ if ((index < 0) || ((index >= tabs.size()) && (index > 0)))
{
throw new IndexOutOfBoundsException();
}
@@ -339,7 +339,7 @@ public class TabbedPanel extends Panel
final Component component;
- if (tabs.size() == 0 || !isTabVisible(index))
+ if ((tabs.size() == 0) || !isTabVisible(index))
{
// no tabs or the currently selected tab is not visible
component = new WebMarkupContainer(TAB_PANEL_ID);
@@ -383,7 +383,7 @@ public class TabbedPanel extends Panel
* @param tabIndex
* @return visible
*/
- private boolean isTabVisible(int tabIndex)
+ private boolean isTabVisible(final int tabIndex)
{
if (tabsVisibilityCache == null)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Sun Jan 23 10:44:31 2011
@@ -95,7 +95,7 @@ public abstract class DefaultAbstractTre
*
* @param name
*/
- public LinkType(String name)
+ public LinkType(final String name)
{
super(name);
}
@@ -144,7 +144,7 @@ public abstract class DefaultAbstractTre
* @param id
* The component id
*/
- public DefaultAbstractTree(String id)
+ public DefaultAbstractTree(final String id)
{
super(id);
}
@@ -157,7 +157,7 @@ public abstract class DefaultAbstractTre
* @param model
* The tree model
*/
- public DefaultAbstractTree(String id, IModel<? extends TreeModel> model)
+ public DefaultAbstractTree(final String id, final IModel<? extends TreeModel> model)
{
super(id, model);
}
@@ -170,7 +170,7 @@ public abstract class DefaultAbstractTre
* @param model
* The tree model
*/
- public DefaultAbstractTree(String id, TreeModel model)
+ public DefaultAbstractTree(final String id, final TreeModel model)
{
super(id, new WicketTreeModel());
setModelObject(model);
@@ -193,7 +193,7 @@ public abstract class DefaultAbstractTre
* @param linkType
* type of links
*/
- public void setLinkType(LinkType linkType)
+ public void setLinkType(final LinkType linkType)
{
if (this.linkType != linkType)
{
@@ -249,7 +249,7 @@ public abstract class DefaultAbstractTre
* The node
* @return The package resource reference
*/
- protected ResourceReference getNodeIcon(TreeNode node)
+ protected ResourceReference getNodeIcon(final TreeNode node)
{
if (node.isLeaf() == true)
{
@@ -283,8 +283,8 @@ public abstract class DefaultAbstractTre
* The current level
* @return The indentation component
*/
- protected Component newIndentation(MarkupContainer parent, String id, final TreeNode node,
- final int level)
+ protected Component newIndentation(final MarkupContainer parent, final String id,
+ final TreeNode node, final int level)
{
WebMarkupContainer result = new WebMarkupContainer(id)
{
@@ -294,7 +294,8 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
+ public void onComponentTagBody(final MarkupStream markupStream,
+ final ComponentTag openTag)
{
Response response = RequestCycle.get().getResponse();
TreeNode parent = node.getParent();
@@ -337,7 +338,7 @@ public abstract class DefaultAbstractTre
* The tree node
* @return The component that represents a junction
*/
- protected MarkupContainer newJunctionImage(MarkupContainer parent, final String id,
+ protected MarkupContainer newJunctionImage(final MarkupContainer parent, final String id,
final TreeNode node)
{
return (MarkupContainer)new WebMarkupContainer(id)
@@ -348,7 +349,7 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
@@ -389,7 +390,7 @@ public abstract class DefaultAbstractTre
* tree node for which the link should be created.
* @return The link component
*/
- protected Component newJunctionLink(MarkupContainer parent, final String id,
+ protected Component newJunctionLink(final MarkupContainer parent, final String id,
final String imageId, final TreeNode node)
{
final MarkupContainer junctionLink;
@@ -400,7 +401,7 @@ public abstract class DefaultAbstractTre
{
private static final long serialVersionUID = 1L;
- public void onClick(AjaxRequestTarget target)
+ public void onClick(final AjaxRequestTarget target)
{
if (isNodeExpanded(node))
{
@@ -425,7 +426,7 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
tag.put("onclick", "return false");
@@ -453,7 +454,7 @@ public abstract class DefaultAbstractTre
* The link call back
* @return The link component
*/
- protected MarkupContainer newLink(MarkupContainer parent, String id,
+ protected MarkupContainer newLink(final MarkupContainer parent, final String id,
final ILinkCallback callback)
{
if (getLinkType() == LinkType.REGULAR)
@@ -482,7 +483,7 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick(final AjaxRequestTarget target)
{
callback.onClick(target);
}
@@ -498,7 +499,7 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick(final AjaxRequestTarget target)
{
callback.onClick(target);
}
@@ -518,7 +519,8 @@ public abstract class DefaultAbstractTre
* The tree node
* @return The web component that represents the icon of the current node
*/
- protected Component newNodeIcon(MarkupContainer parent, String id, final TreeNode node)
+ protected Component newNodeIcon(final MarkupContainer parent, final String id,
+ final TreeNode node)
{
return new WebMarkupContainer(id)
{
@@ -528,7 +530,7 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
IRequestHandler handler = new ResourceReferenceRequestHandler(getNodeIcon(node));
@@ -549,13 +551,14 @@ public abstract class DefaultAbstractTre
* The parent node
* @return The component that represents the link
*/
- protected MarkupContainer newNodeLink(MarkupContainer parent, String id, final TreeNode node)
+ protected MarkupContainer newNodeLink(final MarkupContainer parent, final String id,
+ final TreeNode node)
{
return newLink(parent, id, new ILinkCallback()
{
private static final long serialVersionUID = 1L;
- public void onClick(AjaxRequestTarget target)
+ public void onClick(final AjaxRequestTarget target)
{
getTreeState().selectNode(node, !getTreeState().isNodeSelected(node));
onNodeLinkClicked(target, node);
@@ -573,7 +576,7 @@ public abstract class DefaultAbstractTre
* @param node
* Node for which this callback is relevant
*/
- protected void onJunctionLinkClicked(AjaxRequestTarget target, TreeNode node)
+ protected void onJunctionLinkClicked(final AjaxRequestTarget target, final TreeNode node)
{
}
@@ -585,7 +588,7 @@ public abstract class DefaultAbstractTre
* @param node
* Node for which this this callback is fired.
*/
- protected void onNodeLinkClicked(AjaxRequestTarget target, TreeNode node)
+ protected void onNodeLinkClicked(final AjaxRequestTarget target, final TreeNode node)
{
}
@@ -596,7 +599,7 @@ public abstract class DefaultAbstractTre
* The node
* @return whether the provided node is the last child
*/
- private boolean isNodeLast(TreeNode node)
+ private boolean isNodeLast(final TreeNode node)
{
TreeNode parent = node.getParent();
if (parent == null)
@@ -613,7 +616,7 @@ public abstract class DefaultAbstractTre
* {@inheritDoc}
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(final IHeaderResponse response)
{
super.renderHead(response);
ResourceReference css = getCSS();
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java Sun Jan 23 10:44:31 2011
@@ -44,7 +44,7 @@ public class Tree extends DefaultAbstrac
* @param id
* The component id
*/
- public Tree(String id)
+ public Tree(final String id)
{
super(id);
}
@@ -57,7 +57,7 @@ public class Tree extends DefaultAbstrac
* @param model
* The tree model
*/
- public Tree(String id, IModel<? extends TreeModel> model)
+ public Tree(final String id, final IModel<? extends TreeModel> model)
{
super(id, model);
}
@@ -70,7 +70,7 @@ public class Tree extends DefaultAbstrac
* @param model
* The tree model
*/
- public Tree(String id, TreeModel model)
+ public Tree(final String id, final TreeModel model)
{
super(id, model);
}
@@ -82,7 +82,7 @@ public class Tree extends DefaultAbstrac
* @param level
*/
@Override
- protected void populateTreeItem(WebMarkupContainer item, int level)
+ protected void populateTreeItem(final WebMarkupContainer item, final int level)
{
final TreeNode node = (TreeNode)item.getDefaultModelObject();
@@ -118,7 +118,7 @@ public class Tree extends DefaultAbstrac
* Component, org.apache.wicket.markup.ComponentTag)
*/
@Override
- public void onComponentTag(Component component, ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
super.onComponentTag(component, tag);
if (getTreeState().isNodeSelected(node))
@@ -140,7 +140,7 @@ public class Tree extends DefaultAbstrac
* The tree node to get the string representation of
* @return The string representation
*/
- protected String renderNode(TreeNode node)
+ protected String renderNode(final TreeNode node)
{
return node.toString();
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractColumn.java Sun Jan 23 10:44:31 2011
@@ -47,7 +47,7 @@ public abstract class AbstractColumn imp
* @param header
* Header caption
*/
- public AbstractColumn(ColumnLocation location, String header)
+ public AbstractColumn(final ColumnLocation location, final String header)
{
this.location = location;
this.header = header;
@@ -64,7 +64,7 @@ public abstract class AbstractColumn imp
/**
* @see IColumn#getSpan(TreeNode)
*/
- public int getSpan(TreeNode node)
+ public int getSpan(final TreeNode node)
{
return 0;
}
@@ -80,7 +80,7 @@ public abstract class AbstractColumn imp
/**
* @see IColumn#newHeader(MarkupContainer, String)
*/
- public Component newHeader(MarkupContainer parent, String id)
+ public Component newHeader(final MarkupContainer parent, final String id)
{
return new Label(id, header);
}
@@ -88,9 +88,9 @@ public abstract class AbstractColumn imp
/**
* @see IColumn#setTreeTable(TreeTable)
*/
- public void setTreeTable(TreeTable treeTable)
+ public void setTreeTable(final TreeTable treeTable)
{
- if (this.treeTable != null && this.treeTable != treeTable)
+ if ((this.treeTable != null) && (this.treeTable != treeTable))
{
throw new IllegalStateException("You can't add single IColumn to multiple tree tables.");
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractRenderableColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractRenderableColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractRenderableColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractRenderableColumn.java Sun Jan 23 10:44:31 2011
@@ -49,7 +49,7 @@ public abstract class AbstractRenderable
* @param header
* Header caption
*/
- public AbstractRenderableColumn(ColumnLocation location, String header)
+ public AbstractRenderableColumn(final ColumnLocation location, final String header)
{
super(location, header);
}
@@ -86,7 +86,8 @@ public abstract class AbstractRenderable
/**
* @see IColumn#newCell(MarkupContainer, String, TreeNode, int)
*/
- public Component newCell(MarkupContainer parent, String id, TreeNode node, int level)
+ public Component newCell(final MarkupContainer parent, final String id, final TreeNode node,
+ final int level)
{
return null;
}
@@ -94,13 +95,13 @@ public abstract class AbstractRenderable
/**
* @see IColumn#newCell(TreeNode, int)
*/
- public IRenderable newCell(TreeNode node, int level)
+ public IRenderable newCell(final TreeNode node, final int level)
{
return new IRenderable()
{
private static final long serialVersionUID = 1L;
- public void render(TreeNode node, Response response)
+ public void render(final TreeNode node, final Response response)
{
String content = getNodeValue(node);
@@ -129,7 +130,7 @@ public abstract class AbstractRenderable
* @param contentAsTooltip
* whether the content should also be visible as tooltip
*/
- public void setContentAsTooltip(boolean contentAsTooltip)
+ public void setContentAsTooltip(final boolean contentAsTooltip)
{
this.contentAsTooltip = contentAsTooltip;
}
@@ -140,7 +141,7 @@ public abstract class AbstractRenderable
* @param escapeContent
* Whether to espcape html characters
*/
- public void setEscapeContent(boolean escapeContent)
+ public void setEscapeContent(final boolean escapeContent)
{
this.escapeContent = escapeContent;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractTreeColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractTreeColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractTreeColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractTreeColumn.java Sun Jan 23 10:44:31 2011
@@ -45,7 +45,7 @@ public abstract class AbstractTreeColumn
* Header caption
*
*/
- public AbstractTreeColumn(ColumnLocation location, String header)
+ public AbstractTreeColumn(final ColumnLocation location, final String header)
{
super(location, header);
}
@@ -53,13 +53,14 @@ public abstract class AbstractTreeColumn
/**
* @see IColumn#newCell(MarkupContainer, String, TreeNode, int)
*/
- public Component newCell(MarkupContainer parent, String id, TreeNode node, int level)
+ public Component newCell(final MarkupContainer parent, final String id, final TreeNode node,
+ final int level)
{
return TreeTable.newTreeCell(parent, id, node, level, new TreeTable.IRenderNodeCallback()
{
private static final long serialVersionUID = 1L;
- public String renderNode(TreeNode node)
+ public String renderNode(final TreeNode node)
{
return AbstractTreeColumn.this.renderNode(node);
}
@@ -69,7 +70,7 @@ public abstract class AbstractTreeColumn
/**
* @see IColumn#newCell(TreeNode, int)
*/
- public IRenderable newCell(TreeNode node, int level)
+ public IRenderable newCell(final TreeNode node, final int level)
{
return null;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/ColumnLocation.java Sun Jan 23 10:44:31 2011
@@ -28,15 +28,15 @@ import org.apache.wicket.util.lang.Enume
* <p>
* Next two attributes are <b>size</b> and <b>unit</b>:
* <ul>
- * <li> For columns aligned to the left and to the right, the <b>size</b> represents the actual
- * width of the column, according to chosen unit. Possible units for left and right aligned columns
- * are <em>PX</em>, <em>EM</em> and <em>PERCENT</em>. </li>
- * <li> For columns in the middle, the only valid unit is <em>PROPORTIONAL</em>. These columns
- * take all available space between columns on the left and columns on the right. How this space is
+ * <li>For columns aligned to the left and to the right, the <b>size</b> represents the actual width
+ * of the column, according to chosen unit. Possible units for left and right aligned columns are
+ * <em>PX</em>, <em>EM</em> and <em>PERCENT</em>.</li>
+ * <li>For columns in the middle, the only valid unit is <em>PROPORTIONAL</em>. These columns take
+ * all available space between columns on the left and columns on the right. How this space is
* divided between middle columns is determined by the <b>size</b>. In this case the size can be
* understand as weight. Columns with bigger size take more space than columns with smaller size.
* For example, if there are three columns and their sizes are 2, 1, 1, the first column thakes 50%
- * of the space and the second two columns take 25% each. </li>
+ * of the space and the second two columns take 25% each.</li>
* </ul>
*
* @author Matej Knopp
@@ -64,7 +64,7 @@ public class ColumnLocation implements I
*
* @param name
*/
- public Alignment(String name)
+ public Alignment(final String name)
{
super(name);
}
@@ -95,7 +95,7 @@ public class ColumnLocation implements I
*
* @param name
*/
- public Unit(String name)
+ public Unit(final String name)
{
super(name);
}
@@ -103,9 +103,9 @@ public class ColumnLocation implements I
private static final long serialVersionUID = 1L;
- private Alignment alignment;
- private int size;
- private Unit unit;
+ private final Alignment alignment;
+ private final int size;
+ private final Unit unit;
/**
* Constructs the ColumnLocation object.
@@ -119,21 +119,21 @@ public class ColumnLocation implements I
* @throws IllegalArgumentException
* if the unit does not matche the alignment
*/
- public ColumnLocation(Alignment alignment, int size, Unit unit)
+ public ColumnLocation(final Alignment alignment, final int size, final Unit unit)
{
this.alignment = alignment;
this.size = size;
this.unit = unit;
- if (alignment == Alignment.MIDDLE && unit != Unit.PROPORTIONAL)
+ if ((alignment == Alignment.MIDDLE) && (unit != Unit.PROPORTIONAL))
{
throw new IllegalArgumentException(
- "For alignment MIDDLE the specified unit must be PROPORTIONAL.");
+ "For alignment MIDDLE the specified unit must be PROPORTIONAL.");
}
- else if (alignment != Alignment.MIDDLE && unit == Unit.PROPORTIONAL)
+ else if ((alignment != Alignment.MIDDLE) && (unit == Unit.PROPORTIONAL))
{
throw new IllegalArgumentException(
- "Unit PROPORTIONAL can be specified only for columns with alignment MIDDLE.");
+ "Unit PROPORTIONAL can be specified only for columns with alignment MIDDLE.");
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java Sun Jan 23 10:44:31 2011
@@ -19,7 +19,6 @@ package org.apache.wicket.extensions.mar
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -63,7 +62,7 @@ final class MiddleColumnsView extends We
* @param treeHasLeftColumn
* Whether there is a column aligned to left in the tree table
*/
- public MiddleColumnsView(String id, TreeNode node, boolean treeHasLeftColumn)
+ public MiddleColumnsView(final String id, final TreeNode node, final boolean treeHasLeftColumn)
{
super(id);
this.node = node;
@@ -80,7 +79,8 @@ final class MiddleColumnsView extends We
* @param renderable
* The renderer
*/
- public void addColumn(IColumn column, Component component, IRenderable renderable)
+ public void addColumn(final IColumn column, final Component component,
+ final IRenderable renderable)
{
if (column.isVisible())
{
@@ -142,7 +142,7 @@ final class MiddleColumnsView extends We
// wants this column to span and no other column is spanning over
// this column?
- if (spanLeft == 0 && column.getSpan(node) > 1)
+ if ((spanLeft == 0) && (column.getSpan(node) > 1))
{
int maxSpan = columns.size() - columns.indexOf(column); // how
// many
@@ -208,10 +208,14 @@ final class MiddleColumnsView extends We
response.write("<span class=\"b_\" style=\"width:" + nf.format(widths[i]) + "%\">");
// determine whether we should render the left border
- if (!treeHasLeftColumn && i == 0)
+ if (!treeHasLeftColumn && (i == 0))
+ {
response.write("<span class=\"d_\">");
+ }
else
+ {
response.write("<span class=\"c_\">");
+ }
if (component != null) // is there a component for current column?
{
@@ -242,7 +246,7 @@ final class MiddleColumnsView extends We
// render the component to null response (otherwise the
// component will
// complain that it hasn't been rendered
- for (int j = 1; j < span && i < components.size(); ++j)
+ for (int j = 1; (j < span) && (i < components.size()); ++j)
{
++i;
if (components.get(i) != null)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java Sun Jan 23 10:44:31 2011
@@ -52,8 +52,8 @@ public class PropertyRenderableColumn ex
* @param propertyExpression
* Expression for property access
*/
- public PropertyRenderableColumn(ColumnLocation location, String header,
- String propertyExpression)
+ public PropertyRenderableColumn(final ColumnLocation location, final String header,
+ final String propertyExpression)
{
super(location, header);
this.propertyExpression = propertyExpression;
@@ -83,7 +83,7 @@ public class PropertyRenderableColumn ex
* @see AbstractRenderableColumn#getNodeValue(TreeNode)
*/
@Override
- public String getNodeValue(TreeNode node)
+ public String getNodeValue(final TreeNode node)
{
Object result = PropertyResolver.getValue(propertyExpression, node);
if (converter != null)
@@ -108,7 +108,7 @@ public class PropertyRenderableColumn ex
* @param converter
* any converter
*/
- public void setConverter(IConverter converter)
+ public void setConverter(final IConverter converter)
{
this.converter = converter;
}
@@ -120,7 +120,7 @@ public class PropertyRenderableColumn ex
* @param locale
* Any locale
*/
- public void setLocale(Locale locale)
+ public void setLocale(final Locale locale)
{
this.locale = locale;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java Sun Jan 23 10:44:31 2011
@@ -52,7 +52,8 @@ public class PropertyTreeColumn extends
* @param propertyExpression
* Expression for property access
*/
- public PropertyTreeColumn(ColumnLocation location, String header, String propertyExpression)
+ public PropertyTreeColumn(final ColumnLocation location, final String header,
+ final String propertyExpression)
{
super(location, header);
this.propertyExpression = propertyExpression;
@@ -82,7 +83,7 @@ public class PropertyTreeColumn extends
* @see AbstractTreeColumn#renderNode(TreeNode)
*/
@Override
- public String renderNode(TreeNode node)
+ public String renderNode(final TreeNode node)
{
Object result = PropertyResolver.getValue(propertyExpression, node);
if (converter != null)
@@ -107,7 +108,7 @@ public class PropertyTreeColumn extends
* @param converter
* Any converter
*/
- public void setConverter(IConverter converter)
+ public void setConverter(final IConverter converter)
{
this.converter = converter;
}
@@ -119,7 +120,7 @@ public class PropertyTreeColumn extends
* @param locale
* The locale
*/
- public void setLocale(Locale locale)
+ public void setLocale(final Locale locale)
{
this.locale = locale;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java Sun Jan 23 10:44:31 2011
@@ -54,7 +54,7 @@ final class SideColumnsView extends WebM
* @param node
* The tree node
*/
- public SideColumnsView(String id, TreeNode node)
+ public SideColumnsView(final String id, final TreeNode node)
{
super(id);
setRenderBodyOnly(true);
@@ -71,7 +71,8 @@ final class SideColumnsView extends WebM
* @param renderable
* The renderer
*/
- public void addColumn(IColumn column, Component component, IRenderable renderable)
+ public void addColumn(final IColumn column, final Component component,
+ final IRenderable renderable)
{
if (column.isVisible())
{
@@ -114,7 +115,7 @@ final class SideColumnsView extends WebM
// write wrapping markup
response.write("<span class=\"b_\" style=\"" + renderColumnStyle(column) + "\">");
- if (column.getLocation().getAlignment() == Alignment.LEFT && firstLeft == true)
+ if ((column.getLocation().getAlignment() == Alignment.LEFT) && (firstLeft == true))
{
// for the first left column we have different style class
// (without the left border)
@@ -151,7 +152,7 @@ final class SideColumnsView extends WebM
* The
* @return The column as a string
*/
- private String renderColumnFloat(IColumn column)
+ private String renderColumnFloat(final IColumn column)
{
ColumnLocation location = column.getLocation();
if (location.getAlignment() == Alignment.LEFT)
@@ -175,7 +176,7 @@ final class SideColumnsView extends WebM
* The column to render the style attribute from
* @return The style as a string
*/
- private String renderColumnStyle(IColumn column)
+ private String renderColumnStyle(final IColumn column)
{
return "width:" + renderColumnWidth(column) + ";float:" + renderColumnFloat(column);
}
@@ -187,7 +188,7 @@ final class SideColumnsView extends WebM
* The column to render as a string
* @return The column as a string
*/
- private String renderColumnWidth(IColumn column)
+ private String renderColumnWidth(final IColumn column)
{
ColumnLocation location = column.getLocation();
return "" + location.getSize() + renderUnit(location.getUnit());
@@ -200,7 +201,7 @@ final class SideColumnsView extends WebM
* The unit to render to a string
* @return The unit as a string
*/
- private String renderUnit(Unit unit)
+ private String renderUnit(final Unit unit)
{
if (unit == Unit.EM)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java Sun Jan 23 10:44:31 2011
@@ -79,7 +79,7 @@ public class TreeTable extends DefaultAb
* @param renderNodeCallback
* The call back for rendering nodes
*/
- public TreeFragment(String id, final TreeNode node, int level,
+ public TreeFragment(final String id, final TreeNode node, final int level,
final IRenderNodeCallback renderNodeCallback)
{
super(id, "fragment", TreeTable.this);
@@ -139,8 +139,9 @@ public class TreeTable extends DefaultAb
*
* @return The tree cell
*/
- public static Component newTreeCell(MarkupContainer parent, String id, TreeNode node,
- int level, IRenderNodeCallback callback, TreeTable table)
+ public static Component newTreeCell(final MarkupContainer parent, final String id,
+ final TreeNode node, final int level, final IRenderNodeCallback callback,
+ final TreeTable table)
{
return table.newTreePanel(parent, id, node, level, callback);
}
@@ -154,7 +155,7 @@ public class TreeTable extends DefaultAb
* @param id
* @param columns
*/
- public TreeTable(String id, IColumn columns[])
+ public TreeTable(final String id, final IColumn columns[])
{
super(id);
init(columns);
@@ -170,7 +171,8 @@ public class TreeTable extends DefaultAb
* @param columns
* The columns
*/
- public TreeTable(String id, IModel<? extends TreeModel> model, IColumn columns[])
+ public TreeTable(final String id, final IModel<? extends TreeModel> model,
+ final IColumn columns[])
{
super(id, model);
init(columns);
@@ -187,7 +189,7 @@ public class TreeTable extends DefaultAb
* @param columns
* The columns
*/
- public TreeTable(String id, TreeModel model, IColumn columns[])
+ public TreeTable(final String id, final TreeModel model, final IColumn columns[])
{
super(id, model);
init(columns);
@@ -196,8 +198,12 @@ public class TreeTable extends DefaultAb
private boolean hasLeftColumn()
{
for (IColumn column : columns)
+ {
if (column.getLocation().getAlignment().equals(Alignment.LEFT))
+ {
return true;
+ }
+ }
return false;
}
@@ -211,23 +217,26 @@ public class TreeTable extends DefaultAb
SideColumnsView sideColumns = new SideColumnsView("sideColumns", null);
add(sideColumns);
if (columns != null)
+ {
for (int i = 0; i < columns.length; i++)
{
IColumn column = columns[i];
- if (column.getLocation().getAlignment() == Alignment.LEFT ||
- column.getLocation().getAlignment() == Alignment.RIGHT)
+ if ((column.getLocation().getAlignment() == Alignment.LEFT) ||
+ (column.getLocation().getAlignment() == Alignment.RIGHT))
{
Component component = column.newHeader(sideColumns, "" + i);
sideColumns.add(component);
sideColumns.addColumn(column, component, null);
}
}
+ }
// create the view for middle columns
MiddleColumnsView middleColumns = new MiddleColumnsView("middleColumns", null,
hasLeftColumn());
add(middleColumns);
if (columns != null)
+ {
for (int i = 0; i < columns.length; i++)
{
IColumn column = columns[i];
@@ -238,6 +247,7 @@ public class TreeTable extends DefaultAb
middleColumns.addColumn(column, component, null);
}
}
+ }
}
/**
@@ -264,8 +274,8 @@ public class TreeTable extends DefaultAb
* The node call back
* @return The tree panel
*/
- protected Component newTreePanel(MarkupContainer parent, String id, final TreeNode node,
- int level, IRenderNodeCallback renderNodeCallback)
+ protected Component newTreePanel(final MarkupContainer parent, final String id,
+ final TreeNode node, final int level, final IRenderNodeCallback renderNodeCallback)
{
return new TreeFragment(id, node, level, renderNodeCallback);
}
@@ -281,8 +291,12 @@ public class TreeTable extends DefaultAb
{
// no. initialize columns first
if (columns != null)
+ {
for (IColumn column : columns)
+ {
column.setTreeTable(this);
+ }
+ }
// add the tree table header
addHeader();
@@ -298,7 +312,7 @@ public class TreeTable extends DefaultAb
* the current level
*/
@Override
- protected void populateTreeItem(WebMarkupContainer item, int level)
+ protected void populateTreeItem(final WebMarkupContainer item, final int level)
{
final TreeNode node = (TreeNode)item.getDefaultModelObject();
@@ -306,11 +320,12 @@ public class TreeTable extends DefaultAb
SideColumnsView sideColumns = new SideColumnsView("sideColumns", node);
item.add(sideColumns);
if (columns != null)
+ {
for (int i = 0; i < columns.length; i++)
{
IColumn column = columns[i];
- if (column.getLocation().getAlignment() == Alignment.LEFT ||
- column.getLocation().getAlignment() == Alignment.RIGHT)
+ if ((column.getLocation().getAlignment() == Alignment.LEFT) ||
+ (column.getLocation().getAlignment() == Alignment.RIGHT))
{
Component component;
// first try to create a renderable
@@ -331,11 +346,13 @@ public class TreeTable extends DefaultAb
sideColumns.addColumn(column, component, renderable);
}
}
+ }
// add middle columns
MiddleColumnsView middleColumns = new MiddleColumnsView("middleColumns", node,
hasLeftColumn());
if (columns != null)
+ {
for (int i = 0; i < columns.length; i++)
{
IColumn column = columns[i];
@@ -360,6 +377,7 @@ public class TreeTable extends DefaultAb
middleColumns.addColumn(column, component, renderable);
}
}
+ }
item.add(middleColumns);
// do distinguish between selected and unselected rows we add an
@@ -370,7 +388,7 @@ public class TreeTable extends DefaultAb
private static final long serialVersionUID = 1L;
@Override
- public void onComponentTag(Component component, ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
super.onComponentTag(component, tag);
if (getTreeState().isNodeSelected(node))
@@ -392,7 +410,7 @@ public class TreeTable extends DefaultAb
* @param columns
* The columns
*/
- private void init(IColumn columns[])
+ private void init(final IColumn columns[])
{
boolean found = false;
if (columns != null)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java Sun Jan 23 10:44:31 2011
@@ -65,7 +65,7 @@ public abstract class AbstractCheckBoxMo
/**
* @see org.apache.wicket.model.IModel#setObject(Object)
*/
- public final void setObject(Boolean object)
+ public final void setObject(final Boolean object)
{
if (Boolean.TRUE.equals(object))
{
@@ -82,28 +82,28 @@ public abstract class AbstractCheckBoxMo
/** @deprecated replaced by {@link #getObject()} */
@Deprecated
- public final Object getObject(Component component)
+ public final Object getObject(final Component component)
{
throw new UnsupportedOperationException();
}
/** @deprecated replaced by {@link #isSelected()} */
@Deprecated
- public final boolean isSelected(Component component)
+ public final boolean isSelected(final Component component)
{
throw new UnsupportedOperationException();
}
/** @deprecated replaced by {@link #setObject(Object)} */
@Deprecated
- public final void setObject(Component component, Object object)
+ public final void setObject(final Component component, final Object object)
{
throw new UnsupportedOperationException();
}
/** @deprecated replaced by {@link #select()} */
@Deprecated
- public final void setSelected(Component component, boolean sel)
+ public final void setSelected(final Component component, final boolean sel)
{
throw new UnsupportedOperationException();
}