Author: jdonnerstag
Date: Sun Jan 23 09:22:53 2011
New Revision: 1062350
URL: http://svn.apache.org/viewvc?rev=1062350&view=rev
Log:
let eclipse do a final cleanup. No functional change
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
Sun Jan 23 09:22:53 2011
@@ -36,7 +36,7 @@ import org.springframework.context.Appli
* {
* public ApplicationContext getSpringContext()
* {
- * //MyApplication is the subclass of WebApplication used by the
application
+ * // MyApplication is the subclass of WebApplication used by the
application
* return ((MyApplication)Application.get()).getContext();
* }
* }
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
Sun Jan 23 09:22:53 2011
@@ -182,8 +182,8 @@ public class SpringBeanLocator implement
* @param name
* @return BeanDefinition
*/
- private BeanDefinition
getBeanDefinition(ConfigurableListableBeanFactory beanFactory,
- String name)
+ private BeanDefinition getBeanDefinition(final
ConfigurableListableBeanFactory beanFactory,
+ final String name)
{
if (beanFactory.containsBeanDefinition(name))
{
@@ -192,7 +192,7 @@ public class SpringBeanLocator implement
else
{
BeanFactory parent = beanFactory.getParentBeanFactory();
- if (parent != null && parent instanceof
ConfigurableListableBeanFactory)
+ if ((parent != null) && (parent instanceof
ConfigurableListableBeanFactory))
{
return
getBeanDefinition((ConfigurableListableBeanFactory)parent, name);
}
@@ -244,7 +244,7 @@ public class SpringBeanLocator implement
{
final ApplicationContext context = getSpringContext();
- if (beanName != null && beanName.length() > 0)
+ if ((beanName != null) && (beanName.length() > 0))
{
return lookupSpringBean(context, beanName,
getBeanType());
}
@@ -274,7 +274,7 @@ public class SpringBeanLocator implement
*/
public final String getBeanName()
{
- if (beanName == null || "".equals(beanName))
+ if ((beanName == null) || "".equals(beanName))
{
beanName = getBeanNameOfClass(getSpringContext(),
getBeanType());
}
@@ -301,7 +301,7 @@ public class SpringBeanLocator implement
* @throws IllegalStateException
* @return found bean
*/
- private final Object lookupSpringBean(ApplicationContext ctx, Class<?>
clazz)
+ private final Object lookupSpringBean(final ApplicationContext ctx,
final Class<?> clazz)
{
return lookupSpringBean(ctx, getBeanNameOfClass(ctx, clazz),
clazz);
}
@@ -319,7 +319,8 @@ public class SpringBeanLocator implement
* @throws IllegalStateException
* @return found bean
*/
- private static Object lookupSpringBean(ApplicationContext ctx, String
name, Class<?> clazz)
+ private static Object lookupSpringBean(final ApplicationContext ctx,
final String name,
+ final Class<?> clazz)
{
try
{
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
Sun Jan 23 09:22:53 2011
@@ -30,20 +30,21 @@ import org.springframework.web.context.s
/**
* Base class for spring aware wicket web application object. This class has
helper methods to
- * create lazy init proxies based on spring beans, as well as an
implementation of {@link
- * ISpringContextLocator}.
+ * create lazy init proxies based on spring beans, as well as an
implementation of
+ * {@link ISpringContextLocator}.
*
* @deprecated when using java5 it is preferrable to use {@link SpringBean}
annotations for
- * injection rather then this spring-specific application subclass with
its helpers. To setup
- * {@link SpringBean} add the following line to your {@link
WebApplication} subclass init method
- * <code>addComponentInstantiationListener(new
SpringComponentInjector(this));</code>
+ * injection rather then this spring-specific application subclass
with its helpers. To
+ * setup {@link SpringBean} add the following line to your {@link
WebApplication}
+ * subclass init method
+ * <code>addComponentInstantiationListener(new
SpringComponentInjector(this));</code>
*
* @author Igor Vaynberg (ivaynberg)
*/
@Deprecated
public abstract class SpringWebApplication extends WebApplication
- implements
- ApplicationContextAware
+ implements
+ ApplicationContextAware
{
private ApplicationContext applicationContext;
@@ -90,10 +91,10 @@ public abstract class SpringWebApplicati
/**
* @see
org.springframework.context.ApplicationContextAware#setApplicationContext(org.
- * springframework.context.ApplicationContext)
+ * springframework.context.ApplicationContext)
*/
- public final void setApplicationContext(ApplicationContext
applicationContext)
- throws BeansException
+ public final void setApplicationContext(final ApplicationContext
applicationContext)
+ throws BeansException
{
this.applicationContext = applicationContext;
}
@@ -125,28 +126,27 @@ public abstract class SpringWebApplicati
* Creates a proxy for a spring bean that is safe to put into session
and serialize
*
* @param clazz
- * class of spring bean
+ * class of spring bean
* @param beanName
- * name of spring bean
+ * name of spring bean
* @return proxy representing the spring bean
*/
- protected Object createSpringBeanProxy(Class< ? > clazz, String
beanName)
+ protected Object createSpringBeanProxy(final Class<?> clazz, final
String beanName)
{
return LazyInitProxyFactory.createProxy(clazz, new
SpringBeanLocator(beanName, clazz,
- getSpringContextLocator()));
+ getSpringContextLocator()));
}
/**
* Creates a proxy for a spring bean that is safe to put into session
and serialize
*
* @param clazz
- * class of spring bean
+ * class of spring bean
* @return proxy representing the spring bean
*/
- protected Object createSpringBeanProxy(Class< ? > clazz)
+ protected Object createSpringBeanProxy(final Class<?> clazz)
{
return LazyInitProxyFactory.createProxy(clazz, new
SpringBeanLocator(clazz,
- getSpringContextLocator()));
+ getSpringContextLocator()));
}
-
}
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Sun Jan 23 09:22:53 2011
@@ -105,7 +105,7 @@ public class SpringWebApplicationFactory
* @param filter
* @return location of context config
*/
- protected final String getContextConfigLocation(WicketFilter filter)
+ protected final String getContextConfigLocation(final WicketFilter
filter)
{
return
filter.getFilterConfig().getInitParameter("contextConfigLocation");
}
@@ -124,7 +124,7 @@ public class SpringWebApplicationFactory
/**
* @see IWebApplicationFactory#createApplication(WicketFilter)
*/
- public WebApplication createApplication(WicketFilter filter)
+ public WebApplication createApplication(final WicketFilter filter)
{
ServletContext sc =
filter.getFilterConfig().getServletContext();
@@ -139,7 +139,7 @@ public class SpringWebApplicationFactory
return createApplication((additionalContext != null) ?
additionalContext : ac, beanName);
}
- private WebApplication createApplication(ApplicationContext ac, String
beanName)
+ private WebApplication createApplication(final ApplicationContext ac,
final String beanName)
{
if (beanName != null)
{
@@ -181,7 +181,7 @@ public class SpringWebApplicationFactory
* @throws BeansException
*/
protected final ConfigurableWebApplicationContext
createWebApplicationContext(
- WebApplicationContext parent, WicketFilter filter) throws
BeansException
+ final WebApplicationContext parent, final WicketFilter filter)
throws BeansException
{
ConfigurableWebApplicationContext wac = newApplicationContext();
wac.setParent(parent);
@@ -203,14 +203,14 @@ public class SpringWebApplicationFactory
* @param filter
* wicket filter
*/
- protected void
postProcessWebApplicationContext(ConfigurableWebApplicationContext wac,
- WicketFilter filter)
+ protected void postProcessWebApplicationContext(final
ConfigurableWebApplicationContext wac,
+ final WicketFilter filter)
{
// noop
}
/** {@inheritDoc} */
- public void destroy(WicketFilter filter)
+ public void destroy(final WicketFilter filter)
{
if (additionalContext != null)
{
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
Sun Jan 23 09:22:53 2011
@@ -82,7 +82,7 @@ public class AnnotProxyFieldValueFactory
* @param contextLocator
* spring context locator
*/
- public AnnotProxyFieldValueFactory(ISpringContextLocator contextLocator)
+ public AnnotProxyFieldValueFactory(final ISpringContextLocator
contextLocator)
{
this(contextLocator, true);
}
@@ -94,7 +94,8 @@ public class AnnotProxyFieldValueFactory
* whether or not wicket should wrap dependencies with
specialized proxies that can
* be safely serialized. in most cases this should be set to
true.
*/
- public AnnotProxyFieldValueFactory(ISpringContextLocator
contextLocator, boolean wrapInProxies)
+ public AnnotProxyFieldValueFactory(final ISpringContextLocator
contextLocator,
+ final boolean wrapInProxies)
{
if (contextLocator == null)
{
@@ -104,7 +105,7 @@ public class AnnotProxyFieldValueFactory
this.wrapInProxies = wrapInProxies;
}
- public Object getFieldValue(Field field, Object fieldOwner)
+ public Object getFieldValue(final Field field, final Object fieldOwner)
{
if (supportsField(field))
{
@@ -171,7 +172,7 @@ public class AnnotProxyFieldValueFactory
* @throws IllegalStateException
* @return spring name of the bean
*/
- private final String getBeanNameOfClass(ApplicationContext ctx,
Class<?> clazz)
+ private final String getBeanNameOfClass(final ApplicationContext ctx,
final Class<?> clazz)
{
// get the list of all possible matching beans
List<String> names = new ArrayList<String>(
@@ -235,8 +236,8 @@ public class AnnotProxyFieldValueFactory
}
}
- private BeanDefinition
getBeanDefinition(ConfigurableListableBeanFactory beanFactory,
- String name)
+ private BeanDefinition getBeanDefinition(final
ConfigurableListableBeanFactory beanFactory,
+ final String name)
{
if (beanFactory.containsBeanDefinition(name))
{
@@ -245,7 +246,7 @@ public class AnnotProxyFieldValueFactory
else
{
BeanFactory parent = beanFactory.getParentBeanFactory();
- if (parent != null && parent instanceof
ConfigurableListableBeanFactory)
+ if ((parent != null) && (parent instanceof
ConfigurableListableBeanFactory))
{
return
getBeanDefinition((ConfigurableListableBeanFactory)parent, name);
}
@@ -256,11 +257,10 @@ public class AnnotProxyFieldValueFactory
}
}
-
/**
* @see
org.apache.wicket.injection.IFieldValueFactory#supportsField(java.lang.reflect.Field)
*/
- public boolean supportsField(Field field)
+ public boolean supportsField(final Field field)
{
return field.isAnnotationPresent(SpringBean.class);
}
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
Sun Jan 23 09:22:53 2011
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* @author Igor Vaynberg (ivaynberg)
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target( {/* ElementType.METHOD, */ElementType.FIELD })
+@Target({/* ElementType.METHOD, */ElementType.FIELD })
@Documented
public @interface SpringBean {
/**
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
Sun Jan 23 09:22:53 2011
@@ -67,12 +67,12 @@ public class SpringComponentInjector ext
* @param webapp
* wicket web application
*/
- public SpringComponentInjector(WebApplication webapp)
+ public SpringComponentInjector(final WebApplication webapp)
{
// locate application context through spring's default location
// mechanism and pass it on to the proper constructor
- this(webapp,
WebApplicationContextUtils.getRequiredWebApplicationContext(webapp
- .getServletContext()));
+ this(webapp,
+
WebApplicationContextUtils.getRequiredWebApplicationContext(webapp.getServletContext()));
}
/**
@@ -83,7 +83,7 @@ public class SpringComponentInjector ext
* @param ctx
* spring's application context
*/
- public SpringComponentInjector(WebApplication webapp,
ApplicationContext ctx)
+ public SpringComponentInjector(final WebApplication webapp, final
ApplicationContext ctx)
{
this(webapp, ctx, true);
}
@@ -100,8 +100,8 @@ public class SpringComponentInjector ext
* whether or not wicket should wrap dependencies with
specialized proxies that can
* be safely serialized. in most cases this should be set to
true.
*/
- public SpringComponentInjector(WebApplication webapp,
ApplicationContext ctx,
- boolean wrapInProxies)
+ public SpringComponentInjector(final WebApplication webapp, final
ApplicationContext ctx,
+ final boolean wrapInProxies)
{
if (webapp == null)
{
@@ -121,18 +121,17 @@ public class SpringComponentInjector ext
/** {@inheritDoc} */
@Override
- public void inject(Object object)
+ public void inject(final Object object)
{
inject(object, fieldValueFactory);
}
/** {@inheritDoc} */
- public void onInstantiation(Component component)
+ public void onInstantiation(final Component component)
{
inject(component);
}
-
/**
* This is a holder for the application context. The reason we need a
holder is that metadata
* only supports storing serializable objects but application context
is not. The holder acts as
@@ -154,7 +153,7 @@ public class SpringComponentInjector ext
*
* @param context
*/
- public ApplicationContextHolder(ApplicationContext context)
+ public ApplicationContextHolder(final ApplicationContext
context)
{
this.context = context;
}
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
Sun Jan 23 09:22:53 2011
@@ -60,12 +60,12 @@ public class ApplicationContextMock impl
* @param name
* @param bean
*/
- public void putBean(String name, Object bean)
+ public void putBean(final String name, final Object bean)
{
if (beans.containsKey(name))
{
throw new IllegalArgumentException("a bean with name ["
+ name +
- "] has already been added to the
context");
+ "] has already been added to the context");
}
beans.put(name, bean);
}
@@ -75,7 +75,7 @@ public class ApplicationContextMock impl
*
* @param bean
*/
- public void putBean(Object bean)
+ public void putBean(final Object bean)
{
putBean(bean.getClass().getName(), bean);
}
@@ -83,7 +83,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#getBean(java.lang.String)
*/
- public Object getBean(String name) throws BeansException
+ public Object getBean(final String name) throws BeansException
{
Object bean = beans.get(name);
if (bean == null)
@@ -96,7 +96,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#getBean(java.lang.String,
java.lang.Class)
*/
- public Object getBean(String name, Class requiredType) throws
BeansException
+ public Object getBean(final String name, final Class requiredType)
throws BeansException
{
Object bean = getBean(name);
if (!(requiredType.isAssignableFrom(bean.getClass())))
@@ -109,7 +109,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class)
*/
- public Map getBeansOfType(Class type) throws BeansException
+ public Map getBeansOfType(final Class type) throws BeansException
{
Map found = new HashMap();
@@ -152,7 +152,7 @@ public class ApplicationContextMock impl
* @see org.springframework.context.ApplicationContext#publishEvent(org.
* springframework.context.ApplicationEvent)
*/
- public void publishEvent(ApplicationEvent event)
+ public void publishEvent(final ApplicationEvent event)
{
throw new UnsupportedOperationException();
}
@@ -161,7 +161,7 @@ public class ApplicationContextMock impl
* @see org.springframework.beans.factory.ListableBeanFactory#
* containsBeanDefinition(java.lang.String)
*/
- public boolean containsBeanDefinition(String beanName)
+ public boolean containsBeanDefinition(final String beanName)
{
throw new UnsupportedOperationException();
}
@@ -186,7 +186,7 @@ public class ApplicationContextMock impl
* @see org.springframework.beans.factory.ListableBeanFactory#
* getBeanNamesForType(java.lang.Class)
*/
- public String[] getBeanNamesForType(Class type)
+ public String[] getBeanNamesForType(final Class type)
{
ArrayList names = new ArrayList();
for (Entry<String, Object> entry : beans.entrySet())
@@ -205,8 +205,8 @@ public class ApplicationContextMock impl
* @see org.springframework.beans.factory.ListableBeanFactory#
* getBeanNamesForType(java.lang.Class, boolean, boolean)
*/
- public String[] getBeanNamesForType(Class type, boolean
includePrototypes,
- boolean includeFactoryBeans)
+ public String[] getBeanNamesForType(final Class type, final boolean
includePrototypes,
+ final boolean includeFactoryBeans)
{
throw new UnsupportedOperationException();
}
@@ -215,8 +215,8 @@ public class ApplicationContextMock impl
* @see
org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class,
* boolean, boolean)
*/
- public Map getBeansOfType(Class type, boolean includePrototypes,
boolean includeFactoryBeans)
- throws BeansException
+ public Map getBeansOfType(final Class type, final boolean
includePrototypes,
+ final boolean includeFactoryBeans) throws BeansException
{
throw new UnsupportedOperationException();
}
@@ -224,7 +224,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#containsBean(java.lang. String)
*/
- public boolean containsBean(String name)
+ public boolean containsBean(final String name)
{
return beans.containsKey(name);
}
@@ -232,7 +232,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#isSingleton(java.lang. String)
*/
- public boolean isSingleton(String name) throws
NoSuchBeanDefinitionException
+ public boolean isSingleton(final String name) throws
NoSuchBeanDefinitionException
{
return true;
}
@@ -240,7 +240,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#getType(java.lang.String)
*/
- public Class getType(String name) throws NoSuchBeanDefinitionException
+ public Class getType(final String name) throws
NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
}
@@ -248,7 +248,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#getAliases(java.lang. String)
*/
- public String[] getAliases(String name) throws
NoSuchBeanDefinitionException
+ public String[] getAliases(final String name) throws
NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
}
@@ -265,7 +265,8 @@ public class ApplicationContextMock impl
* @see
org.springframework.context.MessageSource#getMessage(java.lang.String,
* java.lang.Object[], java.lang.String, java.util.Locale)
*/
- public String getMessage(String code, Object[] args, String
defaultMessage, Locale locale)
+ public String getMessage(final String code, final Object[] args, final
String defaultMessage,
+ final Locale locale)
{
throw new UnsupportedOperationException();
}
@@ -274,8 +275,8 @@ public class ApplicationContextMock impl
* @see
org.springframework.context.MessageSource#getMessage(java.lang.String,
* java.lang.Object[], java.util.Locale)
*/
- public String getMessage(String code, Object[] args, Locale locale)
- throws NoSuchMessageException
+ public String getMessage(final String code, final Object[] args, final
Locale locale)
+ throws NoSuchMessageException
{
throw new UnsupportedOperationException();
}
@@ -284,8 +285,8 @@ public class ApplicationContextMock impl
* @see
org.springframework.context.MessageSource#getMessage(org.springframework
* .context.MessageSourceResolvable, java.util.Locale)
*/
- public String getMessage(MessageSourceResolvable resolvable, Locale
locale)
- throws NoSuchMessageException
+ public String getMessage(final MessageSourceResolvable resolvable,
final Locale locale)
+ throws NoSuchMessageException
{
throw new UnsupportedOperationException();
}
@@ -294,7 +295,7 @@ public class ApplicationContextMock impl
* @see
org.springframework.core.io.support.ResourcePatternResolver#getResources
* (java.lang.String)
*/
- public Resource[] getResources(String locationPattern) throws
IOException
+ public Resource[] getResources(final String locationPattern) throws
IOException
{
throw new UnsupportedOperationException();
}
@@ -302,7 +303,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
*/
- public Resource getResource(String location)
+ public Resource getResource(final String location)
{
throw new UnsupportedOperationException();
}
@@ -319,7 +320,7 @@ public class ApplicationContextMock impl
* @see org.springframework.beans.factory.HierarchicalBeanFactory#
* containsLocalBean(java.lang.String)
*/
- public boolean containsLocalBean(String arg0)
+ public boolean containsLocalBean(final String arg0)
{
throw new UnsupportedOperationException();
}
@@ -345,7 +346,7 @@ public class ApplicationContextMock impl
* @see
org.springframework.beans.factory.BeanFactory#getBean(java.lang.String,
* java.lang.Object[])
*/
- public Object getBean(String name, Object[] args) throws BeansException
+ public Object getBean(final String name, final Object[] args) throws
BeansException
{
throw new UnsupportedOperationException();
@@ -354,7 +355,7 @@ public class ApplicationContextMock impl
/**
* @see
org.springframework.beans.factory.BeanFactory#isPrototype(java.lang.String)
*/
- public boolean isPrototype(String name) throws
NoSuchBeanDefinitionException
+ public boolean isPrototype(final String name) throws
NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
}
@@ -363,7 +364,8 @@ public class ApplicationContextMock impl
* @see
org.springframework.beans.factory.BeanFactory#isTypeMatch(java.lang.String,
* java.lang.Class)
*/
- public boolean isTypeMatch(String name, Class targetType) throws
NoSuchBeanDefinitionException
+ public boolean isTypeMatch(final String name, final Class targetType)
+ throws NoSuchBeanDefinitionException
{
throw new UnsupportedOperationException();
}
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/SpringContextLocatorMock.java
Sun Jan 23 09:22:53 2011
@@ -37,7 +37,7 @@ public class SpringContextLocatorMock im
*
* @param context
*/
- public SpringContextLocatorMock(ApplicationContext context)
+ public SpringContextLocatorMock(final ApplicationContext context)
{
this.context = context;
}
Modified:
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
(original)
+++
wicket/trunk/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
Sun Jan 23 09:22:53 2011
@@ -33,7 +33,7 @@ public class SpringBeanLocatorTest exten
/**
* @param name
*/
- public SpringBeanLocatorTest(String name)
+ public SpringBeanLocatorTest(final String name)
{
super(name);
}
@@ -71,8 +71,8 @@ public class SpringBeanLocatorTest exten
ctx.putBean("bean", bean);
- SpringBeanLocator locator = (SpringBeanLocator)WicketObjects
- .cloneObject(new SpringBeanLocator(Bean.class,
ctxLocator));
+ SpringBeanLocator locator =
(SpringBeanLocator)WicketObjects.cloneObject(new SpringBeanLocator(
+ Bean.class, ctxLocator));
assertNotNull(locator.locateProxyTarget());
}
@@ -137,8 +137,8 @@ public class SpringBeanLocatorTest exten
Bean bean = new Bean();
ctx.putBean("bean", bean);
- SpringBeanLocator locator = (SpringBeanLocator)WicketObjects
- .cloneObject(new SpringBeanLocator("bean",
Bean.class, ctxLocator));
+ SpringBeanLocator locator =
(SpringBeanLocator)WicketObjects.cloneObject(new SpringBeanLocator(
+ "bean", Bean.class, ctxLocator));
assertNotNull(locator.locateProxyTarget());
}
@@ -167,7 +167,7 @@ public class SpringBeanLocatorTest exten
{
try
{
- SpringBeanLocator locator = new SpringBeanLocator(null,
ctxLocator);
+ new SpringBeanLocator(null, ctxLocator);
fail();
}
catch (IllegalArgumentException e)
@@ -177,7 +177,7 @@ public class SpringBeanLocatorTest exten
try
{
- SpringBeanLocator locator = new
SpringBeanLocator(Bean.class, null);
+ new SpringBeanLocator(Bean.class, null);
fail();
}
catch (IllegalArgumentException e)
@@ -210,7 +210,7 @@ public class SpringBeanLocatorTest exten
{
SpringBeanLocator a = new SpringBeanLocator("bean",
SpringBeanLocator.class, ctxLocator);
SpringBeanLocator aprime = new SpringBeanLocator("bean",
SpringBeanLocator.class,
- ctxLocator);
+ ctxLocator);
SpringBeanLocator b = new SpringBeanLocator("bean2",
SpringBeanLocator.class, ctxLocator);
SpringBeanLocator c = new SpringBeanLocator("bean",
SpringBeanLocatorTest.class, ctxLocator);
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java?rev=1062350&r1=1062349&r2=1062350&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
Sun Jan 23 09:22:53 2011
@@ -1248,6 +1248,10 @@ public final class Strings
{
return ((StringBuffer)s).indexOf(searchString, pos);
}
+ else if (s instanceof StringBuilder)
+ {
+ return ((StringBuilder)s).indexOf(searchString, pos);
+ }
else if (s instanceof AppendingStringBuffer)
{
return ((AppendingStringBuffer)s).indexOf(searchString,
pos);
