Author: jdonnerstag
Date: Wed Apr 9 08:12:01 2008
New Revision: 646399
URL: http://svn.apache.org/viewvc?rev=646399&view=rev
Log:
generics
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
Wed Apr 9 08:12:01 2008
@@ -46,14 +46,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)
{
}
@@ -69,16 +69,15 @@
/**
* @see org.apache.wicket.behavior.IBehavior#detach(Component)
*/
- public void detach(Component component)
+ public void detach(Component< ? > component)
{
-
}
/**
* @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
{
@@ -93,7 +92,7 @@
/**
* @see
org.apache.wicket.behavior.IBehavior#getStatelessHint(org.apache.wicket.Component)
*/
- public boolean getStatelessHint(Component component)
+ public boolean getStatelessHint(Component< ? > component)
{
return true;
}
@@ -102,7 +101,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)
{
}
@@ -116,7 +115,7 @@
* @param exception
* the unexpected exception
*/
- public void onException(Component component, RuntimeException exception)
+ public void onException(Component< ? > component, RuntimeException
exception)
{
}
@@ -126,14 +125,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
{
@@ -155,7 +154,7 @@
/**
* @see org.apache.wicket.behavior.IBehavior#isEnabled(Component)
*/
- public boolean isEnabled(Component component)
+ public boolean isEnabled(Component< ? > component)
{
return true;
}
@@ -174,7 +173,8 @@
* @param component
* @deprecated replaced by [EMAIL PROTECTED] #detach(Component)}
*/
- public final void detachModel(Component component)
+ @Deprecated
+ public final void detachModel(Component< ? > component)
{
throw new UnsupportedOperationException();
}
@@ -183,7 +183,8 @@
* @param component
* @deprecated replaced by [EMAIL PROTECTED] #afterRender(Component)}
*/
- public final void rendered(Component component)
+ @Deprecated
+ public final void rendered(Component< ? > component)
{
throw new UnsupportedOperationException();
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
Wed Apr 9 08:12:01 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/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
Wed Apr 9 08:12:01 2008
@@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.wicket.Component;
import org.apache.wicket.Response;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.parser.XmlTag;
@@ -89,7 +90,7 @@
* about the tags origin is lost. In some cases like wicket:head and
wicket:link this
* information however is required.
*/
- private WeakReference<Class> 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
@@ -638,10 +639,10 @@
if (getAttributes().size() > 0)
{
- final Iterator iterator =
getAttributes().keySet().iterator();
+ final Iterator<String> iterator =
getAttributes().keySet().iterator();
while (iterator.hasNext())
{
- final String key = (String)iterator.next();
+ final String key = iterator.next();
if (key == null)
{
continue;
@@ -760,9 +761,10 @@
*
* @return wicketHeaderClass
*/
- public Class getMarkupClass()
+ @SuppressWarnings("unchecked")
+ public Class< ? extends Component< ? >> getMarkupClass()
{
- return (markupClassRef == null ? null :
(Class)markupClassRef.get());
+ return (markupClassRef == null ? null : markupClassRef.get());
}
/**
@@ -771,7 +773,7 @@
* @param wicketHeaderClass
* wicketHeaderClass
*/
- public void setMarkupClass(Class wicketHeaderClass)
+ public void setMarkupClass(Class< ? extends Component< ? >>
wicketHeaderClass)
{
if (wicketHeaderClass == null)
{
@@ -779,7 +781,7 @@
}
else
{
- markupClassRef = new WeakReference(wicketHeaderClass);
+ markupClassRef = new WeakReference<Class< ? extends
Component< ? >>>(wicketHeaderClass);
}
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/IMarkupCache.java
Wed Apr 9 08:12:01 2008
@@ -47,8 +47,8 @@
* reloaded. Whatever is in the cache, it will be ignored
* @return Markup resource
*/
- Markup getMarkup(final MarkupContainer container,
- final Class< ? extends MarkupContainer> clazz, final boolean
enforceReload);
+ Markup getMarkup(final MarkupContainer< ? > container,
+ final Class< ? extends MarkupContainer< ? >> clazz, final
boolean enforceReload);
/**
* Gets a fresh markup stream that contains the (immutable) markup
resource for this class.
@@ -62,7 +62,7 @@
* If true, throw an exception, if markup could not be found
* @return A stream of MarkupElement elements
*/
- MarkupStream getMarkupStream(final MarkupContainer container, final
boolean enforceReload,
+ MarkupStream getMarkupStream(final MarkupContainer< ? > container,
final boolean enforceReload,
final boolean throwException);
/**
@@ -72,7 +72,7 @@
* The container the markup should be associated with
* @return True if this markup container has associated markup
*/
- boolean hasAssociatedMarkup(final MarkupContainer container);
+ boolean hasAssociatedMarkup(final MarkupContainer< ? > container);
/**
* Remove the markup associated with the cache key from the cache
including all dependent
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/DefaultMarkupLoader.java
Wed Apr 9 08:12:01 2008
@@ -47,12 +47,12 @@
* org.apache.wicket.markup.MarkupResourceStream,
* org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
- public final Markup loadMarkup(final MarkupContainer container,
- final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
- final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException
+ public final Markup loadMarkup(final MarkupContainer< ? > container,
+ final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
+ final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException
{
IMarkupLoader loader = new InheritedMarkupMarkupLoader();
return loader.loadMarkup(container, markupResourceStream, new
SimpleMarkupLoader(),
- enforceReload);
+ enforceReload);
}
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/IMarkupLoader.java
Wed Apr 9 08:12:01 2008
@@ -56,7 +56,7 @@
* @throws IOException
* @throws ResourceStreamNotFoundException
*/
- Markup loadMarkup(final MarkupContainer container,
- final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
- final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException;
+ Markup loadMarkup(final MarkupContainer< ? > container,
+ final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
+ final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException;
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
Wed Apr 9 08:12:01 2008
@@ -54,9 +54,9 @@
* org.apache.wicket.markup.MarkupResourceStream,
* org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
- public final Markup loadMarkup(final MarkupContainer container,
- final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
- final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException
+ public final Markup loadMarkup(final MarkupContainer< ? > container,
+ final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
+ final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException
{
// read and parse the markup
Markup markup = baseLoader.loadMarkup(container,
markupResourceStream, null, enforceReload);
@@ -79,8 +79,8 @@
* @return A markup object with the the base markup elements resolved.
* @TODO move into IMarkupLoader
*/
- private Markup checkForMarkupInheritance(final MarkupContainer
container, final Markup markup,
- final boolean enforceReload)
+ private Markup checkForMarkupInheritance(final MarkupContainer< ? >
container,
+ final Markup markup, final boolean enforceReload)
{
// Check if markup contains <wicket:extend> which tells us that
// we need to read the inherited markup as well.
@@ -91,23 +91,41 @@
return markup;
}
- // get the base markup
- final Markup baseMarkup =
Application.get().getMarkupSettings().getMarkupCache().getMarkup(
- container,
-
markup.getMarkupResourceData().getResource().getMarkupClass().getSuperclass(),
- enforceReload);
+ final Markup baseMarkup = getBaseMarkup(container, markup,
enforceReload);
if (baseMarkup == Markup.NO_MARKUP)
{
throw new MarkupNotFoundException(
- "Base markup of inherited markup not
found. Component class: " +
-
markup.getMarkupResourceData().getResource().getContainerInfo()
-
.getContainerClass().getName() +
- " Enable debug messages
for org.apache.wicket.util.resource.Resource to get a list of all filenames
tried.");
+ "Base markup of inherited markup not found.
Component class: " +
+ markup.getMarkupResourceData()
+ .getResource()
+ .getContainerInfo()
+ .getContainerClass()
+ .getName() +
+ " Enable debug messages for
org.apache.wicket.util.resource.Resource to get a list of all filenames
tried.");
}
// Merge base and derived markup
return new MergedMarkup(markup, baseMarkup, extendIndex);
+ }
+
+ /**
+ * @param container
+ * @param markup
+ * @param enforceReload
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ private Markup getBaseMarkup(final MarkupContainer< ? > container,
final Markup markup,
+ final boolean enforceReload)
+ {
+ // get the base markup
+ Markup baseMarkup =
Application.get().getMarkupSettings().getMarkupCache().getMarkup(
+ container,
+
markup.getMarkupResourceData().getResource().getMarkupClass().getSuperclass(),
+ enforceReload);
+
+ return baseMarkup;
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/loader/SimpleMarkupLoader.java
Wed Apr 9 08:12:01 2008
@@ -45,11 +45,11 @@
* org.apache.wicket.markup.MarkupResourceStream,
* org.apache.wicket.markup.loader.IMarkupLoader, boolean)
*/
- public final Markup loadMarkup(final MarkupContainer container,
- final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
- final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException
+ public final Markup loadMarkup(final MarkupContainer< ? > container,
+ final MarkupResourceStream markupResourceStream, final
IMarkupLoader baseLoader,
+ final boolean enforceReload) throws IOException,
ResourceStreamNotFoundException
{
return
Application.get().getMarkupSettings().getMarkupParserFactory().newMarkupParser(
- markupResourceStream).parse();
+ markupResourceStream).parse();
}
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/XmlTag.java
Wed Apr 9 08:12:01 2008
@@ -127,6 +127,7 @@
/**
* @see
org.apache.wicket.markup.MarkupElement#equalTo(org.apache.wicket.markup.MarkupElement)
*/
+ @Override
public final boolean equalTo(final MarkupElement element)
{
if (element instanceof XmlTag)
@@ -475,19 +476,19 @@
* @param map
* A key/value map
*/
- public void putAll(final Map map)
+ public void putAll(final Map<String, Object> map)
{
- for (final Iterator iterator = map.entrySet().iterator();
iterator.hasNext();)
+ for (final Iterator<Map.Entry<String, Object>> iterator =
map.entrySet().iterator(); iterator.hasNext();)
{
- final Map.Entry entry = (Map.Entry) iterator.next();
+ final Map.Entry<String, Object> entry = iterator.next();
Object value = entry.getValue();
- put((String) entry.getKey(), (value != null) ?
value.toString() : null);
+ put(entry.getKey(), (value != null) ? value.toString()
: null);
}
}
/**
* Removes an attribute.
- *
+ *
* @param key
* The key to remove
*/
@@ -507,7 +508,7 @@
if (isMutable)
{
this.name = name;
- this.nameChanged = true;
+ nameChanged = true;
}
else
{
@@ -526,7 +527,7 @@
if (isMutable)
{
this.namespace = namespace;
- this.nameChanged = true;
+ nameChanged = true;
}
else
{
@@ -544,7 +545,7 @@
*/
public void setOpenTag(final XmlTag tag)
{
- this.closes = tag;
+ closes = tag;
}
/**
@@ -573,7 +574,7 @@
public String toDebugString()
{
return "[Tag name = " + name + ", pos = " + pos + ", line = " +
lineNumber + ", length = " +
- length + ", attributes = [" + getAttributes() +
"], type = " + type + "]";
+ length + ", attributes = [" + getAttributes() + "],
type = " + type + "]";
}
/**
@@ -581,6 +582,7 @@
*
* @return String version of this object
*/
+ @Override
public String toString()
{
return toCharSequence().toString();
@@ -589,6 +591,7 @@
/**
* @see org.apache.wicket.markup.MarkupElement#toCharSequence()
*/
+ @Override
public CharSequence toCharSequence()
{
if (!isMutable && (text != null))
@@ -604,6 +607,7 @@
*
* @return String version of this object
*/
+ @Override
public String toUserDebugString()
{
return "'" + toString() + "' (line " + lineNumber + ", column "
+ columnNumber + ")";
@@ -638,13 +642,12 @@
final IValueMap attributes = getAttributes();
if (attributes.size() > 0)
{
- final Iterator iterator =
attributes.keySet().iterator();
+ final Iterator<String> iterator =
attributes.keySet().iterator();
for (; iterator.hasNext();)
{
- final String key = (String)iterator.next();
+ final String key = iterator.next();
if ((key != null) &&
- ((attributeToBeIgnored == null)
|| !key
-
.equalsIgnoreCase(attributeToBeIgnored)))
+ ((attributeToBeIgnored == null) ||
!key.equalsIgnoreCase(attributeToBeIgnored)))
{
buffer.append(" ");
buffer.append(key);
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
Wed Apr 9 08:12:01 2008
@@ -54,7 +54,7 @@
}
/** Stack of <wicket:enclosure> tags */
- private Stack/* <ComponentTag> */stack;
+ private Stack<ComponentTag> stack;
/** The id of the first wicket tag inside the enclosure */
private String childId;
@@ -90,7 +90,7 @@
{
if (stack == null)
{
- stack = new Stack/* <ComponentTag> */();
+ stack = new Stack<ComponentTag>();
}
stack.push(tag);
}
@@ -101,11 +101,11 @@
if (stack == null)
{
throw new ParseException("Missing open
tag for Enclosure: " + tag.toString(),
- tag.getPos());
+ tag.getPos());
}
// Remove the open tag from the stack
- ComponentTag lastEnclosure =
(ComponentTag)stack.pop();
+ ComponentTag lastEnclosure = stack.pop();
// If the child attribute has not been given by
the user,
// than ...
@@ -124,13 +124,13 @@
else
{
throw new ParseException("Open-close tag not
allowed for Enclosure: " +
- tag.toString(), tag.getPos());
+ tag.toString(), tag.getPos());
}
}
// Are we inside a wicket:enclosure tag?
else if ((tag.getId() != null) && (isWicketTag == false) &&
(stack != null))
{
- ComponentTag lastEnclosure =
(ComponentTag)stack.lastElement();
+ ComponentTag lastEnclosure = stack.lastElement();
// If the enclosure tag has NO child attribute, than ...
if (lastEnclosure.getString(CHILD_ATTRIBUTE) == null)
@@ -142,8 +142,8 @@
if (childId != null)
{
throw new ParseException(
- "Use <wicket:enclosure
child='xxx'> to name the child component", tag
-
.getPos());
+ "Use <wicket:enclosure
child='xxx'> to name the child component",
+ tag.getPos());
}
// Remember the child id. The open tag will be
updated
// once the close tag is found. See above.
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
Wed Apr 9 08:12:01 2008
@@ -18,6 +18,7 @@
import java.text.ParseException;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.WicketTag;
@@ -53,7 +54,7 @@
* @param markupFileClass
* Used to generated the a common prefix for the id
*/
- public HeadForceTagIdHandler(final Class markupFileClass)
+ public HeadForceTagIdHandler(final Class< ? extends Component< ? >>
markupFileClass)
{
// generate the prefix from class name
final AppendingStringBuffer buffer = new
AppendingStringBuffer(markupFileClass.getName());
@@ -88,7 +89,7 @@
{
// is the tag open and has empty wicket:id?
if ((tag instanceof WicketTag == false) &&
(tag.getId() == null) &&
- (tag.isOpen() ||
tag.isOpenClose()) && needId(tag))
+ (tag.isOpen() || tag.isOpenClose()) &&
needId(tag))
{
if (tag.getAttributes().get("id") ==
null)
{
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
Wed Apr 9 08:12:01 2008
@@ -43,7 +43,7 @@
final private ArrayListStack stack = new ArrayListStack();
/** Map of simple tags. */
- private static final Map doesNotRequireCloseTag = new HashMap();
+ private static final Map<String, Boolean> doesNotRequireCloseTag = new
HashMap<String, Boolean>();
static
{
@@ -91,7 +91,7 @@
else
{
throw new ParseException("Tag " + top +
" at " + top.getPos() +
- " did not have a close
tag", top.getPos());
+ " did not have a close tag",
top.getPos());
}
}
@@ -142,8 +142,8 @@
if (mismatch)
{
throw new ParseException("Tag "
+ top.toUserDebugString() +
- " has a
mismatched close tag at " + tag.toUserDebugString(), top
- .getPos());
+ " has a mismatched
close tag at " + tag.toUserDebugString(),
+ top.getPos());
}
}
@@ -153,7 +153,7 @@
else
{
throw new ParseException("Tag " +
tag.toUserDebugString() +
- " does not have a matching open
tag", tag.getPos());
+ " does not have a matching open tag",
tag.getPos());
}
}
else if (tag.isOpenClose())
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
Wed Apr 9 08:12:01 2008
@@ -105,18 +105,17 @@
// Some people are using a dot "wicket.xxx" instead of a colon
// "wicket:xxx"
- Iterator iter = tag.getAttributes().keySet().iterator();
+ Iterator<String> iter = tag.getAttributes().keySet().iterator();
while (iter.hasNext())
{
- String key = (String)iter.next();
+ String key = iter.next();
if (key != null)
{
key = key.toLowerCase();
if (key.startsWith("wicket."))
{
escalateWarning(
- "You probably want
'wicket:xxx' rather than 'wicket.xxx'. Location: ",
- tag);
+ "You probably want 'wicket:xxx'
rather than 'wicket.xxx'. Location: ", tag);
}
}
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
Wed Apr 9 08:12:01 2008
@@ -34,10 +34,15 @@
*/
public class OpenCloseTagExpander extends AbstractMarkupFilter
{
- ComponentTag next = null;
- private static final List replaceForTags = Arrays.asList(new String[] {
"div", "span", "p",
- "strong", "b", "e" });
+ private static final List<String> replaceForTags = Arrays.asList(new
String[] { "div", "span",
+ "p", "strong", "b", "e" });
+ private ComponentTag next = null;
+
+ /**
+ *
+ * @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
+ */
public MarkupElement nextTag() throws ParseException
{
if (next != null)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
Wed Apr 9 08:12:01 2008
@@ -52,8 +52,8 @@
* @author Al Maw
*/
public final class RelativePathPrefixHandler extends AbstractMarkupFilter
- implements
- IComponentResolver
+ implements
+ IComponentResolver
{
private static final long serialVersionUID = 1L;
@@ -77,7 +77,8 @@
{
private static final long serialVersionUID = 1L;
- public void onComponentTag(Component component, ComponentTag
tag)
+ @Override
+ public void onComponentTag(Component< ? > component,
ComponentTag tag)
{
String prefix = null;
@@ -88,12 +89,13 @@
String attrValue =
tag.getAttributes().getString(attrName);
if ((attrValue != null) &&
(attrValue.startsWith("/") == false) &&
- (attrValue.indexOf(":") < 0) &&
!(attrValue.startsWith("#")))
+ (attrValue.indexOf(":") < 0) &&
!(attrValue.startsWith("#")))
{
if (prefix == null)
{
- prefix =
RequestCycle.get().getRequest()
-
.getRelativePathPrefixToContextRoot();
+ prefix = RequestCycle.get()
+ .getRequest()
+
.getRelativePathPrefixToContextRoot();
}
attrValue = prefix + attrValue;
tag.getAttributes().put(attrName,
attrValue);
@@ -121,7 +123,7 @@
// Don't touch any wicket:id component and any auto-components
if ((tag instanceof WicketTag) || (tag.isAutolinkEnabled() ==
true) ||
- (tag.getAttributes().get("wicket:id") != null))
+ (tag.getAttributes().get("wicket:id") != null))
{
return tag;
}
@@ -133,7 +135,7 @@
String attrName = attributeNames[i];
String attrValue =
tag.getAttributes().getString(attrName);
if ((attrValue != null) && (attrValue.startsWith("/")
== false) &&
- (attrValue.indexOf(":") < 0) &&
!(attrValue.startsWith("#")))
+ (attrValue.indexOf(":") < 0) &&
!(attrValue.startsWith("#")))
{
if (tag.getId() == null)
{
@@ -154,26 +156,28 @@
* @see
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(MarkupContainer container, MarkupStream
markupStream, ComponentTag tag)
+ public boolean resolve(MarkupContainer< ? > container, MarkupStream
markupStream,
+ ComponentTag tag)
{
if
(WICKET_RELATIVE_PATH_PREFIX_CONTAINER_ID.equals(tag.getId()))
{
- final Component wc;
+ final Component< ? > wc;
String id = WICKET_RELATIVE_PATH_PREFIX_CONTAINER_ID +
- container.getPage().getAutoIndex();
+ container.getPage().getAutoIndex();
if (tag.isOpenClose())
{
- wc = new WebComponent(id);
+ wc = new WebComponent<Object>(id);
}
else
{
// we do not want to mess with the hierarchy,
so the container has to be
// transparent as it may have wicket components
inside. for example a raw anchor tag
// that contains a label.
- wc = new WebMarkupContainer(id)
+ wc = new WebMarkupContainer<Object>(id)
{
private static final long
serialVersionUID = 1L;
+ @Override
public boolean isTransparentResolver()
{
return true;
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/TagTypeHandler.java
Wed Apr 9 08:12:01 2008
@@ -39,7 +39,7 @@
final private ArrayListStack stack = new ArrayListStack();
/** Map of simple tags. */
- private static final Map requireOpenBodyCloseTag = new HashMap();
+ private static final Map<String, Boolean> requireOpenBodyCloseTag = new
HashMap<String, Boolean>();
static
{
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
Wed Apr 9 08:12:01 2008
@@ -119,7 +119,8 @@
* @see
org.apache.wicket.behavior.AbstractBehavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
- public void onComponentTag(final Component component, final
ComponentTag tag)
+ @Override
+ public void onComponentTag(final Component< ? > component,
final ComponentTag tag)
{
String expr =
tag.getAttributes().getString(WICKET_MESSAGE_ATTRIBUTE_NAME);
if (!Strings.isEmpty(expr))
@@ -165,21 +166,22 @@
* @see
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
* org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
*/
- public boolean resolve(MarkupContainer container, MarkupStream
markupStream, ComponentTag tag)
+ public boolean resolve(MarkupContainer< ? > container, MarkupStream
markupStream,
+ ComponentTag tag)
{
// localize any raw markup that has wicket:message attrs
if (WICKET_MESSAGE_CONTAINER_ID.equals(tag.getId()))
{
- Component wc = null;
+ Component<Object> wc = null;
if (tag.isOpenClose())
{
- wc = new
WebComponent(WICKET_MESSAGE_CONTAINER_ID +
+ wc = new
WebComponent<Object>(WICKET_MESSAGE_CONTAINER_ID +
container.getPage().getAutoIndex());
}
else
{
- wc = new
WebMarkupContainer(WICKET_MESSAGE_CONTAINER_ID +
+ wc = new
WebMarkupContainer<Object>(WICKET_MESSAGE_CONTAINER_ID +
container.getPage().getAutoIndex());
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
Wed Apr 9 08:12:01 2008
@@ -22,8 +22,8 @@
import org.apache.wicket.Application;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupResourceData;
import org.apache.wicket.markup.MarkupElement;
+import org.apache.wicket.markup.MarkupResourceData;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.util.value.IValueMap;
@@ -97,20 +97,20 @@
{
// For all tags attributes
final IValueMap attributes = tag.getAttributes();
- final Iterator it = attributes.entrySet().iterator();
+ final Iterator<Map.Entry<String, Object>> it =
attributes.entrySet().iterator();
while (it.hasNext())
{
- final Map.Entry entry = (Map.Entry)it.next();
+ final Map.Entry<String, Object> entry = it.next();
// Find attributes with namespace "xmlns"
- final String attributeName = (String)entry.getKey();
+ final String attributeName = entry.getKey();
if (attributeName.startsWith(XMLNS))
{
final String xmlnsUrl =
(String)entry.getValue();
// If Wicket relevant ...
if ((xmlnsUrl == null) ||
(xmlnsUrl.trim().length() == 0) ||
- xmlnsUrl.startsWith(WICKET_URI))
+ xmlnsUrl.startsWith(WICKET_URI))
{
// Set the Wicket namespace for wicket
tags (e.g.
// <wicket:panel>) and attributes (e.g.
wicket:id)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?rev=646399&r1=646398&r2=646399&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
Wed Apr 9 08:12:01 2008
@@ -22,8 +22,8 @@
import java.util.List;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupResourceData;
import org.apache.wicket.markup.MarkupElement;
+import org.apache.wicket.markup.MarkupResourceData;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.markup.parser.XmlTag;
@@ -43,7 +43,7 @@
public final class WicketTagIdentifier extends AbstractMarkupFilter
{
/** List of well known wicket tag names */
- private static List wellKnownTagNames;
+ private static List<String> wellKnownTagNames;
/** The current markup needed to get the markups namespace */
private final MarkupResourceData markup;
@@ -99,8 +99,8 @@
{
// give up
throw new ParseException("Unknown tag name with
Wicket namespace: '" +
- xmlTag.getName() +
- "'. Might be you haven't
installed the appropriate resolver?", tag.getPos());
+ xmlTag.getName() +
+ "'. Might be you haven't installed the
appropriate resolver?", tag.getPos());
}
}
else
@@ -116,8 +116,8 @@
if (value.trim().length() == 0)
{
throw new ParseException(
- "The wicket:id attribute value
must not be empty. May be unmatched quotes?!?",
- tag.getPos());
+ "The wicket:id attribute value must not
be empty. May be unmatched quotes?!?",
+ tag.getPos());
}
// Make it a wicket component. Otherwise it would be
RawMarkup
tag.setId(value);
@@ -135,7 +135,7 @@
{
if (wellKnownTagNames == null)
{
- wellKnownTagNames = new ArrayList();
+ wellKnownTagNames = new ArrayList<String>();
}
if (wellKnownTagNames.contains(name) == false)
@@ -146,10 +146,10 @@
private boolean isWellKnown(final XmlTag xmlTag)
{
- final Iterator iterator = wellKnownTagNames.iterator();
+ final Iterator<String> iterator = wellKnownTagNames.iterator();
while (iterator.hasNext())
{
- final String name = (String)iterator.next();
+ final String name = iterator.next();
if (xmlTag.getName().equalsIgnoreCase(name))
{
return true;
