You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2008/04/10 00:28:27 UTC
svn commit: r646570 - in
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: ./
application/ markup/ markup/resolver/ markup/transformer/ resource/loader/
settings/ util/crypt/
Author: jdonnerstag
Date: Wed Apr 9 15:28:24 2008
New Revision: 646570
URL: http://svn.apache.org/viewvc?rev=646570&view=rev
Log:
generics
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/IClassResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IPageSettings.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java Wed Apr 9 15:28:24 2008
@@ -593,14 +593,14 @@
{
// Load properties files used by all libraries
- final Iterator resources = getApplicationSettings().getClassResolver().getResources(
- "wicket.properties");
+ final Iterator<URL> resources = getApplicationSettings().getClassResolver()
+ .getResources("wicket.properties");
while (resources.hasNext())
{
InputStream in = null;
try
{
- final URL url = (URL)resources.next();
+ final URL url = resources.next();
final Properties properties = new Properties();
in = url.openStream();
properties.load(in);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java Wed Apr 9 15:28:24 2008
@@ -49,21 +49,21 @@
*
* This problem has gone since we synchronize the access.
*/
- private final ConcurrentHashMap<String, WeakReference<Class>> classes = new ConcurrentHashMap<String, WeakReference<Class>>();
+ private final ConcurrentHashMap<String, WeakReference<Class< ? >>> classes = new ConcurrentHashMap<String, WeakReference<Class< ? >>>();
/**
* @see org.apache.wicket.application.IClassResolver#resolveClass(java.lang.String)
*/
- public final Class resolveClass(final String classname) throws ClassNotFoundException
+ public final Class< ? > resolveClass(final String classname) throws ClassNotFoundException
{
- Class clazz = null;
- WeakReference ref = classes.get(classname);
+ Class< ? > clazz = null;
+ WeakReference<Class< ? >> ref = classes.get(classname);
// Might be garbage-collected between getting the WeakRef and retrieving
// the Class from it.
if (ref != null)
{
- clazz = (Class)ref.get();
+ clazz = ref.get();
}
if (clazz == null)
{
@@ -110,30 +110,31 @@
}
clazz = loader.loadClass(classname);
}
- classes.put(classname, new WeakReference<Class>(clazz));
+ classes.put(classname, new WeakReference<Class< ? >>(clazz));
}
}
return clazz;
}
+ /**
+ *
+ * @see org.apache.wicket.application.IClassResolver#getResources(java.lang.String)
+ */
public Iterator<URL> getResources(String name)
{
HashSet<URL> loadedFiles = new HashSet<URL>();
try
{
// Try the classloader for the wicket jar/bundle
- Enumeration resources = Application.class.getClassLoader().getResources(
- "wicket.properties");
+ Enumeration<URL> resources = Application.class.getClassLoader().getResources(name);
loadResources(resources, loadedFiles);
// Try the classloader for the user's application jar/bundle
- resources = Application.get().getClass().getClassLoader().getResources(
- "wicket.properties");
+ resources = Application.get().getClass().getClassLoader().getResources(name);
loadResources(resources, loadedFiles);
// Try the context class loader
- resources = Thread.currentThread().getContextClassLoader().getResources(
- "wicket.properties");
+ resources = Thread.currentThread().getContextClassLoader().getResources(name);
loadResources(resources, loadedFiles);
}
catch (IOException e)
@@ -144,13 +145,18 @@
return loadedFiles.iterator();
}
- private void loadResources(Enumeration resources, Set<URL> loadedFiles)
+ /**
+ *
+ * @param resources
+ * @param loadedFiles
+ */
+ private void loadResources(Enumeration<URL> resources, Set<URL> loadedFiles)
{
if (resources != null)
{
while (resources.hasMoreElements())
{
- final URL url = (URL)resources.nextElement();
+ final URL url = resources.nextElement();
if (!loadedFiles.contains(url))
{
loadedFiles.add(url);
@@ -158,5 +164,4 @@
}
}
}
-
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/IClassResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/IClassResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/IClassResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/IClassResolver.java Wed Apr 9 15:28:24 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.application;
+import java.net.URL;
import java.util.Iterator;
/**
@@ -35,7 +36,7 @@
* @return Class
* @throws ClassNotFoundException
*/
- Class resolveClass(final String classname) throws ClassNotFoundException;
+ Class< ? > resolveClass(final String classname) throws ClassNotFoundException;
/**
@@ -44,6 +45,6 @@
* @param name
* @return
*/
- Iterator getResources(String name);
+ Iterator<URL> getResources(String name);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Wed Apr 9 15:28:24 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup;
+import org.apache.wicket.Component;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.string.Strings;
@@ -223,7 +224,8 @@
*
* @return The component's class
*/
- public final Class getContainerClass()
+ @SuppressWarnings("unchecked")
+ public final Class< ? extends Component< ? >> getContainerClass()
{
return markup.getMarkupResourceData().getResource().getMarkupClass();
}
@@ -415,7 +417,7 @@
while (true)
{
if ((current instanceof WicketTag) &&
- ((WicketTag)current).getName().equals(wicketTagName))
+ ((WicketTag)current).getName().equals(wicketTagName))
{
return;
}
@@ -494,9 +496,10 @@
/**
* @return String representation of markup stream
*/
+ @Override
public String toString()
{
return "[markup = " + String.valueOf(markup) + ", index = " + currentIndex +
- ", current = " + ((current == null) ? "null" : current.toUserDebugString()) + "]";
+ ", current = " + ((current == null) ? "null" : current.toUserDebugString()) + "]";
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Wed Apr 9 15:28:24 2008
@@ -65,7 +65,7 @@
* the children are nested inside <wicket:component>, their respective Java components are not.
* They must be added to the parent container of <wicket:component>.
*/
- private final Map nestedComponents = new HashMap();
+ private final Map<Component< ? >, MarkupContainer< ? >> nestedComponents = new HashMap<Component< ? >, MarkupContainer< ? >>();
/**
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
@@ -78,8 +78,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public final boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public final boolean resolve(final MarkupContainer< ? > container,
+ final MarkupStream markupStream, final ComponentTag tag)
{
// It must be <wicket:...>
if (tag instanceof WicketTag)
@@ -89,13 +89,13 @@
if (wicketTag.isComponentTag())
{
// Create and initialize the component
- final Component component = createComponent(container, wicketTag);
+ final Component< ? > component = createComponent(container, wicketTag);
if (component != null)
{
// 1. push the current component onto the stack
if (component instanceof Border)
{
- nestedComponents.put(((Border)component).getBodyContainer(), container);
+ nestedComponents.put(((Border< ? >)component).getBodyContainer(), container);
}
else
{
@@ -122,10 +122,10 @@
if ((tag.getId() != null) && nestedComponents.containsKey(container))
{
// Make sure you handle nested auto-components properly
- MarkupContainer parent = (MarkupContainer)nestedComponents.get(container);
+ MarkupContainer< ? > parent = nestedComponents.get(container);
while (parent != null)
{
- Component component = parent.get(tag.getId());
+ Component< ? > component = parent.get(tag.getId());
if (component != null)
{
component.render(markupStream);
@@ -135,7 +135,7 @@
parent = parent.getParent();
if (nestedComponents.containsKey(parent))
{
- parent = (MarkupContainer)nestedComponents.get(parent);
+ parent = nestedComponents.get(parent);
}
}
}
@@ -156,7 +156,8 @@
* in case the component could not be created
*/
// Wicket is current not using any bean util jar, which is why ...
- private final Component createComponent(final MarkupContainer container, final WicketTag tag)
+ private final Component< ? > createComponent(final MarkupContainer< ? > container,
+ final WicketTag tag)
{
// If no component name is given, create a page-unique one yourself.
String componentId = tag.getNameAttribute();
@@ -174,63 +175,63 @@
// construct the component. It must have a constructor with a single
// String (componentId) parameter.
- final Component component;
+ final Component< ? > component;
try
{
// Load the class. In case a Groovy Class Resolver has been provided,
// the name might be a Groovy file.
// Note: Spring based components are not supported this way. May be we
// should provide a ComponentFactory like we provide a PageFactory.
- final Class componentClass = container.getSession().getClassResolver().resolveClass(
- classname);
+ final Class< ? > componentClass = container.getSession()
+ .getClassResolver()
+ .resolveClass(classname);
- final Constructor constructor = componentClass
- .getConstructor(new Class[] { String.class });
- component = (Component)constructor.newInstance(new Object[] { componentId });
+ final Constructor< ? > constructor = componentClass.getConstructor(new Class[] { String.class });
+ component = (Component< ? >)constructor.newInstance(new Object[] { componentId });
}
catch (ClassNotFoundException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
catch (NoSuchMethodException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
catch (InvocationTargetException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
catch (IllegalAccessException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
catch (InstantiationException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
catch (ClassCastException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
catch (SecurityException e)
{
throw new MarkupException("Unable to create Component from wicket tag: Cause: " +
- e.getMessage());
+ e.getMessage());
}
// Get all remaining attributes and invoke the component's setters
- Iterator iter = tag.getAttributes().entrySet().iterator();
+ Iterator<Map.Entry<String, String>> iter = tag.getAttributes().entrySet().iterator();
while (iter.hasNext())
{
- final Map.Entry entry = (Map.Entry)iter.next();
- final String key = (String)entry.getKey();
- final String value = (String)entry.getValue();
+ final Map.Entry<String, String> entry = iter.next();
+ final String key = entry.getKey();
+ final String value = entry.getValue();
// Ignore attributes 'name' and 'class'
if ("name".equalsIgnoreCase(key) || ("class".equalsIgnoreCase(key)))
@@ -253,7 +254,7 @@
* @param locale
*/
private final void invokeSetter(final Object object, final String name, final String value,
- final Locale locale)
+ final Locale locale)
{
// Note: tag attributes are maintained in a LowerCaseKeyValueMap, thus
// 'name' will be all lowercase.
@@ -278,49 +279,49 @@
if (method == null)
{
throw new MarkupException("Unable to initialize Component. Method with name " +
- methodName + " not found");
+ methodName + " not found");
}
// The method must have a single parameter
- final Class[] parameterClasses = method.getParameterTypes();
+ final Class< ? >[] parameterClasses = method.getParameterTypes();
if (parameterClasses.length != 1)
{
throw new MarkupException("Unable to initialize Component. Method with name " +
- methodName + " must have one and only one parameter");
+ methodName + " must have one and only one parameter");
}
// Convert the parameter if necessary, depending on the setter's
// attribute
- final Class paramClass = parameterClasses[0];
+ final Class< ? > paramClass = parameterClasses[0];
try
{
final IConverter converter = Application.get().getConverterLocator().getConverter(
- paramClass);
+ paramClass);
final Object param = converter.convertToObject(value, locale);
if (param == null)
{
throw new MarkupException("Unable to convert value '" + value + "' into " +
- paramClass + ". May be there is no converter for that type registered?");
+ paramClass + ". May be there is no converter for that type registered?");
}
method.invoke(object, new Object[] { param });
}
catch (IllegalAccessException ex)
{
throw new MarkupException(
- "Unable to initialize Component. Failure while invoking method " + methodName +
- ". Cause: " + ex);
+ "Unable to initialize Component. Failure while invoking method " + methodName +
+ ". Cause: " + ex);
}
catch (InvocationTargetException ex)
{
throw new MarkupException(
- "Unable to initialize Component. Failure while invoking method " + methodName +
- ". Cause: " + ex);
+ "Unable to initialize Component. Failure while invoking method " + methodName +
+ ". Cause: " + ex);
}
catch (NumberFormatException ex)
{
throw new MarkupException(
- "Unable to initialize Component. Failure while invoking method " + methodName +
- ". Cause: " + ex);
+ "Unable to initialize Component. Failure while invoking method " + methodName +
+ ". Cause: " + ex);
}
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Wed Apr 9 15:28:24 2008
@@ -82,8 +82,8 @@
* the attribute to replace the value of
* @return a new auto component or null if the path was absolute
*/
- protected final Component newPackageResourceReferenceAutoComponent(
- final MarkupContainer container, final String autoId, final PathInfo pathInfo,
+ protected final Component< ? > newPackageResourceReferenceAutoComponent(
+ final MarkupContainer< ? > container, final String autoId, final PathInfo pathInfo,
final String attribute)
{
if (!pathInfo.absolute && (pathInfo.path != null) && (pathInfo.path.length() > 0))
@@ -96,12 +96,11 @@
// header has been added to (e.g. the Page). What we need
// however, is the component (e.g. a Panel) which
// contributed it.
- Class clazz = container.getMarkupStream().getContainerClass();
+ Class< ? extends Component< ? >> clazz = container.getMarkupStream()
+ .getContainerClass();
- // However if the markup stream is a merged markup stream
- // (inheritance),
- // than we need the class of the markup file which contained the
- // tag.
+ // However if the markup stream is a merged markup stream (inheritance), than we
+ // need the class of the markup file which contained the tag.
if (container.getMarkupStream().getTag().getMarkupClass() != null)
{
clazz = container.getMarkupStream().getTag().getMarkupClass();
@@ -154,8 +153,9 @@
* @param parameters
* @param anchor
*/
- public AutolinkBookmarkablePageLink(final String id, final Class pageClass,
- final PageParameters parameters, final String anchor)
+ public AutolinkBookmarkablePageLink(final String id,
+ final Class< ? extends Page> pageClass, final PageParameters parameters,
+ final String anchor)
{
super(id, pageClass, parameters);
this.anchor = anchor;
@@ -165,6 +165,7 @@
/**
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
*/
+ @Override
public boolean isTransparentResolver()
{
return true;
@@ -174,6 +175,7 @@
*
* @see org.apache.wicket.markup.html.link.BookmarkablePageLink#getURL()
*/
+ @Override
protected CharSequence getURL()
{
CharSequence url = super.getURL();
@@ -205,7 +207,7 @@
* @return a new auto component or null in case this method couldn't resolve to a proper
* auto component
*/
- Component newAutoComponent(final MarkupContainer container, final String autoId,
+ Component< ? > newAutoComponent(final MarkupContainer< ? > container, final String autoId,
final PathInfo pathInfo);
}
@@ -371,7 +373,7 @@
* Set of supported extensions for creating bookmarkable page links. Anything that is not in
* this list will be handled as a resource reference.
*/
- private final Set supportedPageExtensions = new HashSet(4);
+ private final Set<String> supportedPageExtensions = new HashSet<String>(4);
/**
* Construct.
@@ -390,8 +392,8 @@
* @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
* java.lang.String, org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
*/
- public Component newAutoComponent(final MarkupContainer container, final String autoId,
- PathInfo pathInfo)
+ public Component< ? > newAutoComponent(final MarkupContainer< ? > container,
+ final String autoId, PathInfo pathInfo)
{
if ((pathInfo.extension != null) &&
supportedPageExtensions.contains(pathInfo.extension))
@@ -413,7 +415,7 @@
try
{
- final Class clazz = defaultClassResolver.resolveClass(className);
+ final Class< ? extends Page> clazz = (Class< ? extends Page>)defaultClassResolver.resolveClass(className);
return new AutolinkBookmarkablePageLink(autoId, clazz, pathInfo.pageParameters,
pathInfo.anchor);
}
@@ -424,7 +426,7 @@
}
// Make sure base markup pages (inheritance) are handled correct
- MarkupContainer parentWithContainer = container;
+ MarkupContainer< ? > parentWithContainer = container;
if (container.getParent() != null)
{
parentWithContainer = container.findParentWithAssociatedMarkup();
@@ -490,6 +492,7 @@
/**
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
*/
+ @Override
public boolean isTransparentResolver()
{
return true;
@@ -519,7 +522,7 @@
* component resolution to their parent components. Reason: autolink tags don't have wicket:id
* and users wouldn't know where to add the component to.
*/
- private final static class ResourceReferenceAutolink extends WebMarkupContainer
+ private final static class ResourceReferenceAutolink extends WebMarkupContainer<Object>
{
private static final long serialVersionUID = 1L;
@@ -534,8 +537,8 @@
* @param href
* @param attribute
*/
- public ResourceReferenceAutolink(final String id, final Class clazz, final String href,
- final String attribute)
+ public ResourceReferenceAutolink(final String id, final Class< ? > clazz,
+ final String href, final String attribute)
{
super(id);
@@ -557,6 +560,7 @@
/**
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
*/
+ @Override
public boolean isTransparentResolver()
{
return true;
@@ -569,6 +573,7 @@
* the component tag
* @see org.apache.wicket.Component#onComponentTag(ComponentTag)
*/
+ @Override
protected final void onComponentTag(final ComponentTag tag)
{
// Default handling for tag
@@ -609,8 +614,8 @@
* @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
* java.lang.String, org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
*/
- public Component newAutoComponent(final MarkupContainer container, final String autoId,
- final PathInfo pathInfo)
+ public Component< ? > newAutoComponent(final MarkupContainer< ? > container,
+ final String autoId, final PathInfo pathInfo)
{
return newPackageResourceReferenceAutoComponent(container, autoId, pathInfo, attribute);
}
@@ -665,13 +670,13 @@
* Autolink resolver delegates for constructing new autolinks reference keyed on tag name (such
* as <script> or <a>.
*/
- private final Map tagNameToAutolinkResolverDelegates = new HashMap();
+ private final Map<String, IAutolinkResolverDelegate> tagNameToAutolinkResolverDelegates = new HashMap<String, IAutolinkResolverDelegate>();
/**
* Resolver objects that know what attribute to read for getting the reference keyed on tag name
* (such as <script> or <a>.
*/
- private final Map tagNameToTagReferenceResolvers = new HashMap();
+ private final Map<String, ITagReferenceResolver> tagNameToTagReferenceResolvers = new HashMap<String, ITagReferenceResolver>();
/**
* Construct.
@@ -724,7 +729,7 @@
*/
public final IAutolinkResolverDelegate getAutolinkResolverDelegate(final String tagName)
{
- return (IAutolinkResolverDelegate)tagNameToAutolinkResolverDelegates.get(tagName);
+ return tagNameToAutolinkResolverDelegates.get(tagName);
}
/**
@@ -741,8 +746,8 @@
* The container parsing its markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public final boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public final boolean resolve(final MarkupContainer< ? > container,
+ final MarkupStream markupStream, final ComponentTag tag)
{
// Must be marked as autolink tag
if (tag.isAutolinkEnabled())
@@ -750,7 +755,7 @@
// Try to find the Page matching the href
// Note: to not use tag.getId() because it will be modified while
// resolving the link and hence the 2nd render will fail.
- final Component link = resolveAutomaticLink(container,
+ final Component< ? > link = resolveAutomaticLink(container,
WicketLinkTagHandler.AUTOLINK_ID, tag);
// Add the link to the container
@@ -783,8 +788,8 @@
* the component tag
* @return A BookmarkablePageLink to handle the href
*/
- private final Component resolveAutomaticLink(final MarkupContainer container, final String id,
- final ComponentTag tag)
+ private final Component< ? > resolveAutomaticLink(final MarkupContainer< ? > container,
+ final String id, final ComponentTag tag)
{
final Page page = container.getPage();
@@ -803,7 +808,7 @@
}
// get the reference resolver
- ITagReferenceResolver referenceResolver = (ITagReferenceResolver)tagNameToTagReferenceResolvers.get(tagName);
+ ITagReferenceResolver referenceResolver = tagNameToTagReferenceResolvers.get(tagName);
if (referenceResolver == null)
{
// fallback on default
@@ -817,8 +822,8 @@
// create the path info object
PathInfo pathInfo = new PathInfo(reference);
// now get the resolver delegate
- IAutolinkResolverDelegate autolinkResolverDelegate = (IAutolinkResolverDelegate)tagNameToAutolinkResolverDelegates.get(tagName);
- Component autoComponent = null;
+ IAutolinkResolverDelegate autolinkResolverDelegate = tagNameToAutolinkResolverDelegates.get(tagName);
+ Component< ? > autoComponent = null;
if (autolinkResolverDelegate != null)
{
autoComponent = autolinkResolverDelegate.newAutoComponent(container, autoId, pathInfo);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/BorderBodyResolver.java Wed Apr 9 15:28:24 2008
@@ -58,8 +58,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// Must be wicket:body
if (tag instanceof WicketTag)
@@ -69,7 +69,7 @@
{
// Find the border parent. There must not be a body container in
// between
- MarkupContainer parent = container.getParent();
+ MarkupContainer< ? > parent = container.getParent();
while (parent != null)
{
if (parent instanceof Border.BorderBodyContainer)
@@ -78,20 +78,20 @@
}
else if (parent instanceof Border)
{
- Component component = parent.get(tag.getId());
+ Component< ? > component = parent.get(tag.getId());
if (component != null)
{
component.render(markupStream);
log.warn("Please consider to change your java code to " +
- "something like: " + container.getId() +
- ".add(getBodyContainer()); for the component hierarchy to " +
- "better reflect the markup hierarchy. For example, say that " +
- "you have a border class in which you do: " +
- "\'WebMarkupContainer div = new " +
- "WebMarkupContainer(\"roundDiv\"); add(div);\' you should " +
- "now do \'add(div); div.add(getBodyContainer());\'. " +
- "Please fix this before Wicket 1.4");
+ "something like: " + container.getId() +
+ ".add(getBodyContainer()); for the component hierarchy to " +
+ "better reflect the markup hierarchy. For example, say that " +
+ "you have a border class in which you do: " +
+ "\'WebMarkupContainer div = new " +
+ "WebMarkupContainer(\"roundDiv\"); add(div);\' you should " +
+ "now do \'add(div); div.add(getBodyContainer());\'. " +
+ "Please fix this before Wicket 1.4");
}
return true;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java Wed Apr 9 15:28:24 2008
@@ -41,7 +41,7 @@
* @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(final MarkupContainer container, final MarkupStream markupStream,
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
final ComponentTag tag)
{
if ((tag instanceof WicketTag) && ((WicketTag)tag).isEnclosureTag())
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java Wed Apr 9 15:28:24 2008
@@ -56,8 +56,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// If <wicket:...>
if (tag instanceof WicketTag)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java Wed Apr 9 15:28:24 2008
@@ -65,16 +65,16 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// Only <head> component tags have the id == "_header"
if (tag.getId().equals(HtmlHeaderSectionHandler.HEADER_ID))
{
// Create a special header component which will gather additional
// input the <head> from 'contributors'.
- final WebMarkupContainer header = new HtmlHeaderContainer(
- HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
+ final WebMarkupContainer< ? > header = new HtmlHeaderContainer(
+ HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
container.autoAdd(header, markupStream);
// Yes, we handled the tag
@@ -89,18 +89,19 @@
{
// Create a special header component which will gather
// additional input the <head> from 'contributors'.
- final MarkupContainer header = new HtmlHeaderContainer(
- HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
+ final MarkupContainer< ? > header = new HtmlHeaderContainer(
+ HtmlHeaderSectionHandler.HEADER_ID + container.getPage().getAutoIndex());
// It is <wicket:head>. Because they do not provide any
// additional functionality they are merely a means of surrounding relevant
// markup. Thus we simply create a WebMarkupContainer to handle
// the tag.
- final WebMarkupContainer header2 = new WebMarkupContainer(
- HtmlHeaderSectionHandler.HEADER_ID)
+ final WebMarkupContainer< ? > header2 = new WebMarkupContainer<Object>(
+ HtmlHeaderSectionHandler.HEADER_ID)
{
private static final long serialVersionUID = 1L;
+ @Override
public boolean isTransparentResolver()
{
return true;
@@ -119,11 +120,12 @@
// additional functionality there are merely a means of surrounding
// relevant markup. Thus we simply create a WebMarkupContainer to handle
// the tag.
- final WebMarkupContainer header = new WebMarkupContainer(
- HtmlHeaderSectionHandler.HEADER_ID)
+ final WebMarkupContainer< ? > header = new WebMarkupContainer<Object>(
+ HtmlHeaderSectionHandler.HEADER_ID)
{
private static final long serialVersionUID = 1L;
+ @Override
public boolean isTransparentResolver()
{
return true;
@@ -138,15 +140,15 @@
catch (IllegalArgumentException ex)
{
throw new WicketRuntimeException("If the root exception says something like "
- + "\"A child with id '_header' already exists\" "
- + "then you most likely forgot to override autoAdd() "
- + "in your bordered page component.", ex);
+ + "\"A child with id '_header' already exists\" "
+ + "then you most likely forgot to override autoAdd() "
+ + "in your bordered page component.", ex);
}
}
else
{
throw new MarkupException(
- "Mis-placed <wicket:head>. <wicket:head> must be outside of <wicket:panel> and <wicket:border>");
+ "Mis-placed <wicket:head>. <wicket:head> must be outside of <wicket:panel> and <wicket:border>");
}
// Yes, we handled the tag
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java Wed Apr 9 15:28:24 2008
@@ -51,8 +51,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// It must be <wicket:...>
if (tag instanceof WicketTag)
@@ -81,7 +81,7 @@
/**
* This is a WebMarkupContainer, except that it is transparent for it child components.
*/
- private static class TransparentWebMarkupContainer extends WebMarkupContainer
+ private static class TransparentWebMarkupContainer extends WebMarkupContainer<Object>
{
private static final long serialVersionUID = 1L;
@@ -96,6 +96,7 @@
/**
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
*/
+ @Override
public boolean isTransparentResolver()
{
return true;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java Wed Apr 9 15:28:24 2008
@@ -40,8 +40,8 @@
* @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
* MarkupStream, ComponentTag)
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// Ignore special tags like _panel, _border, _extend etc.
if ((tag instanceof WicketTag) || tag.isAutoComponentTag())
@@ -49,14 +49,14 @@
return false;
}
- MarkupContainer parent = container;
+ MarkupContainer< ? > parent = container;
while ((parent != null) && (parent.isTransparentResolver()))
{
// Try to find the component with the parent component.
parent = parent.getParent();
if (parent != null)
{
- Component component = parent.get(tag.getId());
+ Component< ? > component = parent.get(tag.getId());
if (component != null)
{
component.render(markupStream);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java Wed Apr 9 15:28:24 2008
@@ -96,12 +96,12 @@
* @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(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// Try to find the component with the parent component.
final String id = tag.getId();
- MarkupContainer parent = container;
+ MarkupContainer< ? > parent = container;
while (!(parent instanceof Page) && !(parent instanceof Panel) && (parent != null))
{
@@ -111,7 +111,7 @@
return false;
}
- final Component component = parent.get(id);
+ final Component< ? > component = parent.get(id);
if ((component != null) && (component instanceof IScopedComponent))
{
IScopedComponent sc = (IScopedComponent)component;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java Wed Apr 9 15:28:24 2008
@@ -84,8 +84,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
// this is only here so we register wicket:container tag, this resolver
// does not actually do anything special to the tag
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java Wed Apr 9 15:28:24 2008
@@ -48,8 +48,8 @@
* The current component tag while parsing the markup
* @return true, if componentId was handle by the resolver. False, otherwise
*/
- public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
- final ComponentTag tag)
+ public boolean resolve(final MarkupContainer< ? > container, final MarkupStream markupStream,
+ final ComponentTag tag)
{
if (tag instanceof WicketTag)
{
@@ -57,13 +57,14 @@
if (wtag.isLinkTag() && (wtag.getNamespace() != null))
{
final String id = tag.getId() + container.getPage().getAutoIndex();
- final Component component = new WebMarkupContainer(id)
+ final Component< ? > component = new WebMarkupContainer<Object>(id)
{
private static final long serialVersionUID = 1L;
/**
* @see org.apache.wicket.MarkupContainer#isTransparentResolver()
*/
+ @Override
public boolean isTransparentResolver()
{
return true;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java Wed Apr 9 15:28:24 2008
@@ -35,10 +35,13 @@
* @see org.apache.wicket.markup.transformer.ITransformer
*
* @author Juergen Donnerstag
+ *
+ * @param <T>
+ * The model data type
*/
-public abstract class AbstractOutputTransformerContainer extends MarkupContainer
- implements
- ITransformer
+public abstract class AbstractOutputTransformerContainer<T> extends MarkupContainer<T>
+ implements
+ ITransformer
{
private static final long serialVersionUID = 1L;
@@ -60,7 +63,7 @@
*
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractOutputTransformerContainer(final String id, final IModel model)
+ public AbstractOutputTransformerContainer(final String id, final IModel<T> model)
{
super(id, model);
}
@@ -73,7 +76,7 @@
* If true, only the body is applied to transformation.
* @return this
*/
- public MarkupContainer setTransformBodyOnly(final boolean value)
+ public MarkupContainer<T> setTransformBodyOnly(final boolean value)
{
transformBodyOnly = value;
return this;
@@ -95,15 +98,16 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public abstract CharSequence transform(final Component component, final CharSequence output)
- throws Exception;
+ public abstract CharSequence transform(final Component< ? > component, final CharSequence output)
+ throws Exception;
/**
* @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
+ @Override
protected final void onComponentTagBody(final MarkupStream markupStream,
- final ComponentTag openTag)
+ final ComponentTag openTag)
{
if (transformBodyOnly == true)
{
@@ -113,7 +117,7 @@
{
// Invoke default execution
AbstractOutputTransformerContainer.super.onComponentTagBody(markupStream,
- openTag);
+ openTag);
}
});
}
@@ -126,6 +130,7 @@
/**
* @see org.apache.wicket.Component#onRender(MarkupStream)
*/
+ @Override
protected final void onRender(final MarkupStream markupStream)
{
if (transformBodyOnly == false)
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Wed Apr 9 15:28:24 2008
@@ -60,7 +60,8 @@
* @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)
+ @Override
+ public void onComponentTag(final Component< ? > component, final ComponentTag tag)
{
tag.put("xmlns:wicket", "http://wicket.apache.org");
@@ -83,7 +84,8 @@
/**
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
- public void onRendered(final Component component)
+ @Override
+ public void onRendered(final Component< ? > component)
{
final RequestCycle requestCycle = RequestCycle.get();
@@ -109,6 +111,7 @@
/**
* @see org.apache.wicket.behavior.AbstractBehavior#cleanup()
*/
+ @Override
public void cleanup()
{
webResponse = null;
@@ -118,7 +121,8 @@
* @see org.apache.wicket.behavior.AbstractBehavior#onException(org.apache.wicket.Component,
* java.lang.RuntimeException)
*/
- public void onException(Component component, RuntimeException exception)
+ @Override
+ public void onException(Component< ? > component, RuntimeException exception)
{
if (webResponse != null)
{
@@ -132,6 +136,6 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public abstract CharSequence transform(final Component component, final CharSequence output)
- throws Exception;
+ public abstract CharSequence transform(final Component< ? > component, final CharSequence output)
+ throws Exception;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java Wed Apr 9 15:28:24 2008
@@ -37,5 +37,6 @@
* @return The output which will be appended to the original response
* @throws Exception
*/
- CharSequence transform(final Component component, final CharSequence output) throws Exception;
+ CharSequence transform(final Component< ? > component, final CharSequence output)
+ throws Exception;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java Wed Apr 9 15:28:24 2008
@@ -24,8 +24,10 @@
* all.
*
* @author Juergen Donnerstag
+ * @param <T>
+ * The model data type
*/
-public class NoopOutputTransformerContainer extends AbstractOutputTransformerContainer
+public class NoopOutputTransformerContainer<T> extends AbstractOutputTransformerContainer<T>
{
private static final long serialVersionUID = 1L;
@@ -44,7 +46,7 @@
*
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public NoopOutputTransformerContainer(final String id, final IModel model)
+ public NoopOutputTransformerContainer(final String id, final IModel<T> model)
{
super(id, model);
}
@@ -54,7 +56,8 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public CharSequence transform(final Component component, final CharSequence output)
+ @Override
+ public CharSequence transform(final Component< ? > component, final CharSequence output)
{
return output;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java Wed Apr 9 15:28:24 2008
@@ -37,8 +37,10 @@
* @see org.apache.wicket.markup.transformer.XsltTransformerBehavior
*
* @author Juergen Donnerstag
+ * @param <T>
+ * The model data type
*/
-public class XsltOutputTransformerContainer extends AbstractOutputTransformerContainer
+public class XsltOutputTransformerContainer<T> extends AbstractOutputTransformerContainer<T>
{
private static final long serialVersionUID = 1L;
@@ -58,8 +60,8 @@
* @param xslFilePath
* XSL input file path
*/
- public XsltOutputTransformerContainer(final String id, final IModel model,
- final String xslFilePath)
+ public XsltOutputTransformerContainer(final String id, final IModel<T> model,
+ final String xslFilePath)
{
super(id);
@@ -72,7 +74,8 @@
// Make the XSLT processor happy and allow him to handle the wicket
// tags and attributes which are in the wicket namespace
- add(new AttributeModifier("xmlns:wicket", true, new Model("http://wicket.apache.org")));
+ add(new AttributeModifier("xmlns:wicket", true, new Model<String>(
+ "http://wicket.apache.org")));
}
/**
@@ -84,7 +87,7 @@
* the model (unused)
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public XsltOutputTransformerContainer(final String id, final IModel model)
+ public XsltOutputTransformerContainer(final String id, final IModel<T> model)
{
this(id, model, null);
}
@@ -105,6 +108,7 @@
*
* @see org.apache.wicket.MarkupContainer#getMarkupType()
*/
+ @Override
public String getMarkupType()
{
return "xsl";
@@ -115,8 +119,9 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public CharSequence transform(final Component component, final CharSequence output)
- throws Exception
+ @Override
+ public CharSequence transform(final Component< ? > component, final CharSequence output)
+ throws Exception
{
return new XsltTransformer(this.xslFile).transform(component, output);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java Wed Apr 9 15:28:24 2008
@@ -51,7 +51,7 @@
*/
public XsltTransformer()
{
- this.xslFile = null;
+ xslFile = null;
}
/**
@@ -85,15 +85,15 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public CharSequence transform(final Component component, final CharSequence output)
- throws Exception
+ public CharSequence transform(final Component< ? > component, final CharSequence output)
+ throws Exception
{
IResourceStream resourceStream = getResourceStream(component);
if (resourceStream == null)
{
throw new FileNotFoundException("Unable to find XSLT resource for " +
- component.toString());
+ component.toString());
}
try
@@ -104,14 +104,14 @@
// 2. Use the TransformerFactory to process the stylesheet Source
// and
// generate a Transformer.
- Transformer transformer = tFactory.newTransformer(new StreamSource(resourceStream
- .getInputStream()));
+ Transformer transformer = tFactory.newTransformer(new StreamSource(
+ resourceStream.getInputStream()));
// 3. Use the Transformer to transform an XML Source and send the
// output to a Result object.
StringWriter writer = new StringWriter();
transformer.transform(new StreamSource(new StringReader(output.toString())),
- new StreamResult(writer));
+ new StreamResult(writer));
return writer.getBuffer();
}
@@ -128,21 +128,24 @@
*
* @return The XSLT file resource stream
*/
- private IResourceStream getResourceStream(final Component component)
+ private IResourceStream getResourceStream(final Component< ? > component)
{
final IResourceStream resourceStream;
- String filePath = this.xslFile;
+ String filePath = xslFile;
if (filePath == null)
{
- filePath = component.findParentWithAssociatedMarkup().getClass().getPackage().getName()
- .replace('.', '/') +
- "/" + component.getId();
+ filePath = component.findParentWithAssociatedMarkup()
+ .getClass()
+ .getPackage()
+ .getName()
+ .replace('.', '/') +
+ "/" + component.getId();
}
resourceStream = Application.get().getResourceSettings().getResourceStreamLocator().locate(
- getClass(), filePath, component.getStyle(), component.getLocale(),
- XsltTransformer.extension);
+ getClass(), filePath, component.getStyle(), component.getLocale(),
+ XsltTransformer.extension);
return resourceStream;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java Wed Apr 9 15:28:24 2008
@@ -54,7 +54,7 @@
*/
public XsltTransformerBehavior()
{
- this.xslFile = null;
+ xslFile = null;
}
/**
@@ -63,14 +63,15 @@
*/
public XsltTransformerBehavior(final String xslFilePath)
{
- this.xslFile = xslFilePath;
+ xslFile = xslFilePath;
}
/**
* @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)
+ @Override
+ public void onComponentTag(final Component< ? > component, final ComponentTag tag)
{
tag.put("xmlns:wicket", "http://wicket.apache.org");
@@ -83,21 +84,23 @@
* @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
* CharSequence)
*/
- public CharSequence transform(final Component component, final CharSequence output)
- throws Exception
+ @Override
+ public CharSequence transform(final Component< ? > component, final CharSequence output)
+ throws Exception
{
- return new XsltTransformer(this.xslFile).transform(component, output);
+ return new XsltTransformer(xslFile).transform(component, output);
}
/**
* @see org.apache.wicket.behavior.AbstractBehavior#bind(org.apache.wicket.Component)
*/
- public void bind(final Component component)
+ @Override
+ public void bind(final Component< ? > component)
{
if (component instanceof Page)
{
throw new WicketRuntimeException(
- "You can not attach a XstlTransformerBehavior to a Page. It can be attached to any other component.");
+ "You can not attach a XstlTransformerBehavior to a Page. It can be attached to any other component.");
}
super.bind(component);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java Wed Apr 9 15:28:24 2008
@@ -61,7 +61,7 @@
* Not used for this implementation (see {@link org.apache.wicket.Session})
* @return The string resource value or null if resource not found
*/
- public final String loadStringResource(final Class clazz, final String key, Locale locale,
+ public final String loadStringResource(final Class< ? > clazz, final String key, Locale locale,
final String style)
{
if (locale == null)
@@ -89,7 +89,7 @@
* The key to obtain the string for
* @return The string resource value or null if resource not found
*/
- public final String loadStringResource(final Component component, final String key)
+ public final String loadStringResource(final Component< ? > component, final String key)
{
final Locale locale = (component != null) ? component.getLocale() : null;
return loadStringResource(null, key, locale, null);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java Wed Apr 9 15:28:24 2008
@@ -19,6 +19,7 @@
import java.lang.ref.WeakReference;
import java.util.Locale;
+import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
@@ -37,7 +38,7 @@
public class ClassStringResourceLoader extends ComponentStringResourceLoader
{
/** The application we are loading for. */
- private final WeakReference/* <Class<? extends Application>> */clazzRef;
+ private final WeakReference<Class< ? extends Application>> clazzRef;
/**
* Create and initialize the resource loader.
@@ -45,35 +46,37 @@
* @param clazz
* The class that this resource loader is associated with
*/
- public ClassStringResourceLoader(final Class/* <? extends Application> */clazz)
+ public ClassStringResourceLoader(final Class< ? extends Application> clazz)
{
if (clazz == null)
{
throw new IllegalArgumentException("Parameter 'clazz' must not be null");
}
- clazzRef = new WeakReference(clazz);
+ clazzRef = new WeakReference<Class< ? extends Application>>(clazz);
}
/**
* @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(java.lang.Class,
* java.lang.String, java.util.Locale, java.lang.String)
*/
- public String loadStringResource(final Class clazz, final String key, final Locale locale,
- final String style)
+ @Override
+ public String loadStringResource(final Class< ? > clazz, final String key, final Locale locale,
+ final String style)
{
- return super.loadStringResource((Class)clazzRef.get(), key, locale, style);
+ return super.loadStringResource(clazzRef.get(), key, locale, style);
}
/**
* @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(org.apache.wicket.Component,
* java.lang.String)
*/
- public String loadStringResource(Component component, String key)
+ @Override
+ public String loadStringResource(Component< ? > component, String key)
{
if (component == null)
{
return loadStringResource(null, key, Session.get().getLocale(), Session.get()
- .getStyle());
+ .getStyle());
}
return super.loadStringResource(component, key);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java Wed Apr 9 15:28:24 2008
@@ -110,7 +110,7 @@
* @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(java.lang.Class,
* java.lang.String, java.util.Locale, java.lang.String)
*/
- public String loadStringResource(Class clazz, final String key, final Locale locale,
+ public String loadStringResource(Class< ? > clazz, final String key, final Locale locale,
final String style)
{
if (clazz == null)
@@ -170,7 +170,7 @@
* @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(org.apache.wicket.Component,
* java.lang.String)
*/
- public String loadStringResource(final Component component, final String key)
+ public String loadStringResource(final Component< ? > component, final String key)
{
if (component == null)
{
@@ -188,12 +188,12 @@
// The reason why we need to create that stack is because we need to
// walk it downwards starting with Page down to the Component
- List searchStack = getComponentStack(component);
+ List<Class< ? >> searchStack = getComponentStack(component);
// Walk the component hierarchy down from page to the component
for (int i = searchStack.size() - 1; (i >= 0) && (string == null); i--)
{
- Class clazz = (Class)searchStack.get(i);
+ Class< ? > clazz = searchStack.get(i);
// First, try the fully qualified resource name relative to the
// component on the path from page down.
@@ -226,16 +226,16 @@
* The component to evaluate
* @return The stack of classes
*/
- private List getComponentStack(final Component component)
+ private List<Class< ? >> getComponentStack(final Component< ? > component)
{
// Build the search stack
- final List searchStack = new ArrayList();
+ final List<Class< ? >> searchStack = new ArrayList<Class< ? >>();
searchStack.add(component.getClass());
if (!(component instanceof Page))
{
// Add all the component on the way to the Page
- MarkupContainer container = component.getParent();
+ MarkupContainer< ? > container = component.getParent();
while (container != null)
{
searchStack.add(container.getClass());
@@ -258,9 +258,9 @@
* The class to check
* @return Whether to stop the search
*/
- protected boolean isStopResourceSearch(final Class clazz)
+ protected boolean isStopResourceSearch(final Class< ? > clazz)
{
- if (clazz == null || clazz.equals(Object.class) || clazz.equals(Application.class))
+ if ((clazz == null) || clazz.equals(Object.class) || clazz.equals(Application.class))
{
return true;
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/IStringResourceLoader.java Wed Apr 9 15:28:24 2008
@@ -63,7 +63,7 @@
* {@link org.apache.wicket.Session})
* @return The string resource value or null if the resource could not be loaded by this loader
*/
- String loadStringResource(Class clazz, String key, Locale locale, String style);
+ String loadStringResource(Class< ? > clazz, String key, Locale locale, String style);
/**
* Get the string resource for the given combination of component and resource key. The
@@ -77,5 +77,5 @@
* The key should be a String containing a lookup key into a resource bundle
* @return The string resource value or null if the resource could not be loaded by this loader
*/
- String loadStringResource(Component component, String key);
+ String loadStringResource(Component< ? > component, String key);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IPageSettings.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IPageSettings.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IPageSettings.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/IPageSettings.java Wed Apr 9 15:28:24 2008
@@ -45,7 +45,7 @@
* @see AutoComponentResolver for an example
* @return List of ComponentResolvers
*/
- List getComponentResolvers();
+ List<IComponentResolver> getComponentResolvers();
/**
* Gets whether Wicket should try to support opening multiple windows for the same session
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java Wed Apr 9 15:28:24 2008
@@ -31,7 +31,7 @@
public class ClassCryptFactory implements ICryptFactory
{
private static final Logger log = LoggerFactory.getLogger(ClassCryptFactory.class);
- private final WeakReference/* <Class> */cryptClass;
+ private final WeakReference<Class< ? >> cryptClass;
private final String encryptionKey;
/**
@@ -42,7 +42,7 @@
* @param encryptionKey
* encryption key
*/
- public ClassCryptFactory(Class cryptClass, String encryptionKey)
+ public ClassCryptFactory(Class< ? > cryptClass, String encryptionKey)
{
if (cryptClass == null)
{
@@ -54,7 +54,7 @@
throw new IllegalArgumentException("cryptClass must implement ICrypt interface");
}
- this.cryptClass = new WeakReference(cryptClass);
+ this.cryptClass = new WeakReference<Class< ? >>(cryptClass);
this.encryptionKey = encryptionKey;
}
@@ -65,7 +65,7 @@
{
try
{
- ICrypt crypt = (ICrypt)((Class)cryptClass.get()).newInstance();
+ ICrypt crypt = (ICrypt)(cryptClass.get()).newInstance();
log.info("using encryption/decryption object " + crypt);
crypt.setKey(encryptionKey);
return crypt;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java?rev=646570&r1=646569&r2=646570&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java Wed Apr 9 15:28:24 2008
@@ -66,7 +66,7 @@
try
{
// Initialize and add a security provider required for encryption
- final Class clazz = Classes.resolveClass("com.sun.crypto.provider.SunJCE");
+ final Class< ? > clazz = Classes.resolveClass("com.sun.crypto.provider.SunJCE");
Security.addProvider((Provider)clazz.newInstance());
}
@@ -90,8 +90,9 @@
* @return the input crypted. Null in case of an error
* @throws GeneralSecurityException
*/
+ @Override
protected final byte[] crypt(final byte[] input, final int mode)
- throws GeneralSecurityException
+ throws GeneralSecurityException
{
SecretKey key = generateSecretKey();
PBEParameterSpec spec = new PBEParameterSpec(salt, COUNT);
@@ -113,7 +114,7 @@
* invalid encryption key
*/
private final SecretKey generateSecretKey() throws NoSuchAlgorithmException,
- InvalidKeySpecException
+ InvalidKeySpecException
{
final PBEKeySpec spec = new PBEKeySpec(getKey().toCharArray());
return SecretKeyFactory.getInstance(CRYPT_METHOD).generateSecret(spec);