Author: ivaynberg
Date: Mon May 19 10:27:46 2008
New Revision: 657872
URL: http://svn.apache.org/viewvc?rev=657872&view=rev
Log:
making public to try to solve a very weird error: [Compiler]
wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java:[37,92]
org.apache.wicket.examples.compref.CheckBoxMultipleChoicePage.Input has
private access in org.apache.wicket.examples.compref.CheckBoxMultipleChoicePage
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=657872&r1=657871&r2=657872&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
Mon May 19 10:27:46 2008
@@ -43,13 +43,13 @@
* @param <E>
* class of a single element in the choices list
*/
-abstract class AbstractChoice<T, E> extends FormComponent<T>
+public abstract class AbstractChoice<T, E> extends FormComponent<T>
{
/** */
private static final long serialVersionUID = 1L;
/** The list of objects. */
- private IModel<List< ? extends E>> choices;
+ private IModel<List<? extends E>> choices;
/** The renderer used to generate display/id values for the objects. */
private IChoiceRenderer<E> renderer;
@@ -75,7 +75,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final List< ? extends E> choices)
+ public AbstractChoice(final String id, final List<? extends E> choices)
{
this(id, new Model((Serializable)choices), new
ChoiceRenderer<E>());
}
@@ -91,7 +91,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final List< ? extends E> choices,
+ public AbstractChoice(final String id, final List<? extends E> choices,
final IChoiceRenderer<E> renderer)
{
this(id, new Model((Serializable)choices), renderer);
@@ -108,7 +108,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final List< ?
extends E> choices)
+ public AbstractChoice(final String id, IModel<T> model, final List<?
extends E> choices)
{
this(id, model, new Model((Serializable)choices), new
ChoiceRenderer<E>());
}
@@ -126,7 +126,7 @@
* The rendering engine
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final List< ?
extends E> choices,
+ public AbstractChoice(final String id, IModel<T> model, final List<?
extends E> choices,
final IChoiceRenderer<E> renderer)
{
this(id, model, new Model((Serializable)choices), renderer);
@@ -141,7 +141,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final IModel<List< ? extends E>>
choices)
+ public AbstractChoice(final String id, final IModel<List<? extends E>>
choices)
{
this(id, choices, new ChoiceRenderer<E>());
}
@@ -157,7 +157,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final IModel<List< ? extends E>>
choices,
+ public AbstractChoice(final String id, final IModel<List<? extends E>>
choices,
final IChoiceRenderer<E> renderer)
{
super(id);
@@ -176,7 +176,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final
IModel<List< ? extends E>> choices)
+ public AbstractChoice(final String id, IModel<T> model, final
IModel<List<? extends E>> choices)
{
this(id, model, choices, new ChoiceRenderer<E>());
}
@@ -195,7 +195,7 @@
* @see org.apache.wicket.Component#Component(String, IModel)
*/
public AbstractChoice(final String id, IModel<T> model,
- final IModel<List< ? extends E>> choices, final
IChoiceRenderer<E> renderer)
+ final IModel<List<? extends E>> choices, final
IChoiceRenderer<E> renderer)
{
super(id, model);
this.choices = wrap(choices);
@@ -206,7 +206,7 @@
/**
* @return The collection of object that this choice has
*/
- public List< ? extends E> getChoices()
+ public List<? extends E> getChoices()
{
List<E> choices = (this.choices != null) ?
(List<E>)this.choices.getObject() : null;
if (choices == null)
@@ -225,7 +225,7 @@
* model representing the list of choices
* @return this for chaining
*/
- public final AbstractChoice<T, E> setChoices(IModel<List< ? extends E>>
choices)
+ public final AbstractChoice<T, E> setChoices(IModel<List<? extends E>>
choices)
{
if (this.choices != null && this.choices != choices)
{
@@ -348,7 +348,7 @@
@Override
protected void onComponentTagBody(final MarkupStream markupStream,
final ComponentTag openTag)
{
- List< ? extends E> choices = getChoices();
+ List<? extends E> choices = getChoices();
final AppendingStringBuffer buffer = new
AppendingStringBuffer((choices.size() * 50) + 16);
final String selected = getValue();
@@ -462,7 +462,7 @@
{
private static final long serialVersionUID = 1L;
- private final IModel<List< ? extends E>> oldChoices;
+ private final IModel<List<? extends E>> oldChoices;
/**
* Construct.
