[jboss-cvs] JBossAS SVN: r69900 - in projects/microcontainer/trunk/spring-int/src: tests/org/jboss/test/spring/support and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 18 13:15:48 EST 2008
Author: adrian at jboss.org
Date: 2008-02-18 13:15:48 -0500 (Mon, 18 Feb 2008)
New Revision: 69900
Modified:
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringPlainValueHandler.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/StringEntryValueInterceptor.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTest.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTestDelegate.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTest.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTest.java
projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTestDelegate.java
Log:
Source code tidyup in the spring project
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringPlainValueHandler.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringPlainValueHandler.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringPlainValueHandler.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -37,7 +37,7 @@
public class SpringPlainValueHandler extends PlainValueHandler
{
/** The interceptor */
- public static final SpringPlainValueHandler HANDLER = new SpringPlainValueHandler();
+ public static final SpringPlainValueHandler SPRING_PLAIN_VALUE_HANDLER = new SpringPlainValueHandler();
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
{
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringSchemaBindingHelper.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -105,7 +105,7 @@
// here value only takes simple type
public static void initValueHandler(TypeBinding typeBinding)
{
- typeBinding.setHandler(SpringPlainValueHandler.HANDLER);
+ typeBinding.setHandler(SpringPlainValueHandler.SPRING_PLAIN_VALUE_HANDLER);
// value can take characters
typeBinding.setSimpleType(PlainValueCharactersHandler.HANDLER);
}
@@ -145,7 +145,7 @@
typeBinding.pushInterceptor(SpringSchemaBinding.refQName, EntryValueInterceptor.INTERCEPTOR);
// entry has value
- typeBinding.pushInterceptor(SpringSchemaBinding.valueQName, StringEntryValueInterceptor.INTERCEPTOR);
+ typeBinding.pushInterceptor(SpringSchemaBinding.valueQName, StringEntryValueInterceptor.STRING_ENTRY_VALUE_INTERCEPTOR);
// entry can take a list
typeBinding.pushInterceptor(SpringSchemaBinding.listQName, EntryValueInterceptor.INTERCEPTOR);
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/StringEntryValueInterceptor.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/StringEntryValueInterceptor.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/StringEntryValueInterceptor.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -34,7 +34,7 @@
public class StringEntryValueInterceptor extends EntryValueInterceptor
{
/** The interceptor */
- public static final StringEntryValueInterceptor INTERCEPTOR = new StringEntryValueInterceptor();
+ public static final StringEntryValueInterceptor STRING_ENTRY_VALUE_INTERCEPTOR = new StringEntryValueInterceptor();
public void add(Object parent, Object child, QName name)
{
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/support/SimpleBean.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -34,9 +34,9 @@
private int x;
private double y;
private String s;
- private List mylist;
- private Set myset;
- private Map mymap;
+ private List<?> mylist;
+ private Set<?> myset;
+ private Map<?,?> mymap;
private OldBean refBean;
public SimpleBean()
@@ -65,32 +65,32 @@
return s;
}
- public List getMylist()
+ public List<?> getMylist()
{
return mylist;
}
- public void setMylist(List mylist)
+ public void setMylist(List<?> mylist)
{
this.mylist = mylist;
}
- public Set getMyset()
+ public Set<?> getMyset()
{
return myset;
}
- public void setMyset(Set myset)
+ public void setMyset(Set<?> myset)
{
this.myset = myset;
}
- public Map getMymap()
+ public Map<?,?> getMymap()
{
return mymap;
}
- public void setMymap(Map mymap)
+ public void setMymap(Map<?,?> mymap)
{
this.mymap = mymap;
}
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTest.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTest.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -40,7 +40,7 @@
* @return the lazy delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new LazyTempSpringMicrocontainerTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTestDelegate.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/LazyTempSpringMicrocontainerTestDelegate.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -31,7 +31,7 @@
*/
public class LazyTempSpringMicrocontainerTestDelegate extends TempSpringMicrocontainerTestDelegate
{
- public LazyTempSpringMicrocontainerTestDelegate(Class clazz) throws Exception
+ public LazyTempSpringMicrocontainerTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTest.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTest.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -42,7 +42,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new TempSpringMicrocontainerTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -33,7 +33,7 @@
*/
public class TempSpringMicrocontainerTestDelegate extends MicrocontainerTestDelegate
{
- public TempSpringMicrocontainerTestDelegate(Class clazz) throws Exception
+ public TempSpringMicrocontainerTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTest.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTest.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTest.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -42,7 +42,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new TempSpringSchemaTestDelegate(clazz);
}
Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTestDelegate.java 2008-02-18 18:13:40 UTC (rev 69899)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringSchemaTestDelegate.java 2008-02-18 18:15:48 UTC (rev 69900)
@@ -31,7 +31,7 @@
public class TempSpringSchemaTestDelegate extends IoCTestDelegate
{
- public TempSpringSchemaTestDelegate(Class clazz)
+ public TempSpringSchemaTestDelegate(Class<?> clazz)
{
super(clazz);
}
More information about the jboss-cvs-commits
mailing list