You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/07 03:11:13 UTC
svn commit: r664231 [6/6] - in /wicket/sandbox/ivaynberg/generics:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/
wicket-auth-roles/src/main/java/org/apa...
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Fri Jun 6 18:11:06 2008
@@ -250,7 +250,7 @@
* @param component
* the listener to invoke
*/
- public void executeListener(Component<?> component)
+ public void executeListener(Component component)
{
setupRequestAndResponse();
getServletRequest().setRequestToComponent(component);
@@ -449,11 +449,11 @@
*
* @param component
*/
- public void startComponent(Component<?> component)
+ public void startComponent(Component component)
{
if (component instanceof FormComponent)
{
- ((FormComponent<?>)component).processInput();
+ ((FormComponent)component).processInput();
}
component.beforeRender();
}
@@ -479,9 +479,9 @@
* @return The component at the path
* @see org.apache.wicket.MarkupContainer#get(String)
*/
- public Component<?> getComponentFromLastRenderedPage(String path)
+ public Component getComponentFromLastRenderedPage(String path)
{
- final Component<?> component = getLastRenderedPage().get(path);
+ final Component component = getLastRenderedPage().get(path);
if (component == null)
{
fail("path: '" + path + "' does not exist for page: " +
@@ -556,9 +556,9 @@
* expected component class
* @return a <code>Result</code>
*/
- public <C extends Component<?>> Result isComponent(String path, Class<C> expectedComponentClass)
+ public <C extends Component> Result isComponent(String path, Class<C> expectedComponentClass)
{
- Component<?> component = getComponentFromLastRenderedPage(path);
+ Component component = getComponentFromLastRenderedPage(path);
return isTrue("component '" + Classes.simpleName(component.getClass()) + "' is not type:" +
Classes.simpleName(expectedComponentClass),
expectedComponentClass.isAssignableFrom(component.getClass()));
@@ -573,7 +573,7 @@
*/
public Result isVisible(String path)
{
- Component<?> component = getLastRenderedPage().get(path);
+ Component component = getLastRenderedPage().get(path);
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
@@ -664,7 +664,7 @@
*/
public void clickLink(String path, boolean isAjax)
{
- Component<?> linkComponent = getComponentFromLastRenderedPage(path);
+ Component linkComponent = getComponentFromLastRenderedPage(path);
// if the link is an AjaxLink, we process it differently
// than a normal link
@@ -827,7 +827,7 @@
fail("before using this method, at least one page has to be rendered");
}
- Component<?> c = getComponentFromLastRenderedPage(componentPath);
+ Component c = getComponentFromLastRenderedPage(componentPath);
if (c == null)
{
fail("component " + componentPath + " was not found");
@@ -836,7 +836,7 @@
if (c instanceof FormComponent)
{
- getParametersForNextRequest().put(((FormComponent<?>)c).getInputName(),
+ getParametersForNextRequest().put(((FormComponent)c).getInputName(),
new String[] { value.toString() });
}
else
@@ -1011,7 +1011,7 @@
* the <code>Component</code> to test
* @return a <code>Result</code>
*/
- public Result isComponentOnAjaxResponse(Component<?> component)
+ public Result isComponentOnAjaxResponse(Component component)
{
String failMessage = "A component which is null could not have been added to the AJAX response";
notNull(failMessage, component);
@@ -1076,7 +1076,7 @@
*/
public void executeAjaxEvent(String componentPath, String event)
{
- Component<?> component = getComponentFromLastRenderedPage(componentPath);
+ Component component = getComponentFromLastRenderedPage(componentPath);
executeAjaxEvent(component, event);
}
@@ -1117,7 +1117,7 @@
* the event to simulate being fired. If <code>event</code> is <code>null</code>,
* the test will fail.
*/
- public void executeAjaxEvent(Component<?> component, String event)
+ public void executeAjaxEvent(Component component, String event)
{
String failMessage = "Can't execute event on a component which is null.";
notNull(failMessage, component);
@@ -1242,7 +1242,7 @@
form.visitFormComponents(new FormComponent.AbstractVisitor()
{
@Override
- public void onFormComponent(FormComponent<?> formComponent)
+ public void onFormComponent(FormComponent formComponent)
{
// !(formComponent instanceof Button) &&
if (!(formComponent instanceof RadioGroup) &&
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/FormTester.java Fri Jun 6 18:11:06 2008
@@ -68,7 +68,7 @@
/**
* TODO need Javadoc from author.
*/
- private final class SearchOptionByIndexVisitor implements IVisitor<Component<?>>
+ private final class SearchOptionByIndexVisitor implements IVisitor<Component>
{
int count = 0;
@@ -83,7 +83,7 @@
/**
* @see org.apache.wicket.Component.IVisitor#component(org.apache.wicket.Component)
*/
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (count == index)
{
@@ -97,7 +97,7 @@
}
}
- private final FormComponent<?> formComponent;
+ private final FormComponent formComponent;
/**
* Constructor.
@@ -105,7 +105,7 @@
* @param formComponent
* a <code>FormComponent</code>
*/
- protected ChoiceSelector(FormComponent<?> formComponent)
+ protected ChoiceSelector(FormComponent formComponent)
{
this.formComponent = formComponent;
}
@@ -118,7 +118,7 @@
* @param value
* a <code>String</code> value
*/
- protected abstract void assignValueToFormComponent(FormComponent<?> formComponent,
+ protected abstract void assignValueToFormComponent(FormComponent formComponent,
String value);
/**
@@ -173,7 +173,7 @@
* @return the id value at the selected index
*/
@SuppressWarnings("unchecked")
- private String selectAbstractChoice(FormComponent<?> formComponent, final int index)
+ private String selectAbstractChoice(FormComponent formComponent, final int index)
{
try
{
@@ -229,7 +229,7 @@
* @param formComponent
* a <code>FormComponent</code>
*/
- protected MultipleChoiceSelector(FormComponent<?> formComponent)
+ protected MultipleChoiceSelector(FormComponent formComponent)
{
super(formComponent);
if (!allowMultipleChoice(formComponent))
@@ -245,7 +245,7 @@
* java.lang.String)
*/
@Override
- protected void assignValueToFormComponent(FormComponent<?> formComponent, String value)
+ protected void assignValueToFormComponent(FormComponent formComponent, String value)
{
// multiple selectable should retain selected option
addFormComponentValue(formComponent, value);
@@ -263,7 +263,7 @@
* @param formComponent
* a <code>FormComponent</code>
*/
- protected SingleChoiceSelector(FormComponent<?> formComponent)
+ protected SingleChoiceSelector(FormComponent formComponent)
{
super(formComponent);
}
@@ -273,7 +273,7 @@
* java.lang.String)
*/
@Override
- protected void assignValueToFormComponent(FormComponent<?> formComponent, String value)
+ protected void assignValueToFormComponent(FormComponent formComponent, String value)
{
// single selectable should overwrite already selected option
setFormComponentValue(formComponent, value);
@@ -287,7 +287,7 @@
* a <code>FormComponent</code>
* @return ChoiceSelector a <code>ChoiceSelector</code>
*/
- protected ChoiceSelector create(FormComponent<?> formComponent)
+ protected ChoiceSelector create(FormComponent formComponent)
{
if (formComponent == null)
{
@@ -318,7 +318,7 @@
* a <code>FormComponent</code>
* @return ChoiceSelector a <code>ChoiceSelector</code>
*/
- protected ChoiceSelector createForMultiple(FormComponent<?> formComponent)
+ protected ChoiceSelector createForMultiple(FormComponent formComponent)
{
return new MultipleChoiceSelector(formComponent);
}
@@ -330,7 +330,7 @@
* a <code>FormComponent</code>
* @return <code>true</code> if the given FormComponent allows multiple choice
*/
- private boolean allowMultipleChoice(FormComponent<?> formComponent)
+ private boolean allowMultipleChoice(FormComponent formComponent)
{
return formComponent instanceof CheckGroup ||
formComponent instanceof ListMultipleChoice;
@@ -380,7 +380,7 @@
{
@SuppressWarnings("unchecked")
@Override
- public void onFormComponent(final FormComponent<?> formComponent)
+ public void onFormComponent(final FormComponent formComponent)
{
// do nothing for invisible component
if (!formComponent.isVisibleInHierarchy())
@@ -421,9 +421,9 @@
else if (formComponent instanceof CheckGroup)
{
final Collection<?> checkGroupValues = (Collection<?>)formComponent.getModelObject();
- formComponent.visitChildren(Check.class, new IVisitor<Component<?>>()
+ formComponent.visitChildren(Check.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (checkGroupValues.contains(component.getModelObject()))
{
@@ -442,9 +442,9 @@
final Object value = formComponent.getModelObject();
if (value != null)
{
- formComponent.visitChildren(Radio.class, new IVisitor<Component<?>>()
+ formComponent.visitChildren(Radio.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (value.equals(component.getModelObject()))
{
@@ -481,10 +481,10 @@
*/
public String getTextComponentValue(String id)
{
- Component<?> c = getForm().get(id);
+ Component c = getForm().get(id);
if (c instanceof AbstractTextComponent)
{
- return ((AbstractTextComponent<?>)c).getValue();
+ return ((AbstractTextComponent)c).getValue();
}
return null;
}
@@ -506,7 +506,7 @@
public void select(String formComponentId, int index)
{
checkClosed();
- FormComponent<?> component = (FormComponent<?>)workingForm.get(formComponentId);
+ FormComponent component = (FormComponent)workingForm.get(formComponentId);
ChoiceSelector choiceSelector = choiceSelectorFactory.create(component);
choiceSelector.doSelect(index);
@@ -547,7 +547,7 @@
{
checkClosed();
- ChoiceSelector choiceSelector = choiceSelectorFactory.createForMultiple((FormComponent<?>)workingForm.get(formComponentId));
+ ChoiceSelector choiceSelector = choiceSelectorFactory.createForMultiple((FormComponent)workingForm.get(formComponentId));
for (int i = 0; i < indexes.length; i++)
{
@@ -568,14 +568,14 @@
{
checkClosed();
- Component<?> component = workingForm.get(formComponentId);
+ Component component = workingForm.get(formComponentId);
if (component instanceof IFormSubmittingComponent)
{
setFormSubmittingComponentValue((IFormSubmittingComponent)component, value);
}
else if (component instanceof FormComponent)
{
- setFormComponentValue((FormComponent<?>)component, value);
+ setFormComponentValue((FormComponent)component, value);
}
}
@@ -595,7 +595,7 @@
{
checkClosed();
- FormComponent<?> formComponent = (FormComponent<?>)workingForm.get(formComponentId);
+ FormComponent formComponent = (FormComponent)workingForm.get(formComponentId);
if (formComponent instanceof FileUploadField == false)
{
@@ -681,7 +681,7 @@
* @param value
* a value to add
*/
- private void addFormComponentValue(FormComponent<?> formComponent, String value)
+ private void addFormComponentValue(FormComponent formComponent, String value)
{
if (parameterExist(formComponent))
{
@@ -720,7 +720,7 @@
* a <code>FormComponent</code>
* @return <code>true</code> if the parameter exists in the <code>FormComponent</code>
*/
- private boolean parameterExist(FormComponent<?> formComponent)
+ private boolean parameterExist(FormComponent formComponent)
{
String parameter = baseWicketTester.getServletRequest().getParameter(
formComponent.getInputName());
@@ -735,7 +735,7 @@
* @param value
* a value to add
*/
- private void setFormComponentValue(FormComponent<?> formComponent, String value)
+ private void setFormComponentValue(FormComponent formComponent, String value)
{
baseWicketTester.getServletRequest().setParameter(formComponent.getInputName(), value);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Fri Jun 6 18:11:06 2008
@@ -161,7 +161,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return DummyHomePage.class;
}
@@ -262,7 +262,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return homePage;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java Fri Jun 6 18:11:06 2008
@@ -48,5 +48,5 @@
* @param component
* a <code>Component</code> to which the validator was just added
*/
- void onAdded(Component<?> component);
+ void onAdded(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java Fri Jun 6 18:11:06 2008
@@ -227,7 +227,7 @@
* FIXME 2.0: remove asap
*/
@Deprecated
- protected final Map<String, Object> messageModel(final FormComponent<?> formComponent)
+ protected final Map<String, Object> messageModel(final FormComponent formComponent)
{
throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC");
}
@@ -250,7 +250,7 @@
*
*/
@Deprecated
- protected final String resourceKey(final FormComponent<?> formComponent)
+ protected final String resourceKey(final FormComponent formComponent)
{
throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC");
}
@@ -276,7 +276,7 @@
* FIXME 2.0: remove asap
*/
@Deprecated
- public final void validate(final FormComponent<?> component)
+ public final void validate(final FormComponent component)
{
throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC");
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java Fri Jun 6 18:11:06 2008
@@ -68,7 +68,7 @@
* @param component
* the <code>Component</code> that was added
*/
- void componentAdded(Component<?> component);
+ void componentAdded(Component component);
/**
* Indicates that the model for the given <code>Component</code> is about to change.
@@ -76,7 +76,7 @@
* @param component
* the <code>Component</code> whose model is about to change
*/
- void componentModelChanging(Component<?> component);
+ void componentModelChanging(Component component);
/**
* Indicates an internal state for the given <code>Component</code> is about to change.
@@ -92,7 +92,7 @@
* @param component
* the <code>Component</code> that was removed
*/
- void componentRemoved(Component<?> component);
+ void componentRemoved(Component component);
/**
* Called when changes to the <code>Page</code> have ended.
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Add.java Fri Jun 6 18:11:06 2008
@@ -36,7 +36,7 @@
private static final Logger log = LoggerFactory.getLogger(Add.class);
/** the subject <code>Component</code> */
- private final Component<?> component;
+ private final Component component;
/**
* Constructor.
@@ -44,7 +44,7 @@
* @param component
* the subject <code>Component</code>
*/
- Add(final Component<?> component)
+ Add(final Component component)
{
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java Fri Jun 6 18:11:06 2008
@@ -47,7 +47,7 @@
* @param component
* the <code>Component</code> that was added
*/
- void componentAdded(Component<?> component)
+ void componentAdded(Component component)
{
changes.add(new Add(component));
}
@@ -61,7 +61,7 @@
* @param component
* the <code>Component</code> for which the <code>IModel</code> changed
*/
- <T> void componentModelChanging(Component<T> component)
+ <T> void componentModelChanging(Component component)
{
changes.add(new ModelChange<T>(component));
}
@@ -88,7 +88,7 @@
* @param component
* the <code>Component</code> that was removed
*/
- void componentRemoved(Component<?> component)
+ void componentRemoved(Component component)
{
changes.add(new Remove(component));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java Fri Jun 6 18:11:06 2008
@@ -42,7 +42,7 @@
private static final Logger log = LoggerFactory.getLogger(ModelChange.class);
/** the subject <code>Component</code> */
- private final Component<T> component;
+ private final Component component;
/** the original <code>IModel</code> */
private IModel<T> originalModel;
@@ -54,7 +54,7 @@
* the subject <code>Component</code>
*/
@SuppressWarnings("unchecked")
- ModelChange(final Component<T> component)
+ ModelChange(final Component component)
{
if (component == null)
{
@@ -79,7 +79,7 @@
if (component instanceof FormComponent)
{
// and it's using the same model as the form
- if (((FormComponent<T>)component).getForm().getModel() == model)
+ if (((FormComponent)component).getForm().getModel() == model)
{
// we don't need to clone the model, because it will
// be re-initialized using initModel()
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java Fri Jun 6 18:11:06 2008
@@ -37,10 +37,10 @@
private static final Logger log = LoggerFactory.getLogger(Remove.class);
/** the subject <code>Component</code> */
- private final Component<?> component;
+ private final Component component;
/** the parent <code>MarkupContainer</code> */
- private final MarkupContainer<?> container;
+ private final MarkupContainer container;
/**
* Constructor.
@@ -48,7 +48,7 @@
* @param component
* the subject <code>Component</code>
*/
- Remove(final Component<?> component)
+ Remove(final Component component)
{
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java Fri Jun 6 18:11:06 2008
@@ -112,7 +112,7 @@
/**
* @see IPageVersionManager#componentAdded(Component)
*/
- public void componentAdded(Component<?> component)
+ public void componentAdded(Component component)
{
changeList.componentAdded(component);
}
@@ -120,7 +120,7 @@
/**
* @see IPageVersionManager#componentModelChanging(Component)
*/
- public void componentModelChanging(Component<?> component)
+ public void componentModelChanging(Component component)
{
changeList.componentModelChanging(component);
}
@@ -128,7 +128,7 @@
/**
* @see IPageVersionManager#componentRemoved(Component)
*/
- public void componentRemoved(Component<?> component)
+ public void componentRemoved(Component component)
{
changeList.componentRemoved(component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Fri Jun 6 18:11:06 2008
@@ -117,7 +117,7 @@
* @param filename
* @throws Exception
*/
- protected void executedListener(final Class<?> clazz, final Component<?> component,
+ protected void executedListener(final Class<?> clazz, final Component component,
final String filename) throws Exception
{
assertNotNull(component);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java Fri Jun 6 18:11:06 2008
@@ -43,7 +43,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
if (action == Component.ENABLE && component.getId().endsWith("disabled"))
return false;
@@ -54,7 +54,7 @@
*
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass)
+ public <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
return true;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java Fri Jun 6 18:11:06 2008
@@ -32,11 +32,11 @@
*/
public AjaxHeaderContributionPage()
{
- final Component<?> test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
+ final Component test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
add(test1);
- final Component<?> test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
+ final Component test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
add(test2);
- final Component<?> test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
+ final Component test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
add(test3);
add(new AjaxFallbackLink<Void>("link")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java Fri Jun 6 18:11:06 2008
@@ -32,18 +32,18 @@
*/
public AjaxHeaderContributionPage2()
{
- final Component<?> test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
+ final Component test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
add(test1);
- final Component<?> test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
+ final Component test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
add(test2);
- final Component<?> test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
+ final Component test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
add(test3);
- final Component<?> btest1 = new AjaxHeaderContribution2("btest1").setOutputMarkupId(true);
+ final Component btest1 = new AjaxHeaderContribution2("btest1").setOutputMarkupId(true);
add(btest1);
- final Component<?> btest2 = new AjaxHeaderContribution2("btest2").setOutputMarkupId(true);
+ final Component btest2 = new AjaxHeaderContribution2("btest2").setOutputMarkupId(true);
add(btest2);
- final Component<?> btest3 = new AjaxHeaderContribution2("btest3").setOutputMarkupId(true);
+ final Component btest3 = new AjaxHeaderContribution2("btest3").setOutputMarkupId(true);
add(btest3);
add(new AjaxFallbackLink<Void>("link")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java Fri Jun 6 18:11:06 2008
@@ -77,13 +77,13 @@
executeHeaderTest(MockComponent3.class, "MockComponent3-expected.html");
}
- private <C extends Component<?>> void executeHeaderTest(final Class<C> componentClass)
+ private <C extends Component> void executeHeaderTest(final Class<C> componentClass)
throws IOException
{
executeHeaderTest(componentClass, null);
}
- private <C extends Component<?>> void executeHeaderTest(final Class<C> componentClass,
+ private <C extends Component> void executeHeaderTest(final Class<C> componentClass,
String expectedFile) throws IOException
{
final MockPageWithLinkAndComponent page = new MockPageWithLinkAndComponent();
@@ -101,9 +101,9 @@
// Create an instance of the component
try
{
- Constructor<? extends Component<?>> con = componentClass.getConstructor(new Class[] { String.class });
+ Constructor<? extends Component> con = componentClass.getConstructor(new Class[] { String.class });
- Component<?> comp = con.newInstance(new Object[] { MockPageWithLinkAndComponent.COMPONENT_ID });
+ Component comp = con.newInstance(new Object[] { MockPageWithLinkAndComponent.COMPONENT_ID });
page.replace(comp);
comp.setOutputMarkupId(true);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java Fri Jun 6 18:11:06 2008
@@ -73,7 +73,7 @@
@Override
public void onClick(AjaxRequestTarget target)
{
- WebMarkupContainer<?> wmc = new WebMarkupContainer<Void>(
+ WebMarkupContainer wmc = new WebMarkupContainer<Void>(
MockPageWithLinkAndComponent.COMPONENT_ID);
wmc.setOutputMarkupId(true);
wmc.add(timer);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java Fri Jun 6 18:11:06 2008
@@ -61,16 +61,16 @@
}
});
- WebMarkupContainer<?> cont1 = new WebMarkupContainer<Void>("cont1");
+ WebMarkupContainer cont1 = new WebMarkupContainer<Void>("cont1");
add(cont1);
cont1.add(new ScopedLabel("localscoped", "Local Scoped"));
cont1.add(new Label<String>("local", "Local"));
- WebMarkupContainer<?> cont11 = new WebMarkupContainer<Void>("cont11");
+ WebMarkupContainer cont11 = new WebMarkupContainer<Void>("cont11");
cont1.add(cont11);
cont11.add(new Label<String>("global", " hide global"));
- WebMarkupContainer<?> cont2 = new WebMarkupContainer<Void>("cont2");
+ WebMarkupContainer cont2 = new WebMarkupContainer<Void>("cont2");
add(cont2);
cont2.add(new Label<String>("local", "Local2"));
cont2.add(new ScopedLabel("localscoped", "Local Scoped"));
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java Fri Jun 6 18:11:06 2008
@@ -58,7 +58,7 @@
Border<?> border = (Border<?>)page.get("hideable");
assertNotNull(border);
AjaxLink<?> link = (AjaxLink<?>)border.get("hideLink");
- WebMarkupContainer<?> wrapper = (WebMarkupContainer<?>)border.get("wrapper");
+ WebMarkupContainer wrapper = (WebMarkupContainer)border.get("wrapper");
assertNotNull(link);
tester.clickLink("hideable:hideLink");
tester.assertComponentOnAjaxResponse(wrapper);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java Fri Jun 6 18:11:06 2008
@@ -37,7 +37,7 @@
public HideableBorder(String name)
{
super(name);
- final WebMarkupContainer<?> containerWrapper = new WebMarkupContainer<Void>("wrapper");
+ final WebMarkupContainer containerWrapper = new WebMarkupContainer<Void>("wrapper");
add(containerWrapper);
containerWrapper.add(getBodyContainer());
add(new AjaxLink<Void>("hideLink")
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java Fri Jun 6 18:11:06 2008
@@ -47,7 +47,7 @@
Form<?> form = new Form<Void>("form");
CheckGroup<String> group = new CheckGroup<String>("group", new Model((Serializable)list));
- WebMarkupContainer<?> container = new WebMarkupContainer<Void>("container");
+ WebMarkupContainer container = new WebMarkupContainer<Void>("container");
Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java Fri Jun 6 18:11:06 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java Fri Jun 6 18:11:06 2008
@@ -166,7 +166,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return MockHomePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java Fri Jun 6 18:11:06 2008
@@ -75,7 +75,7 @@
}
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return ConcretePage2.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java Fri Jun 6 18:11:06 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java Fri Jun 6 18:11:06 2008
@@ -63,7 +63,7 @@
{
private static final long serialVersionUID = 1L;
- private final WebMarkupContainer<?> nextContainer;
+ private final WebMarkupContainer nextContainer;
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java Fri Jun 6 18:11:06 2008
@@ -55,7 +55,7 @@
* @param container
* @param id
*/
- public void addFragment(WebMarkupContainer<?> container, String id)
+ public void addFragment(WebMarkupContainer container, String id)
{
Fragment<?> fragment = new Fragment<Void>(id, "fragment", this);
fragmentContent = new Label<String>("fragmentContent", "foo");
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java Fri Jun 6 18:11:06 2008
@@ -47,17 +47,17 @@
{
add(new Label<String>("myLabel", "Test Label"));
- MarkupContainer<?> container = new NoopOutputTransformerContainer<Void>("test");
+ MarkupContainer container = new NoopOutputTransformerContainer<Void>("test");
add(container);
container.add(new Label<String>("myLabel2", "Test Label2"));
- MarkupContainer<?> panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
+ MarkupContainer panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// replace the generated String
return "Whatever";
@@ -69,12 +69,12 @@
panel.setRenderBodyOnly(true);
panelContainer.add(panel);
- MarkupContainer<?> borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
+ MarkupContainer borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// Convert all text to uppercase
return output.toString().toUpperCase();
@@ -85,7 +85,7 @@
Border<?> border = new SimpleBorder("myBorder");
borderContainer.add(border);
- MarkupContainer<?> xsltContainer = new XsltOutputTransformerContainer<Void>("test4");
+ MarkupContainer xsltContainer = new XsltOutputTransformerContainer<Void>("test4");
add(xsltContainer);
Border<?> border2 = new SimpleBorder("myBorder2");
@@ -93,7 +93,7 @@
border2.add(new AttributeModifier("testAttr", true, new Model<String>("myValue")));
xsltContainer.add(border2);
- MarkupContainer<?> xsltContainer2 = new XsltOutputTransformerContainer<Void>("test5", null,
+ MarkupContainer xsltContainer2 = new XsltOutputTransformerContainer<Void>("test5", null,
"org/apache/wicket/markup/outputTransformer/anyName.xsl");
add(xsltContainer2);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java Fri Jun 6 18:11:06 2008
@@ -47,17 +47,17 @@
{
add(new Label<String>("myLabel", "Test Label"));
- MarkupContainer<?> container = new NoopOutputTransformerContainer<Void>("test");
+ MarkupContainer container = new NoopOutputTransformerContainer<Void>("test");
add(container);
container.add(new Label<String>("myLabel2", "Test Label2"));
- MarkupContainer<?> panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
+ MarkupContainer panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// replace the generated String
return "Whatever";
@@ -69,12 +69,12 @@
panel.setRenderBodyOnly(true);
panelContainer.add(panel);
- MarkupContainer<?> borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
+ MarkupContainer borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// Convert all text to uppercase
return output.toString().toUpperCase();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Fri Jun 6 18:11:06 2008
@@ -118,7 +118,7 @@
innerPOJO + "]:bindings=[]";
assertEquals(expected, pojoProperty.toString());
- Component<?> component1 = pojoProperty.bind(new Label<Object>("label"));
+ Component component1 = pojoProperty.bind(new Label<Object>("label"));
expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" +
innerPOJO + "]:bindings=[Binding(:component=[" + component1 + "]:expression=[label])]";
assertEquals(expected, pojoProperty.toString());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java Fri Jun 6 18:11:06 2008
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Fri Jun 6 18:11:06 2008
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Fri Jun 6 18:11:06 2008
@@ -50,12 +50,12 @@
private boolean block = true;
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
- public <T extends Component<?>> boolean isInstantiationAuthorized(
+ public <T extends Component> boolean isInstantiationAuthorized(
Class<T> componentClass)
{
if (block &&
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Fri Jun 6 18:11:06 2008
@@ -33,7 +33,7 @@
public class DummyApplication extends WebApplication
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Fri Jun 6 18:11:06 2008
@@ -46,7 +46,7 @@
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java Fri Jun 6 18:11:06 2008
@@ -161,7 +161,7 @@
public void setRememberMe(boolean rememberMe)
{
this.rememberMe = rememberMe;
- ((FormComponent<?>)get("username")).setPersistent(rememberMe);
+ ((FormComponent)get("username")).setPersistent(rememberMe);
}
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java Fri Jun 6 18:11:06 2008
@@ -81,7 +81,7 @@
WebApplication app = new WebApplication()
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Fri Jun 6 18:11:06 2008
@@ -59,7 +59,7 @@
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Fri Jun 6 18:11:06 2008
@@ -562,7 +562,7 @@
public void testToggleButtonEnabledState()
{
tester.startPage(MockFormPage.class);
- Component<?> submit = tester.getComponentFromLastRenderedPage("form:submit");
+ Component submit = tester.getComponentFromLastRenderedPage("form:submit");
assertTrue(submit.isEnabled());
tester.createRequestCycle();
submit.setEnabled(false);