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 [2/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/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java Sun Jan 23 10:44:31 2011
@@ -49,8 +49,8 @@ public abstract class AjaxFallbackOrderB
* @param stateLocator
* @param cssProvider
*/
- public AjaxFallbackOrderByLink(String id, String property, ISortStateLocator stateLocator,
- ICssProvider cssProvider)
+ public AjaxFallbackOrderByLink(final String id, final String property,
+ final ISortStateLocator stateLocator, final ICssProvider cssProvider)
{
this(id, property, stateLocator, cssProvider, null);
}
@@ -62,7 +62,8 @@ public abstract class AjaxFallbackOrderB
* @param property
* @param stateLocator
*/
- public AjaxFallbackOrderByLink(String id, String property, ISortStateLocator stateLocator)
+ public AjaxFallbackOrderByLink(final String id, final String property,
+ final ISortStateLocator stateLocator)
{
this(id, property, stateLocator, DefaultCssProvider.getInstance(), null);
}
@@ -76,8 +77,8 @@ public abstract class AjaxFallbackOrderB
* @param stateLocator
* @param decorator
*/
- public AjaxFallbackOrderByLink(String id, String property, ISortStateLocator stateLocator,
- final IAjaxCallDecorator decorator)
+ public AjaxFallbackOrderByLink(final String id, final String property,
+ final ISortStateLocator stateLocator, final IAjaxCallDecorator decorator)
{
this(id, property, stateLocator, DefaultCssProvider.getInstance(), decorator);
}
@@ -91,8 +92,9 @@ public abstract class AjaxFallbackOrderB
* @param cssProvider
* @param decorator
*/
- public AjaxFallbackOrderByLink(String id, String property, ISortStateLocator stateLocator,
- ICssProvider cssProvider, final IAjaxCallDecorator decorator)
+ public AjaxFallbackOrderByLink(final String id, final String property,
+ final ISortStateLocator stateLocator, final ICssProvider cssProvider,
+ final IAjaxCallDecorator decorator)
{
super(id, property, stateLocator, cssProvider);
@@ -101,7 +103,7 @@ public abstract class AjaxFallbackOrderB
private static final long serialVersionUID = 1L;
@Override
- protected void onEvent(AjaxRequestTarget target)
+ protected void onEvent(final AjaxRequestTarget target)
{
onClick();
onAjaxClick(target);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java Sun Jan 23 10:44:31 2011
@@ -63,8 +63,8 @@ public class AjaxFallbackDefaultDataTabl
* @param rowsPerPage
* number of rows per page
*/
- public AjaxFallbackDefaultDataTable(String id, final List<IColumn<T>> columns,
- ISortableDataProvider<T> dataProvider, int rowsPerPage)
+ public AjaxFallbackDefaultDataTable(final String id, final List<IColumn<T>> columns,
+ final ISortableDataProvider<T> dataProvider, final int rowsPerPage)
{
super(id, columns, dataProvider, rowsPerPage);
setOutputMarkupId(true);
@@ -75,7 +75,7 @@ public class AjaxFallbackDefaultDataTabl
}
@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/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java Sun Jan 23 10:44:31 2011
@@ -43,7 +43,7 @@ public class AjaxFallbackHeadersToolbar
* @param table
* @param stateLocator
*/
- public AjaxFallbackHeadersToolbar(DataTable<?> table, ISortStateLocator stateLocator)
+ public AjaxFallbackHeadersToolbar(final DataTable<?> table, final ISortStateLocator stateLocator)
{
super(table, stateLocator);
table.setOutputMarkupId(true);
@@ -53,15 +53,15 @@ public class AjaxFallbackHeadersToolbar
* {@inheritDoc}
*/
@Override
- protected WebMarkupContainer newSortableHeader(String borderId, String property,
- ISortStateLocator locator)
+ protected WebMarkupContainer newSortableHeader(final String borderId, final String property,
+ final ISortStateLocator locator)
{
return new AjaxFallbackOrderByBorder(borderId, property, locator, getAjaxCallDecorator())
{
private static final long serialVersionUID = 1L;
@Override
- protected void onAjaxClick(AjaxRequestTarget target)
+ protected void onAjaxClick(final AjaxRequestTarget target)
{
target.add(getTable());
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxNavigationToolbar.java Sun Jan 23 10:44:31 2011
@@ -56,7 +56,7 @@ public class AjaxNavigationToolbar exten
* @return paging navigator that will be used to navigate the data table
*/
@Override
- protected PagingNavigator newPagingNavigator(String navigatorId, final DataTable<?> table)
+ protected PagingNavigator newPagingNavigator(final String navigatorId, final DataTable<?> table)
{
return new AjaxPagingNavigator(navigatorId, table)
{
@@ -69,7 +69,7 @@ public class AjaxNavigationToolbar exten
* @see AjaxPagingNavigator#onAjaxEvent(AjaxRequestTarget)
*/
@Override
- protected void onAjaxEvent(AjaxRequestTarget target)
+ protected void onAjaxEvent(final AjaxRequestTarget target)
{
target.add(table);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/tabs/AjaxTabbedPanel.java Sun Jan 23 10:44:31 2011
@@ -42,7 +42,7 @@ public class AjaxTabbedPanel extends Tab
* @param id
* @param tabs
*/
- public AjaxTabbedPanel(String id, List<ITab> tabs)
+ public AjaxTabbedPanel(final String id, final List<ITab> tabs)
{
super(id, tabs);
setOutputMarkupId(true);
@@ -51,7 +51,7 @@ public class AjaxTabbedPanel extends Tab
}
@Override
- protected WebMarkupContainer newLink(String linkId, final int index)
+ protected WebMarkupContainer newLink(final String linkId, final int index)
{
return new AjaxFallbackLink<Void>(linkId)
{
@@ -59,7 +59,7 @@ public class AjaxTabbedPanel extends Tab
private static final long serialVersionUID = 1L;
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick(final AjaxRequestTarget target)
{
setSelectedTab(index);
if (target != null)
@@ -84,7 +84,7 @@ public class AjaxTabbedPanel extends Tab
* @param target
* ajax target used to update this component
*/
- protected void onAjaxUpdate(AjaxRequestTarget target)
+ protected void onAjaxUpdate(final AjaxRequestTarget target)
{
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java Sun Jan 23 10:44:31 2011
@@ -69,9 +69,9 @@ public class BreadCrumbBar extends Panel
* @param enableLink
* Whether the link should be enabled
*/
- public BreadCrumbComponent(String id, String separatorMarkup, int index,
- IBreadCrumbModel breadCrumbModel, final IBreadCrumbParticipant breadCrumbParticipant,
- boolean enableLink)
+ public BreadCrumbComponent(final String id, final String separatorMarkup, final int index,
+ final IBreadCrumbModel breadCrumbModel,
+ final IBreadCrumbParticipant breadCrumbParticipant, final boolean enableLink)
{
super(id);
add(new Label("sep", (index > 0) ? separatorMarkup : "").setEscapeModelStrings(false)
@@ -81,7 +81,7 @@ public class BreadCrumbBar extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected IBreadCrumbParticipant getParticipant(String componentId)
+ protected IBreadCrumbParticipant getParticipant(final String componentId)
{
return breadCrumbParticipant;
}
@@ -111,7 +111,7 @@ public class BreadCrumbBar extends Panel
* @param id
* Component id
*/
- public BreadCrumbsListView(String id)
+ public BreadCrumbsListView(final String id)
{
super(id);
setReuseItems(false);
@@ -135,8 +135,8 @@ public class BreadCrumbBar extends Panel
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener#breadCrumbActivated(org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant,
* org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant)
*/
- public void breadCrumbActivated(IBreadCrumbParticipant previousParticipant,
- IBreadCrumbParticipant breadCrumbParticipant)
+ public void breadCrumbActivated(final IBreadCrumbParticipant previousParticipant,
+ final IBreadCrumbParticipant breadCrumbParticipant)
{
signalModelChange();
}
@@ -144,14 +144,14 @@ public class BreadCrumbBar extends Panel
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener#breadCrumbAdded(org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant)
*/
- public void breadCrumbAdded(IBreadCrumbParticipant breadCrumbParticipant)
+ public void breadCrumbAdded(final IBreadCrumbParticipant breadCrumbParticipant)
{
}
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener#breadCrumbRemoved(org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant)
*/
- public void breadCrumbRemoved(IBreadCrumbParticipant breadCrumbParticipant)
+ public void breadCrumbRemoved(final IBreadCrumbParticipant breadCrumbParticipant)
{
}
@@ -183,7 +183,7 @@ public class BreadCrumbBar extends Panel
* @see org.apache.wicket.markup.html.list.ListView#populateItem(org.apache.wicket.markup.html.list.ListItem)
*/
@Override
- protected void populateItem(ListItem<IBreadCrumbParticipant> item)
+ protected void populateItem(final ListItem<IBreadCrumbParticipant> item)
{
int index = item.getIndex();
IBreadCrumbParticipant breadCrumbParticipant = (IBreadCrumbParticipant)item.getDefaultModelObject();
@@ -201,7 +201,7 @@ public class BreadCrumbBar extends Panel
* @param id
* Component id
*/
- public BreadCrumbBar(String id)
+ public BreadCrumbBar(final String id)
{
super(id);
decorated = new DefaultBreadCrumbsModel();
@@ -214,7 +214,7 @@ public class BreadCrumbBar extends Panel
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#addListener(org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener)
*/
- public void addListener(IBreadCrumbModelListener listener)
+ public void addListener(final IBreadCrumbModelListener listener)
{
decorated.addListener(listener);
}
@@ -238,7 +238,7 @@ public class BreadCrumbBar extends Panel
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#removeListener(org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener)
*/
- public void removeListener(IBreadCrumbModelListener listener)
+ public void removeListener(final IBreadCrumbModelListener listener)
{
decorated.removeListener(listener);
}
@@ -246,7 +246,7 @@ public class BreadCrumbBar extends Panel
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#setActive(org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant)
*/
- public void setActive(IBreadCrumbParticipant breadCrumbParticipant)
+ public void setActive(final IBreadCrumbParticipant breadCrumbParticipant)
{
decorated.setActive(breadCrumbParticipant);
}
@@ -287,8 +287,8 @@ public class BreadCrumbBar extends Panel
* the bread crumb
* @return A new bread crumb component
*/
- protected Component newBreadCrumbComponent(String id, int index, int total,
- IBreadCrumbParticipant breadCrumbParticipant)
+ protected Component newBreadCrumbComponent(final String id, final int index, final int total,
+ final IBreadCrumbParticipant breadCrumbParticipant)
{
boolean enableLink = getEnableLinkToCurrent() || (index < (total - 1));
return new BreadCrumbComponent(id, getSeparatorMarkup(), index, this,
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java Sun Jan 23 10:44:31 2011
@@ -47,7 +47,7 @@ public abstract class BreadCrumbLink ext
* @param breadCrumbModel
* The bread crumb model
*/
- public BreadCrumbLink(String id, IBreadCrumbModel breadCrumbModel)
+ public BreadCrumbLink(final String id, final IBreadCrumbModel breadCrumbModel)
{
super(id);
this.breadCrumbModel = breadCrumbModel;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java Sun Jan 23 10:44:31 2011
@@ -32,7 +32,8 @@ public final class BreadCrumbModelListen
private static final long serialVersionUID = 1L;
/** listeners for bread crumb events. */
- private final List<IBreadCrumbModelListener> listeners = new ArrayList<IBreadCrumbModelListener>(1);
+ private final List<IBreadCrumbModelListener> listeners = new ArrayList<IBreadCrumbModelListener>(
+ 1);
/**
* Adds a bread crumb model listener.
@@ -40,7 +41,7 @@ public final class BreadCrumbModelListen
* @param listener
* The listener to add
*/
- public final void addListener(IBreadCrumbModelListener listener)
+ public final void addListener(final IBreadCrumbModelListener listener)
{
if (listener == null)
{
@@ -58,8 +59,8 @@ public final class BreadCrumbModelListen
* @param breadCrumbParticipant
* The activated bread crumb
*/
- public final void fireBreadCrumbActivated(IBreadCrumbParticipant previousParticipant,
- IBreadCrumbParticipant breadCrumbParticipant)
+ public final void fireBreadCrumbActivated(final IBreadCrumbParticipant previousParticipant,
+ final IBreadCrumbParticipant breadCrumbParticipant)
{
for (IBreadCrumbModelListener listener1 : listeners)
{
@@ -73,7 +74,7 @@ public final class BreadCrumbModelListen
* @param breadCrumbParticipant
* The newly added bread crumb
*/
- public final void fireBreadCrumbAdded(IBreadCrumbParticipant breadCrumbParticipant)
+ public final void fireBreadCrumbAdded(final IBreadCrumbParticipant breadCrumbParticipant)
{
for (IBreadCrumbModelListener listener : listeners)
{
@@ -87,7 +88,7 @@ public final class BreadCrumbModelListen
* @param breadCrumbParticipant
* The removed bread crumb
*/
- public final void fireBreadCrumbRemoved(IBreadCrumbParticipant breadCrumbParticipant)
+ public final void fireBreadCrumbRemoved(final IBreadCrumbParticipant breadCrumbParticipant)
{
for (IBreadCrumbModelListener listener : listeners)
{
@@ -101,7 +102,7 @@ public final class BreadCrumbModelListen
* @param listener
* The listener to remove
*/
- public final void removeListener(IBreadCrumbModelListener listener)
+ public final void removeListener(final IBreadCrumbModelListener listener)
{
if (listener != null)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java Sun Jan 23 10:44:31 2011
@@ -32,7 +32,7 @@ public class DefaultBreadCrumbsModel imp
private IBreadCrumbParticipant activeParticipant = null;
/** Holds the current list of crumbs. */
- private List<IBreadCrumbParticipant> crumbs = new ArrayList<IBreadCrumbParticipant>();
+ private final List<IBreadCrumbParticipant> crumbs = new ArrayList<IBreadCrumbParticipant>();
/** listeners utility. */
private final BreadCrumbModelListenerSupport listenerSupport = new BreadCrumbModelListenerSupport();
@@ -47,7 +47,7 @@ public class DefaultBreadCrumbsModel imp
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#addListener(org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener)
*/
- public final void addListener(IBreadCrumbModelListener listener)
+ public final void addListener(final IBreadCrumbModelListener listener)
{
listenerSupport.addListener(listener);
}
@@ -71,7 +71,7 @@ public class DefaultBreadCrumbsModel imp
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#removeListener(org.apache.wicket.extensions.breadcrumb.IBreadCrumbModelListener)
*/
- public final void removeListener(IBreadCrumbModelListener listener)
+ public final void removeListener(final IBreadCrumbModelListener listener)
{
listenerSupport.removeListener(listener);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModelListener.java Sun Jan 23 10:44:31 2011
@@ -40,7 +40,7 @@ public interface IBreadCrumbModelListene
* The bread crumb that was activated.
*/
void breadCrumbActivated(IBreadCrumbParticipant previousParticipant,
- IBreadCrumbParticipant breadCrumbParticipant);
+ IBreadCrumbParticipant breadCrumbParticipant);
/**
* Called when a bread crumb was added to the model.
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbParticipant.java Sun Jan 23 10:44:31 2011
@@ -31,8 +31,8 @@ import org.apache.wicket.extensions.brea
*
* In a {@link BreadCrumbPanel panel based implementation}, <tt>Home</tt>,
* <tt>Products & Solutions</tt> etc would be seperate panels that all are bread crumb
- * participants: for instance the <tt>Home</tt> participant's {@link #getTitle() title} would
- * return 'Home', and {@link #getComponent() the component} would be the corresponding panel.
+ * participants: for instance the <tt>Home</tt> participant's {@link #getTitle() title} would return
+ * 'Home', and {@link #getComponent() the component} would be the corresponding panel.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanel.java Sun Jan 23 10:44:31 2011
@@ -80,7 +80,7 @@ public abstract class BreadCrumbPanel ex
* @param breadCrumbModel
* The bread crumb model
*/
- public BreadCrumbPanel(String id, IBreadCrumbModel breadCrumbModel)
+ public BreadCrumbPanel(final String id, final IBreadCrumbModel breadCrumbModel)
{
super(id);
this.breadCrumbModel = breadCrumbModel;
@@ -96,7 +96,8 @@ public abstract class BreadCrumbPanel ex
* @param model
* The model
*/
- public BreadCrumbPanel(String id, IBreadCrumbModel breadCrumbModel, IModel<?> model)
+ public BreadCrumbPanel(final String id, final IBreadCrumbModel breadCrumbModel,
+ final IModel<?> model)
{
super(id, model);
this.breadCrumbModel = breadCrumbModel;
@@ -109,7 +110,7 @@ public abstract class BreadCrumbPanel ex
*
* @param breadCrumbPanelFactory
*/
- public void activate(IBreadCrumbPanelFactory breadCrumbPanelFactory)
+ public void activate(final IBreadCrumbPanelFactory breadCrumbPanelFactory)
{
activate(breadCrumbPanelFactory.create(getId(), breadCrumbModel));
}
@@ -123,7 +124,7 @@ public abstract class BreadCrumbPanel ex
* @param participant
* The participant to set as the active one
*/
- public void activate(IBreadCrumbParticipant participant)
+ public void activate(final IBreadCrumbParticipant participant)
{
// get the currently active participant
final IBreadCrumbParticipant active = breadCrumbModel.getActive();
@@ -163,7 +164,7 @@ public abstract class BreadCrumbPanel ex
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#onActivate(org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant)
*/
- public void onActivate(IBreadCrumbParticipant previous)
+ public void onActivate(final IBreadCrumbParticipant previous)
{
decorated.onActivate(previous);
}
@@ -174,7 +175,7 @@ public abstract class BreadCrumbPanel ex
* @param breadCrumbModel
* The bread crumb panel
*/
- public final void setBreadCrumbModel(IBreadCrumbModel breadCrumbModel)
+ public final void setBreadCrumbModel(final IBreadCrumbModel breadCrumbModel)
{
this.breadCrumbModel = breadCrumbModel;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java Sun Jan 23 10:44:31 2011
@@ -66,7 +66,8 @@ public final class BreadCrumbPanelFactor
* @see org.apache.wicket.extensions.breadcrumb.panel.IBreadCrumbPanelFactory#create(java.lang.String,
* org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel)
*/
- public final BreadCrumbPanel create(String componentId, IBreadCrumbModel breadCrumbModel)
+ public final BreadCrumbPanel create(final String componentId,
+ final IBreadCrumbModel breadCrumbModel)
{
Constructor<? extends BreadCrumbPanel> ctor = getConstructor();
try
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelLink.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelLink.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelLink.java Sun Jan 23 10:44:31 2011
@@ -107,7 +107,7 @@ public class BreadCrumbPanelLink extends
* @see org.apache.wicket.extensions.breadcrumb.BreadCrumbLink#getParticipant(java.lang.String)
*/
@Override
- protected final IBreadCrumbParticipant getParticipant(String componentId)
+ protected final IBreadCrumbParticipant getParticipant(final String componentId)
{
return breadCrumbPanelFactory.create(componentId, breadCrumbModel);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbParticipantDelegate.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbParticipantDelegate.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbParticipantDelegate.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbParticipantDelegate.java Sun Jan 23 10:44:31 2011
@@ -43,7 +43,7 @@ public abstract class BreadCrumbParticip
*
* @param component
*/
- public BreadCrumbParticipantDelegate(Component component)
+ public BreadCrumbParticipantDelegate(final Component component)
{
if (component == null)
{
@@ -66,7 +66,7 @@ public abstract class BreadCrumbParticip
*
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant#onActivate(org.apache.wicket.extensions.breadcrumb.IBreadCrumbParticipant)
*/
- public void onActivate(IBreadCrumbParticipant previous)
+ public void onActivate(final IBreadCrumbParticipant previous)
{
if (previous != null)
{
@@ -84,7 +84,8 @@ public abstract class BreadCrumbParticip
// NOTE unfortunately, we can't rely on the path pre 2.0
Component c = parent.visitChildren(new IVisitor<Component, Component>()
{
- public void component(Component component, final IVisit<Component> visit)
+ public void component(final Component component,
+ final IVisit<Component> visit)
{
if (component.getId().equals(thisId))
{
@@ -98,7 +99,7 @@ public abstract class BreadCrumbParticip
c = parent.visitParents(Component.class,
new IVisitor<Component, Component>()
{
- public void component(Component component,
+ public void component(final Component component,
final IVisit<Component> visit)
{
if (component.getId().equals(thisId))
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java Sun Jan 23 10:44:31 2011
@@ -164,7 +164,7 @@ public class KittenCaptchaPanel extends
private static final long serialVersionUID = 7480352029955897654L;
@Override
- protected CharSequence getCallbackScript(boolean onlyTargetActivePage)
+ protected CharSequence getCallbackScript(final boolean onlyTargetActivePage)
{
// Call-back script shows loading indicator and makes wicket
// ajax request passing in mouse co-ordinates
@@ -391,7 +391,8 @@ public class KittenCaptchaPanel extends
private transient SoftReference<byte[]> data = null;
@Override
- protected void configureResponse(ResourceResponse response, Attributes attributes)
+ protected void configureResponse(final ResourceResponse response,
+ final Attributes attributes)
{
super.configureResponse(response, attributes);
response.disableCaching();
@@ -411,7 +412,7 @@ public class KittenCaptchaPanel extends
* @return Rendered image data
*/
@Override
- protected byte[] getImageData(Attributes attributes)
+ protected byte[] getImageData(final Attributes attributes)
{
// Handle caching
setLastModifiedTime(Time.now());
@@ -419,7 +420,7 @@ public class KittenCaptchaPanel extends
response.setHeader("Cache-Control", "no-cache, must-revalidate, max-age=0, no-store");
// If we don't have data
- if (data == null || data.get() == null)
+ if ((data == null) || (data.get() == null))
{
// Create the image and turn it into data
final BufferedImage composedImage = animals.createImage();
@@ -599,7 +600,7 @@ public class KittenCaptchaPanel extends
* Maximum random value
* @return A random value in the given range
*/
- private float random(float min, float max)
+ private float random(final float min, final float max)
{
return min + Math.abs(random.nextFloat() * (max - min));
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/OpaqueRegion.java Sun Jan 23 10:44:31 2011
@@ -225,7 +225,7 @@ class OpaqueRegion
int x2 = work.x + work.width;
// Compare left and right sides
- if (rx1 <= x1 && rx2 >= x2)
+ if ((rx1 <= x1) && (rx2 >= x2))
{
// Whole rectangle is obscured
workList.remove(i);
@@ -234,8 +234,8 @@ class OpaqueRegion
else
{
// Check which sides are in
- boolean leftIn = rx1 >= x1 && rx1 < x2;
- boolean rightIn = rx2 > x1 && rx2 <= x2;
+ boolean leftIn = (rx1 >= x1) && (rx1 < x2);
+ boolean rightIn = (rx2 > x1) && (rx2 <= x2);
if (leftIn)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/DefaultLinkParser.java Sun Jan 23 10:44:31 2011
@@ -40,7 +40,7 @@ public class DefaultLinkParser extends L
*/
public static final ILinkRenderStrategy EMAIL_RENDER_STRATEGY = new ILinkRenderStrategy()
{
- public String buildLink(String linkTarget)
+ public String buildLink(final String linkTarget)
{
return "<a href=\"mailto:" + linkTarget + "\">" + linkTarget + "</a>";
}
@@ -52,7 +52,7 @@ public class DefaultLinkParser extends L
*/
public static final ILinkRenderStrategy ENCRYPTED_EMAIL_RENDER_STRATEGY = new ILinkRenderStrategy()
{
- public String buildLink(String linkTarget)
+ public String buildLink(final String linkTarget)
{
AppendingStringBuffer cryptedEmail = new AppendingStringBuffer(64);
for (int i = 0; i < linkTarget.length(); i++)
@@ -79,7 +79,7 @@ public class DefaultLinkParser extends L
*/
public static final ILinkRenderStrategy URL_RENDER_STRATEGY = new ILinkRenderStrategy()
{
- public String buildLink(String linkTarget)
+ public String buildLink(final String linkTarget)
{
return "<a href=\"" +
linkTarget +
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/ILinkParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/ILinkParser.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/ILinkParser.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/ILinkParser.java Sun Jan 23 10:44:31 2011
@@ -17,8 +17,8 @@
package org.apache.wicket.extensions.markup.html.basic;
/**
- * <code>ILinkParser</code> parses an input text and performs modifications according to its
- * render strategies.
+ * <code>ILinkParser</code> parses an input text and performs modifications according to its render
+ * strategies.
*
* @author Gerolf Seitz
*/
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/LinkParser.java Sun Jan 23 10:44:31 2011
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.markup.html.basic;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -43,7 +42,8 @@ public class LinkParser implements ILink
* provided <code>pattern</code>.
* @return this <code>ILinkParser</code>.
*/
- public ILinkParser addLinkRenderStrategy(String pattern, ILinkRenderStrategy renderStrategy)
+ public ILinkParser addLinkRenderStrategy(final String pattern,
+ final ILinkRenderStrategy renderStrategy)
{
renderStrategies.put(pattern, renderStrategy);
return this;
@@ -52,7 +52,7 @@ public class LinkParser implements ILink
/**
* @see ILinkParser#parse(String)
*/
- public String parse(String text)
+ public String parse(final String text)
{
if ((text == null) || ("".equals(text)))
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkLabel.java Sun Jan 23 10:44:31 2011
@@ -43,7 +43,7 @@ public class SmartLinkLabel extends Labe
/**
* @see Label#Label(String, String)
*/
- public SmartLinkLabel(String name, String label)
+ public SmartLinkLabel(final String name, final String label)
{
this(name, new Model<String>(label));
}
@@ -51,7 +51,7 @@ public class SmartLinkLabel extends Labe
/**
* @see Label#Label(String, IModel)
*/
- public SmartLinkLabel(String name, IModel<String> model)
+ public SmartLinkLabel(final String name, final IModel<String> model)
{
super(name, model);
}
@@ -59,7 +59,7 @@ public class SmartLinkLabel extends Labe
/**
* @see Label#Label(String)
*/
- public SmartLinkLabel(String name)
+ public SmartLinkLabel(final String name)
{
super(name);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/basic/SmartLinkMultiLineLabel.java Sun Jan 23 10:44:31 2011
@@ -43,7 +43,7 @@ public class SmartLinkMultiLineLabel ext
/**
* @see MultiLineLabel#MultiLineLabel(String, String)
*/
- public SmartLinkMultiLineLabel(String id, String label)
+ public SmartLinkMultiLineLabel(final String id, final String label)
{
this(id, new Model<String>(label));
}
@@ -56,7 +56,7 @@ public class SmartLinkMultiLineLabel ext
* @param model
* The component's model
*/
- public SmartLinkMultiLineLabel(String id, IModel<String> model)
+ public SmartLinkMultiLineLabel(final String id, final IModel<String> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/captcha/CaptchaImageResource.java Sun Jan 23 10:44:31 2011
@@ -63,7 +63,8 @@ public final class CaptchaImageResource
private final double shearX;
private final double shearY;
- CharAttributes(char c, String name, double rotation, int rise, double shearX, double shearY)
+ CharAttributes(final char c, final String name, final double rotation, final int rise,
+ final double shearX, final double shearY)
{
this.c = c;
this.name = name;
@@ -106,17 +107,19 @@ public final class CaptchaImageResource
private static final long serialVersionUID = 1L;
- private static int randomInt(int min, int max)
+ private static int randomInt(final int min, final int max)
{
return (int)(Math.random() * (max - min) + min);
}
- private static String randomString(int min, int max)
+ private static String randomString(final int min, final int max)
{
int num = randomInt(min, max);
byte b[] = new byte[num];
for (int i = 0; i < num; i++)
+ {
b[i] = (byte)randomInt('a', 'z');
+ }
return new String(b);
}
@@ -145,7 +148,7 @@ public final class CaptchaImageResource
* @param challengeId
* The id of the challenge
*/
- public CaptchaImageResource(String challengeId)
+ public CaptchaImageResource(final String challengeId)
{
this(new Model<String>(challengeId));
}
@@ -157,7 +160,7 @@ public final class CaptchaImageResource
* @param challengeId
* The id of the challenge
*/
- public CaptchaImageResource(IModel<String> challengeId)
+ public CaptchaImageResource(final IModel<String> challengeId)
{
this(challengeId, 48, 30);
}
@@ -172,7 +175,8 @@ public final class CaptchaImageResource
* @param margin
* The image's margin
*/
- public CaptchaImageResource(IModel<String> challengeId, int fontSize, int margin)
+ public CaptchaImageResource(final IModel<String> challengeId, final int fontSize,
+ final int margin)
{
this.challengeId = challengeId;
fontStyle = 1;
@@ -191,7 +195,7 @@ public final class CaptchaImageResource
* @param margin
* The image's margin
*/
- public CaptchaImageResource(String challengeId, int fontSize, int margin)
+ public CaptchaImageResource(final String challengeId, final int fontSize, final int margin)
{
this(new Model<String>(challengeId), fontSize, margin);
}
@@ -225,7 +229,7 @@ public final class CaptchaImageResource
}
@Override
- protected final byte[] getImageData(Attributes attributes)
+ protected final byte[] getImageData(final Attributes attributes)
{
// get image data is always called in sync block
byte[] data = null;
@@ -242,7 +246,7 @@ public final class CaptchaImageResource
return data;
}
- private Font getFont(String fontName)
+ private Font getFont(final String fontName)
{
return new Font(fontName, fontStyle, fontSize);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java Sun Jan 23 10:44:31 2011
@@ -65,7 +65,7 @@ public class DateTextField extends TextF
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public DateTextField(String id)
+ public DateTextField(final String id)
{
this(id, null, defaultDatePattern());
}
@@ -81,7 +81,7 @@ public class DateTextField extends TextF
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public DateTextField(String id, IModel<Date> model)
+ public DateTextField(final String id, final IModel<Date> model)
{
this(id, model, defaultDatePattern());
}
@@ -96,7 +96,7 @@ public class DateTextField extends TextF
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public DateTextField(String id, String datePattern)
+ public DateTextField(final String id, final String datePattern)
{
this(id, null, datePattern);
}
@@ -113,7 +113,7 @@ public class DateTextField extends TextF
*
* @see org.apache.wicket.markup.html.form.TextField
*/
- public DateTextField(String id, IModel<Date> model, String datePattern)
+ public DateTextField(final String id, final IModel<Date> model, final String datePattern)
{
super(id, model, Date.class);
this.datePattern = datePattern;
@@ -148,7 +148,7 @@ public class DateTextField extends TextF
* @see org.apache.wicket.markup.html.form.TextField
*/
@Override
- public <C> IConverter<C> getConverter(Class<C> type)
+ public <C> IConverter<C> getConverter(final Class<C> type)
{
if (converter == null)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java Sun Jan 23 10:44:31 2011
@@ -132,8 +132,8 @@ public class Palette<T> extends Panel
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel<? extends Collection<? extends T>> choicesModel,
- IChoiceRenderer<T> choiceRenderer, int rows, boolean allowOrder)
+ public Palette(final String id, final IModel<? extends Collection<? extends T>> choicesModel,
+ final IChoiceRenderer<T> choiceRenderer, final int rows, final boolean allowOrder)
{
this(id, null, choicesModel, choiceRenderer, rows, allowOrder);
}
@@ -153,9 +153,9 @@ public class Palette<T> extends Panel
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel<List<T>> model,
- IModel<? extends Collection<? extends T>> choicesModel, IChoiceRenderer<T> choiceRenderer,
- int rows, boolean allowOrder)
+ public Palette(final String id, final IModel<List<T>> model,
+ final IModel<? extends Collection<? extends T>> choicesModel,
+ final IChoiceRenderer<T> choiceRenderer, final int rows, final boolean allowOrder)
{
super(id, model);
@@ -269,7 +269,7 @@ public class Palette<T> extends Panel
*
* @return available items component
*/
- protected Component newAvailableHeader(String componentId)
+ protected Component newAvailableHeader(final String componentId)
{
return new Label(componentId, new ResourceModel("palette.available", "Available"));
}
@@ -282,7 +282,7 @@ public class Palette<T> extends Panel
*
* @return header component
*/
- protected Component newSelectedHeader(String componentId)
+ protected Component newSelectedHeader(final String componentId)
{
return new Label(componentId, new ResourceModel("palette.selected", "Selected"));
}
@@ -300,7 +300,7 @@ public class Palette<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
tag.getAttributes().put("onclick", Palette.this.getDownOnClickJS());
@@ -320,7 +320,7 @@ public class Palette<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
tag.getAttributes().put("onclick", Palette.this.getUpOnClickJS());
@@ -340,7 +340,7 @@ public class Palette<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
tag.getAttributes().put("onclick", Palette.this.getRemoveOnClickJS());
@@ -360,7 +360,7 @@ public class Palette<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
tag.getAttributes().put("onclick", Palette.this.getAddOnClickJS());
@@ -380,7 +380,7 @@ public class Palette<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected Map<String, String> getAdditionalAttributes(Object choice)
+ protected Map<String, String> getAdditionalAttributes(final Object choice)
{
return Palette.this.getAdditionalAttributesForSelection(choice);
}
@@ -390,7 +390,7 @@ public class Palette<T> extends Panel
/**
* @see org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
*/
- protected Map<String, String> getAdditionalAttributesForSelection(Object choice)
+ protected Map<String, String> getAdditionalAttributesForSelection(final Object choice)
{
return null;
}
@@ -407,7 +407,7 @@ public class Palette<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected Map<String, String> getAdditionalAttributes(Object choice)
+ protected Map<String, String> getAdditionalAttributes(final Object choice)
{
return Palette.this.getAdditionalAttributesForChoices(choice);
}
@@ -417,7 +417,7 @@ public class Palette<T> extends Panel
/**
* @see org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
*/
- protected Map<String, String> getAdditionalAttributesForChoices(Object choice)
+ protected Map<String, String> getAdditionalAttributesForChoices(final Object choice)
{
return null;
}
@@ -514,7 +514,7 @@ public class Palette<T> extends Panel
* name of javascript function to call
* @return string representing the call tho the function with palette params
*/
- protected String buildJSCall(String funcName)
+ protected String buildJSCall(final String funcName)
{
return new StringBuilder(funcName).append("('")
.append(getChoicesComponent().getMarkupId())
@@ -596,14 +596,14 @@ public class Palette<T> extends Panel
*
* @param id
*/
- public PaletteButton(String id)
+ public PaletteButton(final String id)
{
super(id);
}
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
if (!isPaletteEnabled())
{
@@ -618,7 +618,7 @@ public class Palette<T> extends Panel
* @param response
*/
@Override
- public void renderHead(IHeaderResponse response)
+ public void renderHead(final IHeaderResponse response)
{
response.renderJavaScriptReference(JAVASCRIPT);
ResourceReference css = getCSS();
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java Sun Jan 23 10:44:31 2011
@@ -54,7 +54,7 @@ public abstract class AbstractOptions<T>
* @param palette
* parent palette
*/
- public AbstractOptions(String id, Palette<T> palette)
+ public AbstractOptions(final String id, final Palette<T> palette)
{
super(id);
this.palette = palette;
@@ -67,7 +67,7 @@ public abstract class AbstractOptions<T>
* {@inheritDoc}
*/
@Override
- public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
StringBuilder buffer = new StringBuilder(128);
Iterator<T> options = getOptionsIterator();
@@ -137,7 +137,7 @@ public abstract class AbstractOptions<T>
* @param choice
* @return map of attribute/value pairs (String/String)
*/
- protected Map<String, String> getAdditionalAttributes(T choice)
+ protected Map<String, String> getAdditionalAttributes(final T choice)
{
return null;
}
@@ -146,7 +146,7 @@ public abstract class AbstractOptions<T>
* {@inheritDoc}
*/
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
checkComponentTag(tag, "select");
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Choices.java Sun Jan 23 10:44:31 2011
@@ -39,14 +39,14 @@ public class Choices<T> extends Abstract
* @param palette
* parent palette
*/
- public Choices(String id, Palette<T> palette)
+ public Choices(final String id, final Palette<T> palette)
{
super(id, palette);
}
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
IValueMap attrs = tag.getAttributes();
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Recorder.java Sun Jan 23 10:44:31 2011
@@ -68,7 +68,7 @@ public class Recorder<T> extends HiddenF
* @param palette
* parent palette object
*/
- public Recorder(String id, Palette<T> palette)
+ public Recorder(final String id, final Palette<T> palette)
{
super(id);
this.palette = palette;
@@ -103,7 +103,7 @@ public class Recorder<T> extends HiddenF
{
// construct the model string based on selection collection
IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer();
- StringBuilder modelStringBuffer = new StringBuilder();
+ StringBuilder modelStringBuffer = new StringBuilder();
Collection<T> modelCollection = getPalette().getModelCollection();
if (modelCollection == null)
{
@@ -135,7 +135,9 @@ public class Recorder<T> extends HiddenF
{
super.onValid();
if (attached)
+ {
updateIds();
+ }
}
/**
@@ -205,7 +207,9 @@ public class Recorder<T> extends HiddenF
{
super.onInvalid();
if (attached)
+ {
updateIds();
+ }
}
private void updateIds()
@@ -213,7 +217,7 @@ public class Recorder<T> extends HiddenF
updateIds(getValue());
}
- private void updateIds(String value)
+ private void updateIds(final String value)
{
if (Strings.isEmpty(value))
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/Selection.java Sun Jan 23 10:44:31 2011
@@ -39,13 +39,13 @@ public class Selection<T> extends Abstra
* @param palette
* parent palette
*/
- public Selection(String id, Palette<T> palette)
+ public Selection(final String id, final Palette<T> palette)
{
super(id, palette);
}
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
IValueMap attrs = tag.getAttributes();
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java Sun Jan 23 10:44:31 2011
@@ -78,7 +78,7 @@ public class Select<T> extends FormCompo
* @param id
* component id
*/
- public Select(String id)
+ public Select(final String id)
{
super(id);
}
@@ -88,7 +88,7 @@ public class Select<T> extends FormCompo
* @param model
* @see WebMarkupContainer#WebMarkupContainer(String, IModel)
*/
- public Select(String id, IModel<T> model)
+ public Select(final String id, final IModel<T> model)
{
super(id, model);
}
@@ -104,13 +104,13 @@ public class Select<T> extends FormCompo
*/
String[] paths = getInputAsArray();
- if (paths == null || paths.length == 0)
+ if ((paths == null) || (paths.length == 0))
{
setConvertedInput(null);
return;
}
- if (!supportsMultiple && paths.length > 1)
+ if (!supportsMultiple && (paths.length > 1))
{
throw new WicketRuntimeException(
"The model of Select component [" +
@@ -205,13 +205,13 @@ public class Select<T> extends FormCompo
* @param option
* @return true if the option is selected, false otherwise
*/
- boolean isSelected(SelectOption<?> option)
+ boolean isSelected(final SelectOption<?> option)
{
// if the raw input is specified use that, otherwise use model
if (hasRawInput())
{
String[] paths = getInputAsArray();
- if (paths != null && paths.length > 0)
+ if ((paths != null) && (paths.length > 0))
{
for (String path : paths)
{
@@ -227,9 +227,9 @@ public class Select<T> extends FormCompo
return compareModels(getDefaultModelObject(), option.getDefaultModelObject());
}
- private boolean compareModels(Object selected, Object value)
+ private boolean compareModels(final Object selected, final Object value)
{
- if (selected != null && selected instanceof Collection)
+ if ((selected != null) && (selected instanceof Collection))
{
if (value instanceof Collection)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java Sun Jan 23 10:44:31 2011
@@ -39,7 +39,7 @@ public class SelectOption<T> extends Web
/**
* @see WebMarkupContainer#WebMarkupContainer(String)
*/
- public SelectOption(String id)
+ public SelectOption(final String id)
{
super(id);
}
@@ -49,7 +49,7 @@ public class SelectOption<T> extends Web
* @param model
* @see WebMarkupContainer#WebMarkupContainer(String, IModel)
*/
- public SelectOption(String id, IModel<T> model)
+ public SelectOption(final String id, final IModel<T> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Sun Jan 23 10:44:31 2011
@@ -55,8 +55,8 @@ public class SelectOptions<T> extends Re
* @param model
* @param renderer
*/
- public SelectOptions(String id, IModel<? extends Collection<? extends T>> model,
- IOptionRenderer<T> renderer)
+ public SelectOptions(final String id, final IModel<? extends Collection<? extends T>> model,
+ final IOptionRenderer<T> renderer)
{
super(id, model);
this.renderer = renderer;
@@ -70,7 +70,8 @@ public class SelectOptions<T> extends Re
* @param elements
* @param renderer
*/
- public SelectOptions(String id, Collection<? extends T> elements, IOptionRenderer<T> renderer)
+ public SelectOptions(final String id, final Collection<? extends T> elements,
+ final IOptionRenderer<T> renderer)
{
this(id, new WildcardCollectionModel<T>(elements), renderer);
}
@@ -81,7 +82,7 @@ public class SelectOptions<T> extends Re
* @param refresh
* @return this for chaining
*/
- public SelectOptions<T> setRecreateChoices(boolean refresh)
+ public SelectOptions<T> setRecreateChoices(final boolean refresh)
{
recreateChoices = refresh;
return this;
@@ -94,7 +95,7 @@ public class SelectOptions<T> extends Re
@Override
protected final void onPopulate()
{
- if (size() == 0 || recreateChoices)
+ if ((size() == 0) || recreateChoices)
{
// populate this repeating view with SelectOption components
removeAll();
@@ -127,7 +128,7 @@ public class SelectOptions<T> extends Re
* @param model
* @return a {@link SelectOption}
*/
- protected SelectOption<T> newOption(String text, IModel<T> model)
+ protected SelectOption<T> newOption(final String text, final IModel<T> model)
{
return new SimpleSelectOption<T>("option", model, text);
}
@@ -147,7 +148,7 @@ public class SelectOptions<T> extends Re
* @param model
* @param text
*/
- public SimpleSelectOption(String id, IModel<V> model, String text)
+ public SimpleSelectOption(final String id, final IModel<V> model, final String text)
{
super(id, model);
this.text = text;
@@ -157,7 +158,7 @@ public class SelectOptions<T> extends Re
* {@inheritDoc}
*/
@Override
- public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
+ public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
replaceComponentTagBody(markupStream, openTag, text);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java Sun Jan 23 10:44:31 2011
@@ -67,7 +67,7 @@ public class ThumbnailImageResource exte
* @param maxSize
* maximum size (width or height) for resize operation
*/
- public ThumbnailImageResource(IResource unscaledImageResource, int maxSize)
+ public ThumbnailImageResource(final IResource unscaledImageResource, final int maxSize)
{
super();
@@ -84,7 +84,7 @@ public class ThumbnailImageResource exte
* @return The image data for this dynamic image
*/
@Override
- protected byte[] getImageData(Attributes attributes)
+ protected byte[] getImageData(final Attributes attributes)
{
if (thumbnail == null)
{
@@ -102,7 +102,7 @@ public class ThumbnailImageResource exte
*
* @return BufferedImage
*/
- protected final BufferedImage getScaledImageInstance(Attributes attributes)
+ protected final BufferedImage getScaledImageInstance(final Attributes attributes)
{
InputStream is = null;
BufferedImage originalImage = null;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/AbstractDataGridView.java Sun Jan 23 10:44:31 2011
@@ -58,8 +58,8 @@ public abstract class AbstractDataGridVi
* @param dataProvider
* data provider
*/
- public AbstractDataGridView(String id, List<? extends ICellPopulator<T>> populators,
- IDataProvider<T> dataProvider)
+ public AbstractDataGridView(final String id,
+ final List<? extends ICellPopulator<T>> populators, final IDataProvider<T> dataProvider)
{
super(id, dataProvider);
@@ -87,14 +87,14 @@ public abstract class AbstractDataGridVi
*
* @return DataItem created DataItem
*/
- protected Item<ICellPopulator<T>> newCellItem(final String id, int index,
+ protected Item<ICellPopulator<T>> newCellItem(final String id, final int index,
final IModel<ICellPopulator<T>> model)
{
return new Item<ICellPopulator<T>>(id, index, model);
}
@Override
- protected final Item<T> newItem(String id, int index, IModel<T> model)
+ protected final Item<T> newItem(final String id, final int index, final IModel<T> model)
{
return newRowItem(id, index, model);
}
@@ -114,7 +114,7 @@ public abstract class AbstractDataGridVi
*
* @return DataItem created DataItem
*/
- protected Item<T> newRowItem(final String id, int index, final IModel<T> model)
+ protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
return new Item<T>(id, index, model);
}
@@ -140,7 +140,7 @@ public abstract class AbstractDataGridVi
* @see org.apache.wicket.markup.repeater.RefreshingView#populateItem(org.apache.wicket.markup.repeater.Item)
*/
@Override
- protected final void populateItem(Item<T> item)
+ protected final void populateItem(final Item<T> item)
{
RepeatingView cells = new RepeatingView(CELL_REPEATER_ID);
item.add(cells);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/DataGridView.java Sun Jan 23 10:44:31 2011
@@ -78,8 +78,8 @@ public class DataGridView<T> extends Abs
* @param dataProvider
* data provider
*/
- public DataGridView(String id, List<? extends ICellPopulator<T>> populators,
- IDataProvider<T> dataProvider)
+ public DataGridView(final String id, final List<? extends ICellPopulator<T>> populators,
+ final IDataProvider<T> dataProvider)
{
super(id, populators, dataProvider);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/grid/PropertyPopulator.java Sun Jan 23 10:44:31 2011
@@ -47,7 +47,7 @@ public class PropertyPopulator<T> implem
* property whose value will be displayed in the cell. uses wicket's
* {@link PropertyModel} notation.
*/
- public PropertyPopulator(String property)
+ public PropertyPopulator(final String property)
{
if (property == null)
{
@@ -67,8 +67,8 @@ public class PropertyPopulator<T> implem
* @see org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator#populateItem(org.apache.wicket.markup.repeater.Item,
* java.lang.String, org.apache.wicket.model.IModel)
*/
- public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId,
- IModel<T> rowModel)
+ public void populateItem(final Item<ICellPopulator<T>> cellItem, final String componentId,
+ final IModel<T> rowModel)
{
cellItem.add(new Label(componentId, new PropertyModel<T>(rowModel, property)));
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java Sun Jan 23 10:44:31 2011
@@ -49,8 +49,8 @@ public class OrderByBorder extends Borde
* see
* {@link OrderByLink#OrderByLink(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) }
*/
- public OrderByBorder(String id, String property, ISortStateLocator stateLocator,
- OrderByLink.ICssProvider cssProvider)
+ public OrderByBorder(final String id, final String property,
+ final ISortStateLocator stateLocator, final OrderByLink.ICssProvider cssProvider)
{
super(id);
@@ -62,7 +62,7 @@ public class OrderByBorder extends Borde
/**
* create new sort order toggling link
- *
+ *
* @param id
* component id
* @param property
@@ -71,9 +71,11 @@ public class OrderByBorder extends Borde
* sort state locator
* @return link
*/
- protected OrderByLink newOrderByLink(String id, String property, ISortStateLocator stateLocator)
+ protected OrderByLink newOrderByLink(final String id, final String property,
+ final ISortStateLocator stateLocator)
{
- return new OrderByLink(id, property, stateLocator, OrderByLink.VoidCssProvider.getInstance())
+ return new OrderByLink(id, property, stateLocator,
+ OrderByLink.VoidCssProvider.getInstance())
{
private static final long serialVersionUID = 1L;
@@ -101,7 +103,8 @@ public class OrderByBorder extends Borde
* @param stateLocator
* see {@link OrderByLink#OrderByLink(String, String, ISortStateLocator)}
*/
- public OrderByBorder(String id, String property, ISortStateLocator stateLocator)
+ public OrderByBorder(final String id, final String property,
+ final ISortStateLocator stateLocator)
{
this(id, property, stateLocator, OrderByLink.DefaultCssProvider.getInstance());
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java Sun Jan 23 10:44:31 2011
@@ -53,7 +53,7 @@ public class OrderByLink extends Link
* 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)
+ public OrderByLink(final String id, final String property, final ISortStateLocator stateLocator)
{
this(id, property, stateLocator, DefaultCssProvider.getInstance());
}
@@ -76,8 +76,8 @@ public class OrderByLink extends Link
* @see OrderByLink.ICssProvider
*
*/
- public OrderByLink(String id, String property, ISortStateLocator stateLocator,
- ICssProvider cssProvider)
+ public OrderByLink(final String id, final String property,
+ final ISortStateLocator stateLocator, final ICssProvider cssProvider)
{
super(id);
@@ -145,7 +145,7 @@ public class OrderByLink extends Link
* previous sort order
* @return next sort order
*/
- protected SortOrder nextSortOrder(SortOrder order)
+ protected SortOrder nextSortOrder(final SortOrder order)
{
// init / flip order
if (order == SortOrder.NONE)
@@ -183,7 +183,7 @@ public class OrderByLink extends Link
}
@Override
- public void onComponentTag(Component component, ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
super.onComponentTag(component, tag);
@@ -242,7 +242,7 @@ public class OrderByLink extends Link
* @param none
* css class when not sorted
*/
- public CssProvider(String ascending, String descending, String none)
+ public CssProvider(final String ascending, final String descending, final String none)
{
this.ascending = ascending;
this.descending = descending;
@@ -253,7 +253,7 @@ public class OrderByLink extends Link
* @see org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider#getClassAttributeValue(org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState,
* java.lang.String)
*/
- public String getClassAttributeValue(ISortState state, String property)
+ public String getClassAttributeValue(final ISortState state, final String property)
{
SortOrder dir = state.getPropertySortOrder(property);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/SortOrder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/SortOrder.java?rev=1062370&r1=1062369&r2=1062370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/SortOrder.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/SortOrder.java Sun Jan 23 10:44:31 2011
@@ -18,12 +18,11 @@ package org.apache.wicket.extensions.mar
/**
* Sort order for columns
- *
+ *
* @author pete
- *
+ *
*/
-public enum SortOrder
-{
+public enum SortOrder {
/**
* unsorted
*/
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.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/AbstractColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java Sun Jan 23 10:44:31 2011
@@ -38,7 +38,7 @@ public abstract class AbstractColumn<T>
* @param sortProperty
* sort property this column represents
*/
- public AbstractColumn(IModel<String> displayModel, String sortProperty)
+ public AbstractColumn(final IModel<String> displayModel, final String sortProperty)
{
this.displayModel = displayModel;
this.sortProperty = sortProperty;
@@ -48,7 +48,7 @@ public abstract class AbstractColumn<T>
* @param displayModel
* model used to generate header text
*/
- public AbstractColumn(IModel<String> displayModel)
+ public AbstractColumn(final IModel<String> displayModel)
{
this(displayModel, null);
}
@@ -80,7 +80,7 @@ public abstract class AbstractColumn<T>
/**
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#getHeader(java.lang.String)
*/
- public Component getHeader(String componentId)
+ public Component getHeader(final String componentId)
{
return new Label(componentId, getDisplayModel());
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.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/AbstractToolbar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java Sun Jan 23 10:44:31 2011
@@ -43,7 +43,7 @@ public abstract class AbstractToolbar ex
* @param table
* data table this toolbar will be attached to
*/
- public AbstractToolbar(IModel<?> model, DataTable<?> table)
+ public AbstractToolbar(final IModel<?> model, final DataTable<?> table)
{
super("$toolbar$" + counter++, model);
this.table = table;
@@ -55,7 +55,7 @@ public abstract class AbstractToolbar ex
* @param table
* data table this toolbar will be attached to
*/
- public AbstractToolbar(DataTable<?> table)
+ public AbstractToolbar(final DataTable<?> table)
{
this(null, table);
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.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/DataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Sun Jan 23 10:44:31 2011
@@ -23,9 +23,7 @@ import org.apache.wicket.behavior.Behavi
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.DataGridView;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.list.AbstractItem;
import org.apache.wicket.markup.html.navigation.paging.IPageableItems;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.IItemReuseStrategy;
@@ -85,7 +83,7 @@ public class DataTable<T> extends Panel
* @see Behavior#onComponentTag(Component, ComponentTag)
*/
@Override
- public void onComponentTag(Component component, ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
String className = getCssClass();
if (!Strings.isEmpty(className))
@@ -127,12 +125,12 @@ public class DataTable<T> extends Panel
* @param rowsPerPage
* number of rows per page
*/
- public DataTable(String id, List<IColumn<T>> columns, IDataProvider<T> dataProvider,
- int rowsPerPage)
+ public DataTable(final String id, final List<IColumn<T>> columns,
+ final IDataProvider<T> dataProvider, final int rowsPerPage)
{
super(id);
- if (columns == null || columns.size() < 1)
+ if ((columns == null) || (columns.size() < 1))
{
throw new IllegalArgumentException("Argument `columns` cannot be null or empty");
}
@@ -144,7 +142,7 @@ public class DataTable<T> extends Panel
private static final long serialVersionUID = 1L;
@Override
- protected Item newCellItem(String id, int index, IModel model)
+ protected Item newCellItem(final String id, final int index, final IModel model)
{
Item item = DataTable.this.newCellItem(id, index, model);
final IColumn<T> column = DataTable.this.columns.get(index);
@@ -165,7 +163,7 @@ public class DataTable<T> extends Panel
}
@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 DataTable.this.newRowItem(id, index, model);
}
@@ -209,7 +207,7 @@ public class DataTable<T> extends Panel
*
* @see AbstractToolbar
*/
- public void addBottomToolbar(AbstractToolbar toolbar)
+ public void addBottomToolbar(final AbstractToolbar toolbar)
{
addToolbar(toolbar, bottomToolbars);
}
@@ -222,7 +220,7 @@ public class DataTable<T> extends Panel
*
* @see AbstractToolbar
*/
- public void addTopToolbar(AbstractToolbar toolbar)
+ public void addTopToolbar(final AbstractToolbar toolbar)
{
addToolbar(toolbar, topToolbars);
}
@@ -278,7 +276,7 @@ public class DataTable<T> extends Panel
/**
* @see org.apache.wicket.markup.html.navigation.paging.IPageable#setCurrentPage(int)
*/
- public final void setCurrentPage(int page)
+ public final void setCurrentPage(final int page)
{
datagrid.setCurrentPage(page);
onPageChanged();
@@ -295,7 +293,7 @@ public class DataTable<T> extends Panel
* item reuse strategy
* @return this for chaining
*/
- public final DataTable<T> setItemReuseStrategy(IItemReuseStrategy strategy)
+ public final DataTable<T> setItemReuseStrategy(final IItemReuseStrategy strategy)
{
datagrid.setItemReuseStrategy(strategy);
return this;
@@ -308,7 +306,7 @@ public class DataTable<T> extends Panel
* number of items to display per page
*
*/
- public void setItemsPerPage(int items)
+ public void setItemsPerPage(final int items)
{
datagrid.setItemsPerPage(items);
}
@@ -321,7 +319,7 @@ public class DataTable<T> extends Panel
return datagrid.getItemCount();
}
- private void addToolbar(AbstractToolbar toolbar, RepeatingView container)
+ private void addToolbar(final AbstractToolbar toolbar, final RepeatingView container)
{
if (toolbar == null)
{
@@ -365,7 +363,7 @@ public class DataTable<T> extends Panel
*
* @return DataItem created DataItem
*/
- protected Item<T> newRowItem(final String id, int index, final IModel<T> model)
+ protected Item<T> newRowItem(final String id, final int index, final IModel<T> model)
{
return new Item<T>(id, index, model);
}
@@ -395,52 +393,6 @@ public class DataTable<T> extends Panel
}
/**
- * Acts as a repeater item with its container generated id. It essentially only forwards the
- * request to its (single) child component.
- *
- * TODO 1.5 optimization: this can probably be removed and items can be added directly to the
- * toolbarcontainer
- *
- * @author igor.vaynberg
- */
- private static final class ToolbarContainer extends AbstractItem
- {
- private static final long serialVersionUID = 1L;
-
- /**
- * Construct.
- *
- * @param id
- */
- private ToolbarContainer(String id)
- {
- super(id);
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isVisible()
- {
- return (iterator().next()).isVisible();
- }
-
- @Override
- protected void onRender()
- {
- get(0).render();
- }
-
- /**
- * @see org.apache.wicket.MarkupContainer#getMarkup(org.apache.wicket.Component)
- */
- @Override
- public IMarkupFragment getMarkup(Component child)
- {
- return getMarkup();
- }
- }
-
- /**
* This class acts as a repeater that will contain the toolbar.
*
* @author igor.vaynberg
@@ -454,7 +406,7 @@ public class DataTable<T> extends Panel
*
* @param id
*/
- private ToolbarsContainer(String id)
+ private ToolbarsContainer(final String id)
{
super(id);
}