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 [3/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/MarkupContainer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Fri Jun 6 18:11:06 2008
@@ -84,7 +84,7 @@
* @param <T>
* The model object type
*/
-public abstract class MarkupContainer<T> extends Component<T>
+public abstract class MarkupContainer extends Component
{
private static final long serialVersionUID = 1L;
@@ -111,7 +111,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public MarkupContainer(final String id, IModel<T> model)
+ public MarkupContainer(final String id, IModel<?> model)
{
super(id, model);
}
@@ -125,9 +125,9 @@
* Thrown if a child with the same id is replaced by the add operation.
* @return This
*/
- public final MarkupContainer<T> add(final Component<?>... childs)
+ public final MarkupContainer add(final Component... childs)
{
- for (Component<?> child : childs)
+ for (Component child : childs)
{
checkHierarchyChange(child);
@@ -162,9 +162,9 @@
* The child(s) to be added or replaced
* @return This
*/
- public final MarkupContainer<T> addOrReplace(final Component<?>... childs)
+ public final MarkupContainer addOrReplace(final Component... childs)
{
- for (Component<?> child : childs)
+ for (Component child : childs)
{
checkHierarchyChange(child);
@@ -206,7 +206,7 @@
* stream to be used to render the component.
* @return True, if component has been added
*/
- public final boolean autoAdd(final Component<?> component, final MarkupStream markupStream)
+ public final boolean autoAdd(final Component component, final MarkupStream markupStream)
{
if (component == null)
{
@@ -250,7 +250,7 @@
* @deprecated since 1.3 Please use {@link #autoAdd(Component, MarkupStream)} instead
*/
@Deprecated
- public final boolean autoAdd(final Component<?> component)
+ public final boolean autoAdd(final Component component)
{
return autoAdd(component, null);
}
@@ -262,7 +262,7 @@
* True if all descendents should be considered
* @return True if the component is contained in this container
*/
- public final boolean contains(final Component<?> component, final boolean recurse)
+ public final boolean contains(final Component component, final boolean recurse)
{
if (component == null)
{
@@ -272,10 +272,10 @@
if (recurse)
{
// Start at component and continue while we're not out of parents
- for (Component<?> current = component; current != null;)
+ for (Component current = component; current != null;)
{
// Get parent
- final MarkupContainer<?> parent = current.getParent();
+ final MarkupContainer parent = current.getParent();
// If this container is the parent, then the component is
// recursively contained by this container
@@ -307,7 +307,7 @@
* @return The component at the path
*/
@Override
- public final Component<?> get(final String path)
+ public final Component get(final String path)
{
// Reference to this container
if (path == null || path.trim().equals(""))
@@ -319,7 +319,7 @@
final String id = Strings.firstPathComponent(path, Component.PATH_SEPARATOR);
// Get child by id
- Component<?> child = children_get(id);
+ Component child = children_get(id);
// If the container is transparent, than ask its parent.
// ParentResolver does something quite similar, but because of <head>,
@@ -409,7 +409,7 @@
* @throws IllegalArgumentException
* Thrown if a child with the same id is replaced by the add operation.
*/
- public void internalAdd(final Component<?> child)
+ public void internalAdd(final Component child)
{
if (log.isDebugEnabled())
{
@@ -438,9 +438,9 @@
/**
* @return Iterator that iterates through children in the order they were added
*/
- public final Iterator<Component<?>> iterator()
+ public final Iterator<Component> iterator()
{
- return new Iterator<Component<?>>()
+ return new Iterator<Component>()
{
int index = 0;
@@ -449,14 +449,14 @@
return index < children_size();
}
- public Component<?> next()
+ public Component next()
{
return children_get(index++);
}
public void remove()
{
- final Component<?> removed = children_remove(--index);
+ final Component removed = children_remove(--index);
checkHierarchyChange(removed);
removedComponent(removed);
}
@@ -469,9 +469,9 @@
* @return Iterator that iterates over children in the order specified by comparator
*/
@SuppressWarnings("unchecked")
- public final Iterator<Component<?>> iterator(Comparator<Component<?>> comparator)
+ public final Iterator<Component> iterator(Comparator<Component> comparator)
{
- final List<Component<?>> sorted;
+ final List<Component> sorted;
if (children == null)
{
sorted = Collections.emptyList();
@@ -480,8 +480,8 @@
{
if (children instanceof Component)
{
- sorted = new ArrayList<Component<?>>(1);
- sorted.add((Component<?>)children);
+ sorted = new ArrayList<Component>(1);
+ sorted.add((Component)children);
}
else if (children instanceof ChildList)
{
@@ -489,7 +489,7 @@
}
else
{
- sorted = Arrays.asList((Component<?>[])children);
+ sorted = Arrays.asList((Component[])children);
}
}
Collections.sort(sorted, comparator);
@@ -507,7 +507,7 @@
* throws an {@link IllegalStateException}
*/
// TODO remove after release 1.3.0
- public final <C extends Component<?>> IResourceStream newMarkupResourceStream(
+ public final <C extends Component> IResourceStream newMarkupResourceStream(
Class<C> containerClass)
{
throw new IllegalStateException(
@@ -518,7 +518,7 @@
* @param component
* Component to remove from this container
*/
- public void remove(final Component<?> component)
+ public void remove(final Component component)
{
checkHierarchyChange(component);
@@ -544,7 +544,7 @@
throw new IllegalArgumentException("argument id may not be null");
}
- final Component<?> component = get(id);
+ final Component component = get(id);
if (component != null)
{
remove(component);
@@ -587,7 +587,7 @@
for (int i = 0; i < size; i++)
{
// Get next child
- final Component<?> child = children_get(i);
+ final Component child = children_get(i);
child.setParent(MarkupContainer.this);
}
}
@@ -601,7 +601,7 @@
if (childObject instanceof Component)
{
// Get next child
- final Component<?> child = (Component<?>)childObject;
+ final Component child = (Component)childObject;
// Do not call remove() because the state change would than be
// recorded twice.
@@ -682,7 +682,7 @@
* Thrown if there was no child with the same id.
* @return This
*/
- public final MarkupContainer<T> replace(final Component<?> child)
+ public final MarkupContainer replace(final Component child)
{
checkHierarchyChange(child);
@@ -699,7 +699,7 @@
if (child.getParent() != this)
{
// Add to map
- final Component<?> replaced = put(child);
+ final Component replaced = put(child);
// Look up to make sure it was already in the map
if (replaced == null)
@@ -729,15 +729,15 @@
* @see org.apache.wicket.Component#setModel(org.apache.wicket.model.IModel)
*/
@Override
- public MarkupContainer<T> setModel(final IModel<T> model)
+ public MarkupContainer setModel(final IModel<?> model)
{
final IModel<?> previous = getModelImpl();
super.setModel(model);
if (previous instanceof IComponentInheritedModel)
{
- visitChildren(new IVisitor<Component<?>>()
+ visitChildren(new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
IModel<?> compModel = component.getModel();
if (compModel instanceof IWrapModel)
@@ -806,7 +806,7 @@
for (int i = 0; i < size; i++)
{
// Get next child
- final Component<?> child = children_get(i);
+ final Component child = children_get(i);
if (i != 0)
{
buffer.append(' ');
@@ -836,7 +836,7 @@
* @return The return value from a visitor which halted the traversal, or null if the entire
* traversal occurred
*/
- public final <S extends Component<?>> Object visitChildren(final Class<?> clazz,
+ public final <S extends Component> Object visitChildren(final Class<?> clazz,
final IVisitor<S> visitor)
{
@@ -849,7 +849,7 @@
for (int i = 0; i < children_size(); i++)
{
// Get next child component
- final Component<?> child = children_get(i);
+ final Component child = children_get(i);
Object value = null;
// Is the child of the correct class (or was no class specified)?
@@ -873,7 +873,7 @@
(value != IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER))
{
// visit the children in the container
- value = ((MarkupContainer<?>)child).visitChildren(clazz, visitor);
+ value = ((MarkupContainer)child).visitChildren(clazz, visitor);
// If visitor returns a non-null value, it halts the traversal
if ((value != IVisitor.CONTINUE_TRAVERSAL) &&
@@ -896,7 +896,7 @@
* @return The return value from a visitor which halted the traversal, or null if the entire
* traversal occurred
*/
- public final Object visitChildren(final IVisitor<Component<?>> visitor)
+ public final Object visitChildren(final IVisitor<Component> visitor)
{
return visitChildren(null, visitor);
}
@@ -905,7 +905,7 @@
* @param component
* Component being added
*/
- private final void addedComponent(final Component<?> component)
+ private final void addedComponent(final Component component)
{
// Check for degenerate case
if (component == this)
@@ -913,7 +913,7 @@
throw new IllegalArgumentException("Component can't be added to itself");
}
- MarkupContainer<?> parent = component.getParent();
+ MarkupContainer parent = component.getParent();
if (parent != null)
{
parent.remove(component);
@@ -949,7 +949,7 @@
* @param child
* Child to add
*/
- private final void children_add(final Component<?> child)
+ private final void children_add(final Component child)
{
if (children == null)
{
@@ -971,9 +971,9 @@
* @param index
* @return The child component
*/
- private final Component<?> children_get(int index)
+ private final Component children_get(int index)
{
- return (Component<?>)children_get(index, true);
+ return (Component)children_get(index, true);
}
/**
@@ -987,7 +987,7 @@
* @param index
* @return The object directly or the reconstructed component
*/
- private final Object postprocess(Object object, boolean reconstruct, MarkupContainer<?> parent,
+ private final Object postprocess(Object object, boolean reconstruct, MarkupContainer parent,
int index)
{
if (reconstruct && object instanceof ComponentSourceEntry)
@@ -1053,7 +1053,7 @@
{
if (object instanceof Component)
{
- return ((Component<?>)object).getId();
+ return ((Component)object).getId();
}
else if (object instanceof ComponentSourceEntry)
{
@@ -1070,18 +1070,18 @@
* @param id
* @return The child component
*/
- private final Component<?> children_get(final String id)
+ private final Component children_get(final String id)
{
if (children == null)
{
return null;
}
- Component<?> component = null;
+ Component component = null;
if ((children instanceof Object[] == false) && (children instanceof List == false))
{
if (getId(children).equals(id))
{
- component = (Component<?>)postprocess(children, true, this, 0);
+ component = (Component)postprocess(children, true, this, 0);
if (children != component)
{
children = component;
@@ -1106,7 +1106,7 @@
{
if (getId(children[i]).equals(id))
{
- component = (Component<?>)postprocess(children[i], true, this, i);
+ component = (Component)postprocess(children[i], true, this, i);
if (children[i] != component)
{
children[i] = component;
@@ -1123,7 +1123,7 @@
* @param child
* @return The index of the given child component
*/
- private final int children_indexOf(Component<?> child)
+ private final int children_indexOf(Component child)
{
if (children == null)
{
@@ -1167,7 +1167,7 @@
* @param component
* @return The component that is removed.
*/
- private final Component<?> children_remove(Component<?> component)
+ private final Component children_remove(Component component)
{
int index = children_indexOf(component);
if (index != -1)
@@ -1182,7 +1182,7 @@
* @param index
* @return The component that is removed
*/
- private final Component<?> children_remove(int index)
+ private final Component children_remove(int index)
{
if (children == null)
return null;
@@ -1191,7 +1191,7 @@
{
if (index == 0)
{
- final Component<?> removed = (Component<?>)postprocess(children, true, null, -1);
+ final Component removed = (Component)postprocess(children, true, null, -1);
children = null;
return removed;
}
@@ -1220,7 +1220,7 @@
{
throw new IndexOutOfBoundsException();
}
- return (Component<?>)postprocess(removed, true, null, -1);
+ return (Component)postprocess(removed, true, null, -1);
}
children = new ChildList(children);
}
@@ -1231,7 +1231,7 @@
{
children = lst.get(0);
}
- return (Component<?>)postprocess(removed, true, null, -1);
+ return (Component)postprocess(removed, true, null, -1);
}
}
@@ -1279,9 +1279,9 @@
* @param child
* @return The component that is replaced
*/
- private final Component<?> children_set(int index, Component<?> child)
+ private final Component children_set(int index, Component child)
{
- return (Component<?>)children_set(index, child, true);
+ return (Component)children_set(index, child, true);
}
/**
@@ -1315,7 +1315,7 @@
* The child to put into the map
* @return Any component that was replaced
*/
- private final Component<?> put(final Component<?> child)
+ private final Component put(final Component child)
{
int index = children_indexOf(child);
if (index == -1)
@@ -1333,7 +1333,7 @@
* @param component
* Component being removed
*/
- private final void removedComponent(final Component<?> component)
+ private final void removedComponent(final Component component)
{
// Notify Page that component is being removed
final Page<?> page = component.findPage();
@@ -1369,7 +1369,7 @@
final String id = tag.getId();
// Get the component for the id from the given container
- final Component<?> component = get(id);
+ final Component component = get(id);
// Failed to find it?
if (component != null)
@@ -1380,7 +1380,7 @@
{
// 2rd try: Components like Border and Panel might implement
// the ComponentResolver interface as well.
- MarkupContainer<?> container = this;
+ MarkupContainer container = this;
while (container != null)
{
if (container instanceof IComponentResolver)
@@ -1449,7 +1449,7 @@
protected final MarkupStream findMarkupStream()
{
// Start here
- MarkupContainer<?> c = this;
+ MarkupContainer c = this;
// Walk up hierarchy until markup found
while (c.getMarkupStream() == null)
@@ -1583,7 +1583,7 @@
*/
private static class ComponentSourceEntry extends org.apache.wicket.ComponentSourceEntry
{
- private ComponentSourceEntry(MarkupContainer<?> container, Component<?> component,
+ private ComponentSourceEntry(MarkupContainer container, Component component,
IComponentSource componentSource)
{
super(container, component, componentSource);
@@ -1592,7 +1592,7 @@
private static final long serialVersionUID = 1L;
@Override
- protected void setChild(MarkupContainer<?> parent, int index, Component<?> child)
+ protected void setChild(MarkupContainer parent, int index, Component child)
{
parent.children_set(index, child, false);
}
@@ -1612,7 +1612,7 @@
Object child = children_get(i, false);
if (child instanceof Component)
{
- Component<?> component = (Component<?>)child;
+ Component component = (Component)child;
component.detach();
if (child instanceof IComponentSourceProvider)
@@ -1647,7 +1647,7 @@
final int size = children_size();
for (int i = 0; i < size; i++)
{
- final Component<?> child = children_get(i);
+ final Component child = children_get(i);
child.internalMarkRendering();
}
}
@@ -1655,10 +1655,10 @@
/**
* @return a copy of the children array.
*/
- private Component<?>[] copyChildren()
+ private Component[] copyChildren()
{
int size = children_size();
- Component<?> result[] = new Component[size];
+ Component result[] = new Component[size];
for (int i = 0; i < size; ++i)
{
result[i] = children_get(i);
@@ -1677,14 +1677,14 @@
// We need to copy the children list because the children components can
// modify the hierarchy in their onBeforeRender.
- Component<?>[] children = copyChildren();
+ Component[] children = copyChildren();
try
{
// Loop through child components
for (int i = 0; i < children.length; i++)
{
// Get next child
- final Component<?> child = children[i];
+ final Component child = children[i];
// Call begin request on the child
// We need to check whether the child's wasn't removed from the
@@ -1718,11 +1718,11 @@
void onAfterRenderChildren()
{
// Loop through child components
- final Iterator<Component<?>> iter = iterator();
+ final Iterator<Component> iter = iterator();
while (iter.hasNext())
{
// Get next child
- final Component<?> child = iter.next();
+ final Component child = iter.next();
// Call end request on the child
child.afterRender();
@@ -1746,9 +1746,9 @@
{
super.setRenderAllowed();
- visitChildren(new IVisitor<Component<?>>()
+ visitChildren(new IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
// Find out if this component can be rendered
final boolean renderAllowed = component.isActionAuthorized(RENDER);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupFragmentFinder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupFragmentFinder.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupFragmentFinder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupFragmentFinder.java Fri Jun 6 18:11:06 2008
@@ -45,10 +45,10 @@
* @param component
* @return A MarkupStream which is positioned at the component
*/
- final MarkupStream find(final Component<?> component)
+ final MarkupStream find(final Component component)
{
// Get the parent's associated markup stream.
- MarkupContainer<?> parentWithAssociatedMarkup = component.findParentWithAssociatedMarkup();
+ MarkupContainer parentWithAssociatedMarkup = component.findParentWithAssociatedMarkup();
MarkupStream markupStream = null;
// Might be that we have to walk up the component hierarchy
@@ -82,7 +82,7 @@
else
{
// WICKET-1560
- Component<?> parent = component.getParent();
+ Component parent = component.getParent();
if (parent instanceof AbstractRepeater && id != null &&
id.equals(parent.getId()))
{
@@ -141,8 +141,8 @@
* @param parentWithAssociatedMarkup
* @return the relative path
*/
- private String getComponentRelativePath(final Component<?> component,
- final MarkupContainer<?> parentWithAssociatedMarkup)
+ private String getComponentRelativePath(final Component component,
+ final MarkupContainer parentWithAssociatedMarkup)
{
final String componentPath = component.getParent().getPageRelativePath();
final String parentWithAssociatedMarkupPath = parentWithAssociatedMarkup.getPageRelativePath();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java Fri Jun 6 18:11:06 2008
@@ -123,7 +123,7 @@
* @param <T>
* The model object type
*/
-public abstract class Page<T> extends MarkupContainer<T>
+public abstract class Page<T> extends MarkupContainer
implements
IRedirectListener,
IPageMapEntry
@@ -218,7 +218,7 @@
private String pageMapName;
/** Set of components that rendered if component use checking is enabled */
- private transient Set<Component<?>> renderedComponents;
+ private transient Set<Component> renderedComponents;
/**
* Boolean if the page is stateless, so it doesn't have to be in the page map, will be set in
@@ -347,7 +347,7 @@
// IComponentInstantiationListener
// that forwards to IAuthorizationStrategy for RequestListenerInterface
// invocations.
- public void afterCallComponent(final Component<?> component,
+ public void afterCallComponent(final Component component,
final RequestListenerInterface listener)
{
}
@@ -368,7 +368,7 @@
// IComponentInstantiationListener
// that forwards to IAuthorizationStrategy for RequestListenerInterface
// invocations.
- public void beforeCallComponent(final Component<?> component,
+ public void beforeCallComponent(final Component component,
final RequestListenerInterface listener)
{
}
@@ -379,14 +379,14 @@
* @param component
* The component that was rendered
*/
- public final void componentRendered(final Component<?> component)
+ public final void componentRendered(final Component component)
{
// Inform the page that this component rendered
if (Application.get().getDebugSettings().getComponentUseCheck())
{
if (renderedComponents == null)
{
- renderedComponents = new HashSet<Component<?>>();
+ renderedComponents = new HashSet<Component>();
}
if (renderedComponents.add(component) == false)
{
@@ -427,11 +427,11 @@
* @param component
*
*/
- public final void endComponentRender(Component<?> component)
+ public final void endComponentRender(Component component)
{
if (component instanceof MarkupContainer)
{
- checkRendering((MarkupContainer<?>)component);
+ checkRendering((MarkupContainer)component);
}
else
{
@@ -642,12 +642,12 @@
{
final StringBuffer buffer = new StringBuffer();
buffer.append("Page " + getId() + " (version " + getCurrentVersionNumber() + ")");
- visitChildren(new IVisitor<Component<?>>()
+ visitChildren(new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
int levels = 0;
- for (Component<?> current = component; current != null; current = current.getParent())
+ for (Component current = component; current != null; current = current.getParent())
{
levels++;
}
@@ -761,9 +761,9 @@
if (stateless == null)
{
final Object[] returnArray = new Object[1];
- Object returnValue = visitChildren(Component.class, new IVisitor<Component<?>>()
+ Object returnValue = visitChildren(Component.class, new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (!component.isStateless())
{
@@ -830,9 +830,9 @@
}
// Visit all children which are an instance of formClass
- visitChildren(formClass, new IVisitor<Component<?>>()
+ visitChildren(formClass, new IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
// They must be of type Form as well
if (component instanceof Form)
@@ -909,9 +909,9 @@
// clean up debug meta data if component check is on
if (Application.get().getDebugSettings().getComponentUseCheck())
{
- visitChildren(new IVisitor<Component<?>>()
+ visitChildren(new IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
component.setMetaData(Component.CONSTRUCTED_AT_KEY, null);
component.setMetaData(Component.ADDED_AT_KEY, null);
@@ -991,7 +991,7 @@
* @param component
*
*/
- public final void startComponentRender(Component<?> component)
+ public final void startComponentRender(Component component)
{
renderedComponents = null;
}
@@ -1024,18 +1024,18 @@
* The page itself if it was a full page render or the container that was rendered
* standalone
*/
- private final void checkRendering(final MarkupContainer<?> renderedContainer)
+ private final void checkRendering(final MarkupContainer renderedContainer)
{
// If the application wants component uses checked and
// the response is not a redirect
final IDebugSettings debugSettings = Application.get().getDebugSettings();
if (debugSettings.getComponentUseCheck() && !getResponse().isRedirect())
{
- final List<Component<?>> unrenderedComponents = new ArrayList<Component<?>>();
+ final List<Component> unrenderedComponents = new ArrayList<Component>();
final StringBuffer buffer = new StringBuffer();
- renderedContainer.visitChildren(new IVisitor<Component<?>>()
+ renderedContainer.visitChildren(new IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
// If component never rendered
if (renderedComponents == null || !renderedComponents.contains(component))
@@ -1078,21 +1078,21 @@
// Get rid of set
renderedComponents = null;
- Iterator<Component<?>> iterator = unrenderedComponents.iterator();
+ Iterator<Component> iterator = unrenderedComponents.iterator();
while (iterator.hasNext())
{
- Component<?> component = iterator.next();
+ Component component = iterator.next();
// Now first test if the component has a sibling that is a transparent resolver.
- Iterator<Component<?>> iterator2 = component.getParent().iterator();
+ Iterator<Component> iterator2 = component.getParent().iterator();
while (iterator2.hasNext())
{
- Component<?> sibling = iterator2.next();
+ Component sibling = iterator2.next();
if (!sibling.isVisible())
{
boolean isTransparentMarkupContainer = sibling instanceof MarkupContainer &&
- ((MarkupContainer<?>)sibling).isTransparentResolver();
+ ((MarkupContainer)sibling).isTransparentResolver();
boolean isComponentResolver = sibling instanceof IComponentResolver;
if (isTransparentMarkupContainer || isComponentResolver)
{
@@ -1222,7 +1222,7 @@
* @param parent
* @return True if the change is okay to report
*/
- private final boolean mayTrackChangesFor(final Component<?> component, MarkupContainer<?> parent)
+ private final boolean mayTrackChangesFor(final Component component, MarkupContainer parent)
{
// first call the method so that people can track dirty components
componentChanged(component, parent);
@@ -1272,7 +1272,7 @@
* @param component
* @param parent
*/
- protected void componentChanged(Component<?> component, MarkupContainer<?> parent)
+ protected void componentChanged(Component component, MarkupContainer parent)
{
}
@@ -1389,9 +1389,9 @@
@Override
protected final void internalOnModelChanged()
{
- visitChildren(new Component.IVisitor<Component<?>>()
+ visitChildren(new Component.IVisitor<Component>()
{
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
// If form component is using form model
if (component.sameInnermostModel(Page.this))
@@ -1489,7 +1489,7 @@
* @param component
* The component that was added
*/
- final void componentAdded(final Component<?> component)
+ final void componentAdded(final Component component)
{
dirty();
if (mayTrackChangesFor(component, component.getParent()))
@@ -1504,7 +1504,7 @@
* @param component
* The component whose model is about to change
*/
- final void componentModelChanging(final Component<?> component)
+ final void componentModelChanging(final Component component)
{
dirty();
if (mayTrackChangesFor(component, null))
@@ -1524,7 +1524,7 @@
* @param component
* The component that was removed
*/
- final void componentRemoved(final Component<?> component)
+ final void componentRemoved(final Component component)
{
dirty();
if (mayTrackChangesFor(component, component.getParent()))
@@ -1538,7 +1538,7 @@
* @param component
* @param change
*/
- final void componentStateChanging(final Component<?> component, Change change)
+ final void componentStateChanging(final Component component, Change change)
{
dirty();
if (mayTrackChangesFor(component, null))
@@ -1554,10 +1554,10 @@
final void setFormComponentValuesFromCookies()
{
// Visit all Forms contained in the page
- visitChildren(Form.class, new Component.IVisitor<Component<?>>()
+ visitChildren(Form.class, new Component.IVisitor<Component>()
{
// For each FormComponent found on the Page (not Form)
- public Object component(final Component<?> component)
+ public Object component(final Component component)
{
((Form<?>)component).loadPersistentFormComponentValues();
return CONTINUE_TRAVERSAL;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestCycle.java Fri Jun 6 18:11:06 2008
@@ -511,7 +511,7 @@
* @param component
* to be re-rendered
*/
- public final void request(final Component<?> component)
+ public final void request(final Component component)
{
checkReuse();
@@ -797,7 +797,7 @@
* The listener interface on the component
* @return A URL that encodes a page, component, behavior and interface to call
*/
- public final CharSequence urlFor(final Component<?> component, final IBehavior behaviour,
+ public final CharSequence urlFor(final Component component, final IBehavior behaviour,
final RequestListenerInterface listener)
{
int index = component.getBehaviors().indexOf(behaviour);
@@ -838,7 +838,7 @@
* Additional parameters to pass to the page
* @return A URL that encodes a page, component and interface to call
*/
- public final CharSequence urlFor(final Component<?> component,
+ public final CharSequence urlFor(final Component component,
final RequestListenerInterface listener, ValueMap params)
{
// Get Page holding component and mark it as stateful.
@@ -934,7 +934,7 @@
* The listener interface on the component
* @return A URL that encodes a page, component and interface to call
*/
- public final CharSequence urlFor(final Component<?> component,
+ public final CharSequence urlFor(final Component component,
final RequestListenerInterface listener)
{
return urlFor(component, listener, null);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java Fri Jun 6 18:11:06 2008
@@ -164,7 +164,7 @@
* @param component
* The component
*/
- public final void invoke(final Page< ? > page, final Component< ? > component)
+ public final void invoke(final Page page, final Component component)
{
if (!component.isEnabled() || !component.isVisibleInHierarchy())
{
@@ -219,7 +219,7 @@
* Request parameters
* @return The request target
*/
- public IRequestTarget newRequestTarget(final Page< ? > page, final Component< ? > component,
+ public IRequestTarget newRequestTarget(final Page page, final Component component,
final RequestListenerInterface listener, final RequestParameters requestParameters)
{
return new ListenerInterfaceRequestTarget(page, component, listener, requestParameters);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Fri Jun 6 18:11:06 2008
@@ -275,7 +275,7 @@
return ((IAjaxIndicatorAware)this).getAjaxIndicatorMarkupId();
}
- Component< ? > parent = getComponent().getParent();
+ Component parent = getComponent().getParent();
while (parent != null)
{
if (parent instanceof IAjaxIndicatorAware)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java Fri Jun 6 18:11:06 2008
@@ -105,7 +105,7 @@
super.onComponentTag(tag);
// only add the event handler when the component is enabled.
- Component< ? > myComponent = getComponent();
+ Component myComponent = getComponent();
if (myComponent.isEnabled() && myComponent.isEnableAllowed())
{
tag.put(event, getEventHandler());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Fri Jun 6 18:11:06 2008
@@ -96,7 +96,7 @@
* javascript
*
*/
- public void onBeforeRespond(Map<String, Component<?>> map, AjaxRequestTarget target);
+ public void onBeforeRespond(Map<String, Component> map, AjaxRequestTarget target);
/**
* Triggered after ajax request target is done with its response cycle. At this point only
@@ -111,7 +111,7 @@
* @param response
* response object that can be used to output javascript
*/
- public void onAfterRespond(Map<String, Component<?>> map, IJavascriptResponse response);
+ public void onAfterRespond(Map<String, Component> map, IJavascriptResponse response);
}
/**
@@ -243,7 +243,7 @@
private final AjaxResponse encodingHeaderResponse;
/** the component instances that will be rendered */
- private final Map<String, Component<?>> markupIdToComponent = new LinkedHashMap<String, Component<?>>();
+ private final Map<String, Component> markupIdToComponent = new LinkedHashMap<String, Component>();
private final List<String> prependJavascripts = new ArrayList<String>();
@@ -304,7 +304,7 @@
* @param parent
* @param childCriteria
*/
- public final void addChildren(MarkupContainer<?> parent, Class<?> childCriteria)
+ public final void addChildren(MarkupContainer parent, Class<?> childCriteria)
{
if (parent == null)
{
@@ -317,10 +317,10 @@
Component.class.getName() + ".class` as the value for this argument");
}
- parent.visitChildren(childCriteria, new Component.IVisitor<Component<?>>()
+ parent.visitChildren(childCriteria, new Component.IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
addComponent(component);
return CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER;
@@ -334,7 +334,7 @@
* @param component
* component to be rendered
*/
- public void addComponent(Component<?> component)
+ public void addComponent(Component component)
{
if (component == null)
{
@@ -358,7 +358,7 @@
* @param component
* component to be rendered
*/
- public final void addComponent(Component<?> component, String markupId)
+ public final void addComponent(Component component, String markupId)
{
if (Strings.isEmpty(markupId))
{
@@ -402,7 +402,7 @@
* @param component
* The component to get the focus or null.
*/
- public final void focusComponent(Component<?> component)
+ public final void focusComponent(Component component)
{
if (component != null && component.getOutputMarkupId() == false)
{
@@ -437,7 +437,7 @@
// detach the page if it was updated
if (markupIdToComponent.size() > 0)
{
- final Component<?> component = markupIdToComponent.values().iterator().next();
+ final Component component = markupIdToComponent.values().iterator().next();
component.getPage().detach();
}
}
@@ -588,7 +588,7 @@
{
if (listeners != null)
{
- final Map<String, Component<?>> components = Collections.unmodifiableMap(markupIdToComponent);
+ final Map<String, Component> components = Collections.unmodifiableMap(markupIdToComponent);
Iterator<IListener> it = listeners.iterator();
while (it.hasNext())
@@ -607,7 +607,7 @@
// invoke onafterresponse event on listeners
if (listeners != null)
{
- final Map<String, Component<?>> components = Collections.unmodifiableMap(markupIdToComponent);
+ final Map<String, Component> components = Collections.unmodifiableMap(markupIdToComponent);
// create response that will be used by listeners to append
// javascript
@@ -640,11 +640,11 @@
// TODO: We might need to call prepareRender on all components upfront
// process component markup
- Iterator<Map.Entry<String, Component<?>>> it = markupIdToComponent.entrySet().iterator();
+ Iterator<Map.Entry<String, Component>> it = markupIdToComponent.entrySet().iterator();
while (it.hasNext())
{
- final Map.Entry<String, Component<?>> entry = it.next();
- final Component<?> component = entry.getValue();
+ final Map.Entry<String, Component> entry = it.next();
+ final Component component = entry.getValue();
final String markupId = entry.getKey();
respondComponent(response, markupId, component);
@@ -714,7 +714,7 @@
* component to render
*/
private void respondComponent(final Response response, final String markupId,
- final Component<?> component)
+ final Component component)
{
if (component.getRenderBodyOnly() == true)
{
@@ -980,7 +980,7 @@
* @param response
* @param component
*/
- private void respondHeaderContribution(final Response response, final Component<?> component)
+ private void respondHeaderContribution(final Response response, final Component component)
{
headerRendering = true;
@@ -1003,9 +1003,9 @@
if (component instanceof MarkupContainer)
{
- ((MarkupContainer<?>)component).visitChildren(new Component.IVisitor<Component<?>>()
+ ((MarkupContainer)component).visitChildren(new Component.IVisitor<Component>()
{
- public Object component(Component<?> component)
+ public Object component(Component component)
{
if (component.isVisible())
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java Fri Jun 6 18:11:06 2008
@@ -134,9 +134,9 @@
*
* @return FormComponent
*/
- protected final FormComponent< ? > getFormComponent()
+ protected final FormComponent getFormComponent()
{
- return (FormComponent< ? >)getComponent();
+ return (FormComponent)getComponent();
}
/**
@@ -157,7 +157,7 @@
@Override
protected final void respond(final AjaxRequestTarget target)
{
- final FormComponent< ? > formComponent = getFormComponent();
+ final FormComponent formComponent = getFormComponent();
try
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java Fri Jun 6 18:11:06 2008
@@ -81,9 +81,9 @@
*
* @return FormComponent
*/
- protected final FormComponent< ? > getFormComponent()
+ protected final FormComponent getFormComponent()
{
- return (FormComponent< ? >)getComponent();
+ return (FormComponent)getComponent();
}
/**
@@ -117,7 +117,7 @@
@Override
protected final void onEvent(final AjaxRequestTarget target)
{
- final FormComponent< ? > formComponent = getFormComponent();
+ final FormComponent formComponent = getFormComponent();
if (getEvent().toLowerCase().equals("onblur") && disableFocusOnBlur())
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java Fri Jun 6 18:11:06 2008
@@ -82,7 +82,7 @@
if (form == null)
{
// try to find form in the hierarchy of owning component
- Component< ? > component = getComponent();
+ Component component = getComponent();
form = component.findParent(Form.class);
if (form == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehavior.java Fri Jun 6 18:11:06 2008
@@ -77,9 +77,9 @@
*/
private void addFeedbackPanels(final AjaxRequestTarget target)
{
- getComponent().getPage().visitChildren(IFeedback.class, new IVisitor<Component< ? >>()
+ getComponent().getPage().visitChildren(IFeedback.class, new IVisitor<Component>()
{
- public Object component(Component< ? > component)
+ public Object component(Component component)
{
target.addComponent(component);
return IVisitor.CONTINUE_TRAVERSAL;
@@ -108,9 +108,9 @@
public static void addToAllFormComponents(final Form< ? > form, final String event,
final Duration throttleDelay)
{
- form.visitChildren(FormComponent.class, new IVisitor<Component< ? >>()
+ form.visitChildren(FormComponent.class, new IVisitor<Component>()
{
- public Object component(Component< ? > component)
+ public Object component(Component component)
{
AjaxFormValidatingBehavior behavior = new AjaxFormValidatingBehavior(form, event);
if (throttleDelay != null)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationBehavior.java Fri Jun 6 18:11:06 2008
@@ -76,7 +76,7 @@
owner.onClick(target);
// find the PagingNavigator parent of this link
- AjaxPagingNavigator navigator = (AjaxPagingNavigator)((Component< ? >)owner).findParent(AjaxPagingNavigator.class);
+ AjaxPagingNavigator navigator = (AjaxPagingNavigator)((Component)owner).findParent(AjaxPagingNavigator.class);
if (navigator == null)
{
throw new WicketRuntimeException(
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java Fri Jun 6 18:11:06 2008
@@ -146,7 +146,7 @@
// the pageable is a component, and that it is a child of a web
// markup container.
- Component<?> container = ((Component<?>)pageable);
+ Component container = ((Component)pageable);
// no need for a nullcheck as there is bound to be a non-repeater
// somewhere higher in the hierarchy
while (container instanceof AbstractRepeater)
@@ -157,7 +157,7 @@
// in case the navigator is not contained by the container, we have
// to add it to the response
- if (((MarkupContainer<?>)container).contains(this, true) == false)
+ if (((MarkupContainer)container).contains(this, true) == false)
{
target.addComponent(this);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentInstantiationListener.java Fri Jun 6 18:11:06 2008
@@ -37,5 +37,5 @@
* @param component
* the component that is being instantiated.
*/
- void onInstantiation(Component< ? > component);
+ void onInstantiation(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnAfterRenderListener.java Fri Jun 6 18:11:06 2008
@@ -31,5 +31,5 @@
* @param component
* the component that was just rendered
*/
- public void onAfterRender(Component< ? > component);
+ public void onAfterRender(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/application/IComponentOnBeforeRenderListener.java Fri Jun 6 18:11:06 2008
@@ -32,5 +32,5 @@
* @param component
* the component that is about to be rendered
*/
- public void onBeforeRender(Component< ? > component);
+ public void onBeforeRender(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IAuthorizationStrategy.java Fri Jun 6 18:11:06 2008
@@ -40,7 +40,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(final Class<T> c)
+ public <T extends Component> boolean isInstantiationAuthorized(final Class<T> c)
{
return true;
}
@@ -49,7 +49,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(Component<?> c, Action action)
+ public boolean isActionAuthorized(Component c, Action action)
{
return true;
}
@@ -72,7 +72,7 @@
* The component class to check
* @return Whether the given component may be created
*/
- <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass);
+ <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass);
/**
* Gets whether the given action is permitted. If it is, this method should return true. If it
@@ -90,5 +90,5 @@
* @see Component#ENABLE
* @see Component#RENDER
*/
- boolean isActionAuthorized(Component<?> component, Action action);
+ boolean isActionAuthorized(Component component, Action action);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/IUnauthorizedComponentInstantiationListener.java Fri Jun 6 18:11:06 2008
@@ -33,5 +33,5 @@
* The partially constructed component (only the id is guaranteed to be valid).
* @see org.apache.wicket.application.IComponentInstantiationListener
*/
- void onUnauthorizedInstantiation(Component< ? > component);
+ void onUnauthorizedInstantiation(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedActionException.java Fri Jun 6 18:11:06 2008
@@ -32,7 +32,7 @@
private final Action action;
/** The component that caused the unauthorized exception */
- private final Component< ? > component;
+ private final Component component;
/**
* Construct.
@@ -42,7 +42,7 @@
* @param action
* The action
*/
- public UnauthorizedActionException(Component< ? > component, Action action)
+ public UnauthorizedActionException(Component component, Action action)
{
super("Component " + component + " does not permit action " + action);
this.component = component;
@@ -60,7 +60,7 @@
/**
* @return The component that caused the unauthorized exception
*/
- public Component< ? > getComponent()
+ public Component getComponent()
{
return component;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/UnauthorizedInstantiationException.java Fri Jun 6 18:11:06 2008
@@ -41,7 +41,7 @@
* @param componentClass
* The unauthorized component class
*/
- public <T extends Component<?>> UnauthorizedInstantiationException(final Class<T> componentClass)
+ public <T extends Component> UnauthorizedInstantiationException(final Class<T> componentClass)
{
super("Not authorized to instantiate class " + componentClass.getName());
componentClassName = componentClass.getName();
@@ -50,7 +50,7 @@
/**
* @return The component class that could not be instantiated
*/
- public Class<? extends Component<?>> getComponentClass()
+ public Class<? extends Component> getComponentClass()
{
return Classes.resolveClass(componentClassName);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java Fri Jun 6 18:11:06 2008
@@ -53,7 +53,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public final <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass)
+ public final <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
int size = strategies.size();
for (int i = 0; i < size; i++)
@@ -71,7 +71,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public final boolean isActionAuthorized(Component<?> component, Action action)
+ public final boolean isActionAuthorized(Component component, Action action)
{
int size = strategies.size();
for (int i = 0; i < size; i++)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/ActionAuthorizationStrategy.java Fri Jun 6 18:11:06 2008
@@ -50,7 +50,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;
}
@@ -59,7 +59,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)
{
IActionAuthorizer authorizer = actionAuthorizerForAction.get(action);
if (authorizer != null)
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/action/IActionAuthorizer.java Fri Jun 6 18:11:06 2008
@@ -42,5 +42,5 @@
* The component to authorize this action on
* @return True if this action is authorized
*/
- boolean authorizeAction(Component< ? > component);
+ boolean authorizeAction(Component component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/AbstractPageAuthorizationStrategy.java Fri Jun 6 18:11:06 2008
@@ -35,7 +35,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(final Component<?> component, final Action action)
+ public boolean isActionAuthorized(final Component component, final Action action)
{
return true;
}
@@ -44,7 +44,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
@SuppressWarnings("unchecked")
- public final <T extends Component<?>> boolean isInstantiationAuthorized(
+ public final <T extends Component> boolean isInstantiationAuthorized(
final Class<T> componentClass)
{
if (instanceOf(componentClass, Page.class))
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java Fri Jun 6 18:11:06 2008
@@ -57,7 +57,7 @@
/**
* The supertype (class or interface) of Pages that require authorization to be instantiated.
*/
- private final WeakReference<Class<? extends Component<?>>> securePageSuperTypeRef;
+ private final WeakReference<Class<? extends Component>> securePageSuperTypeRef;
/**
* Construct.
@@ -71,7 +71,7 @@
* @param signInPageClass
* The sign in page class
*/
- public <C extends Component<?>, S extends Page<?>> SimplePageAuthorizationStrategy(
+ public <C extends Component, S extends Page<?>> SimplePageAuthorizationStrategy(
final Class<C> securePageSuperType, final Class<S> signInPageClass)
{
if (securePageSuperType == null)
@@ -79,14 +79,14 @@
throw new IllegalArgumentException("Secure page super type must not be null");
}
- securePageSuperTypeRef = new WeakReference<Class<? extends Component<?>>>(
+ securePageSuperTypeRef = new WeakReference<Class<? extends Component>>(
securePageSuperType);
// Handle unauthorized access to pages
Application.get().getSecuritySettings().setUnauthorizedComponentInstantiationListener(
new IUnauthorizedComponentInstantiationListener()
{
- public void onUnauthorizedInstantiation(final Component<?> component)
+ public void onUnauthorizedInstantiation(final Component component)
{
// If there is a sign in page class declared, and the
// unauthorized component is a page, but it's not the
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Fri Jun 6 18:11:06 2008
@@ -42,7 +42,7 @@
private static final long serialVersionUID = 1L;
/** the component that this handler is bound to. */
- private Component< ? > component;
+ private Component component;
/**
* Construct.
@@ -58,7 +58,7 @@
* the component to bind to
*/
@Override
- public final void bind(final Component< ? > hostComponent)
+ public final void bind(final Component hostComponent)
{
if (hostComponent == null)
{
@@ -129,7 +129,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- public final void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public final void onComponentTag(final Component component, final ComponentTag tag)
{
onComponentTag(tag);
}
@@ -138,7 +138,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
@Override
- public final void onRendered(final Component< ? > hostComponent)
+ public final void onRendered(final Component hostComponent)
{
onComponentRendered();
}
@@ -156,7 +156,7 @@
*
* @return the component that this handler is bound to
*/
- protected final Component< ? > getComponent()
+ protected final Component getComponent()
{
return component;
}
@@ -192,7 +192,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#getStatelessHint(Component)
*/
@Override
- public boolean getStatelessHint(Component< ? > component)
+ public boolean getStatelessHint(Component component)
{
return false;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java Fri Jun 6 18:11:06 2008
@@ -44,14 +44,14 @@
/**
* @see org.apache.wicket.behavior.IBehavior#beforeRender(org.apache.wicket.Component)
*/
- public void beforeRender(Component< ? > component)
+ public void beforeRender(Component component)
{
}
/**
* @see org.apache.wicket.behavior.IBehavior#bind(org.apache.wicket.Component)
*/
- public void bind(final Component< ? > component)
+ public void bind(final Component component)
{
}
@@ -67,7 +67,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#detach(Component)
*/
- public void detach(Component< ? > component)
+ public void detach(Component component)
{
}
@@ -75,7 +75,7 @@
* @see org.apache.wicket.behavior.IBehavior#exception(org.apache.wicket.Component,
* java.lang.RuntimeException)
*/
- public final void exception(Component< ? > component, RuntimeException exception)
+ public final void exception(Component component, RuntimeException exception)
{
try
{
@@ -90,7 +90,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#getStatelessHint(org.apache.wicket.Component)
*/
- public boolean getStatelessHint(Component< ? > component)
+ public boolean getStatelessHint(Component component)
{
return true;
}
@@ -99,7 +99,7 @@
* @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
- public void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
}
@@ -113,7 +113,7 @@
* @param exception
* the unexpected exception
*/
- public void onException(Component< ? > component, RuntimeException exception)
+ public void onException(Component component, RuntimeException exception)
{
}
@@ -123,14 +123,14 @@
* @param component
* the component that has this behavior coupled
*/
- public void onRendered(Component< ? > component)
+ public void onRendered(Component component)
{
}
/**
* @see org.apache.wicket.behavior.IBehavior#afterRender(org.apache.wicket.Component)
*/
- public final void afterRender(final Component< ? > component)
+ public final void afterRender(final Component component)
{
try
{
@@ -152,7 +152,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#isEnabled(Component)
*/
- public boolean isEnabled(Component< ? > component)
+ public boolean isEnabled(Component component)
{
return true;
}
@@ -172,7 +172,7 @@
* @deprecated replaced by {@link #detach(Component)}
*/
@Deprecated
- public final void detachModel(Component< ? > component)
+ public final void detachModel(Component component)
{
throw new UnsupportedOperationException();
}
@@ -182,7 +182,7 @@
* @deprecated replaced by {@link #afterRender(Component)}
*/
@Deprecated
- public final void rendered(Component< ? > component)
+ public final void rendered(Component component)
{
throw new UnsupportedOperationException();
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IActivePageBehaviorListener.java Fri Jun 6 18:11:06 2008
@@ -44,7 +44,7 @@
* org.apache.wicket.request.RequestParameters)
*/
@Override
- public IRequestTarget newRequestTarget(Page< ? > page, Component< ? > component,
+ public IRequestTarget newRequestTarget(Page page, Component component,
RequestListenerInterface listener, RequestParameters requestParameters)
{
return new BehaviorRequestTarget(page, component, listener, requestParameters);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java Fri Jun 6 18:11:06 2008
@@ -48,7 +48,7 @@
* @param component
* the component that has this behavior coupled
*/
- void beforeRender(Component< ? > component);
+ void beforeRender(Component component);
/**
* Called when a component that has this behavior coupled was rendered.
@@ -56,7 +56,7 @@
* @param component
* the component that has this behavior coupled
*/
- void afterRender(Component< ? > component);
+ void afterRender(Component component);
/**
* Bind this handler to the given component. This method is called by the host component
@@ -69,7 +69,7 @@
* @param component
* the component to bind to
*/
- void bind(Component< ? > component);
+ void bind(Component component);
/**
* Allows the behavior to detach any state it has attached during request processing.
@@ -77,7 +77,7 @@
* @param component
* the component that initiates the detachment of this behavior
*/
- void detach(Component< ? > component);
+ void detach(Component component);
/**
* In case an unexpected exception happened anywhere between onComponentTag() and rendered(),
@@ -91,7 +91,7 @@
* @param exception
* the unexpected exception
*/
- void exception(Component< ? > component, RuntimeException exception);
+ void exception(Component component, RuntimeException exception);
/**
* This method returns false if the behavior generates a callback url (for example ajax
@@ -102,7 +102,7 @@
*
* @return boolean true or false.
*/
- boolean getStatelessHint(Component< ? > component);
+ boolean getStatelessHint(Component component);
/**
* Called when a components is rendering and wants to render this behavior. If false is returned
@@ -113,7 +113,7 @@
*
* @return true if this behavior must be executed/rendered
*/
- boolean isEnabled(Component< ? > component);
+ boolean isEnabled(Component component);
/**
* Called any time a component that has this behavior registered is rendering the component tag.
@@ -123,7 +123,7 @@
* @param tag
* the tag that is rendered
*/
- void onComponentTag(Component< ? > component, ComponentTag tag);
+ void onComponentTag(Component component, ComponentTag tag);
/**
* Specifies whether or not this behavior is temporary. Temporary behaviors are removed at the
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java Fri Jun 6 18:11:06 2008
@@ -45,7 +45,7 @@
* org.apache.wicket.request.RequestParameters)
*/
@Override
- public IRequestTarget newRequestTarget(Page< ? > page, Component< ? > component,
+ public IRequestTarget newRequestTarget(Page page, Component component,
RequestListenerInterface listener, RequestParameters requestParameters)
{
return new BehaviorRequestTarget(page, component, listener, requestParameters);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java Fri Jun 6 18:11:06 2008
@@ -90,7 +90,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- public void onComponentTag(final Component< ? > component, final ComponentTag tag)
+ public void onComponentTag(final Component component, final ComponentTag tag)
{
if (isEnabled(component))
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/behavior/StringHeaderContributor.java Fri Jun 6 18:11:06 2008
@@ -161,7 +161,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#detach(org.apache.wicket.Component)
*/
@Override
- public void detach(Component< ? > component)
+ public void detach(Component component)
{
contributor.contribution.detach();
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java Fri Jun 6 18:11:06 2008
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
/** The component to accept feedback messages for */
- private final Component< ? > component;
+ private final Component component;
/**
* Constructor
@@ -37,7 +37,7 @@
* @param component
* The component to filter on
*/
- public ComponentFeedbackMessageFilter(Component< ? > component)
+ public ComponentFeedbackMessageFilter(Component component)
{
this.component = component;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java Fri Jun 6 18:11:06 2008
@@ -28,7 +28,7 @@
{
private static final long serialVersionUID = 1L;
- private final MarkupContainer< ? > container;
+ private final MarkupContainer container;
/**
* Constructor
@@ -36,7 +36,7 @@
* @param container
* The container that message reporters must be a child of
*/
- public ContainerFeedbackMessageFilter(MarkupContainer< ? > container)
+ public ContainerFeedbackMessageFilter(MarkupContainer container)
{
if (container == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java Fri Jun 6 18:11:06 2008
@@ -79,7 +79,7 @@
private final Serializable message;
/** The reporting component. */
- private final Component< ? > reporter;
+ private final Component reporter;
/** Whether or not this message has been rendered */
private boolean rendered = false;
@@ -94,7 +94,7 @@
* @param level
* The level of the message
*/
- public FeedbackMessage(final Component< ? > reporter, final Serializable message,
+ public FeedbackMessage(final Component reporter, final Serializable message,
final int level)
{
this.reporter = reporter;
@@ -158,7 +158,7 @@
*
* @return the reporting component.
*/
- public final Component< ? > getReporter()
+ public final Component getReporter()
{
return reporter;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java Fri Jun 6 18:11:06 2008
@@ -66,7 +66,7 @@
* @param message
* @param level
*/
- public final void add(Component< ? > reporter, String message, int level)
+ public final void add(Component reporter, String message, int level)
{
add(new FeedbackMessage(reporter, message, level));
}
@@ -111,7 +111,7 @@
* @param message
* the actual message
*/
- public final void debug(Component< ? > reporter, String message)
+ public final void debug(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.DEBUG));
}
@@ -124,7 +124,7 @@
* @param message
* the actual message
*/
- public final void error(Component< ? > reporter, Serializable message)
+ public final void error(Component reporter, Serializable message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.ERROR));
}
@@ -137,7 +137,7 @@
* @param message
* the actual message
*/
- public final void fatal(Component< ? > reporter, String message)
+ public final void fatal(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.FATAL));
}
@@ -150,7 +150,7 @@
* the component to look up whether it registered a message
* @return whether the given component registered a message with this list with level ERROR
*/
- public final boolean hasErrorMessageFor(Component< ? > component)
+ public final boolean hasErrorMessageFor(Component component)
{
return hasMessageFor(component, FeedbackMessage.ERROR);
}
@@ -172,7 +172,7 @@
* the component to look up whether it registered a message
* @return whether the given component registered a message with this list
*/
- public final boolean hasMessageFor(Component< ? > component)
+ public final boolean hasMessageFor(Component component)
{
return messageForComponent(component) != null;
}
@@ -187,7 +187,7 @@
* The level of the message
* @return Whether the given component registered a message with this list with the given level
*/
- public final boolean hasMessageFor(Component< ? > component, int level)
+ public final boolean hasMessageFor(Component component, int level)
{
final FeedbackMessage message = messageForComponent(component);
return message != null && message.isLevel(level);
@@ -201,7 +201,7 @@
* @param message
* The actual message
*/
- public final void info(Component< ? > reporter, String message)
+ public final void info(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.INFO));
}
@@ -234,7 +234,7 @@
* @return the message that is found for the given component (first match) or null if none was
* found
*/
- public final FeedbackMessage messageForComponent(final Component< ? > component)
+ public final FeedbackMessage messageForComponent(final Component component)
{
for (Iterator<FeedbackMessage> iterator = messages.iterator(); iterator.hasNext();)
{
@@ -333,7 +333,7 @@
* @param message
* the actual message
*/
- public final void warn(Component< ? > reporter, String message)
+ public final void warn(Component reporter, String message)
{
add(new FeedbackMessage(reporter, message, FeedbackMessage.WARNING));
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java Fri Jun 6 18:11:06 2008
@@ -52,7 +52,7 @@
* The component where the page will be get from for which messages will be displayed
* usually the same page as the one feedbackpanel is attached to
*/
- public FeedbackMessagesModel(Component< ? > component)
+ public FeedbackMessagesModel(Component component)
{
if (component == null)
{
@@ -70,7 +70,7 @@
* feedbackpanel is attached to
*
*/
- public FeedbackMessagesModel(Page< ? > page, IFeedbackMessageFilter filter)
+ public FeedbackMessagesModel(Page page, IFeedbackMessageFilter filter)
{
this(page);
setFilter(filter);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=664231&r1=664230&r2=664231&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java Fri Jun 6 18:11:06 2008
@@ -89,7 +89,7 @@
* about the tags origin is lost. In some cases like wicket:head and wicket:link this
* information however is required.
*/
- private WeakReference<Class<? extends Component<?>>> markupClassRef = null;
+ private WeakReference<Class<? extends Component>> markupClassRef = null;
/**
* Tags which are detected to have only an open tag, which is allowed with some HTML tags like
@@ -759,7 +759,7 @@
*
* @return wicketHeaderClass
*/
- public Class<? extends Component<?>> getMarkupClass()
+ public Class<? extends Component> getMarkupClass()
{
return (markupClassRef == null ? null : markupClassRef.get());
}
@@ -772,7 +772,7 @@
* @param wicketHeaderClass
* wicketHeaderClass
*/
- public <C extends Component<?>> void setMarkupClass(Class<C> wicketHeaderClass)
+ public <C extends Component> void setMarkupClass(Class<C> wicketHeaderClass)
{
if (wicketHeaderClass == null)
{
@@ -780,7 +780,7 @@
}
else
{
- markupClassRef = new WeakReference<Class<? extends Component<?>>>(wicketHeaderClass);
+ markupClassRef = new WeakReference<Class<? extends Component>>(wicketHeaderClass);
}
}