Deleting unnecessary TODOs and suppressing warnings.

org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java

@@ -121,12 +121,10 @@ public class ImportAwareTests {
 	static class BPP implements BeanFactoryAware, BeanPostProcessor {
 
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-			// TODO Auto-generated method stub
 			return bean;
 		}
 
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-			// TODO Auto-generated method stub
 			return bean;
 		}
 

org.springframework.context/src/test/java/test/beans/Colour.java

@@ -17,13 +17,10 @@ package test.beans;
 
 import org.springframework.core.enums.ShortCodedLabeledEnum;
 
-
 /**
- * TODO: JAVADOC
- * 
  * @author Rob Harrop
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "deprecation" })
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");

org.springframework.context/src/test/java/test/beans/CustomScope.java

@@ -21,7 +21,6 @@ import java.util.Map;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.Scope;
 
-
 /**
  * Simple scope implementation which creates object based on a flag.
  *
@@ -34,11 +33,6 @@ public class CustomScope implements Scope {
 
 	private Map<String, Object> beans = new HashMap<String, Object>();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#get(java.lang.String,
-	 * org.springframework.beans.factory.ObjectFactory)
-	 */
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		if (createNewScope) {
 			beans.clear();
@@ -56,33 +50,19 @@ public class CustomScope implements Scope {
 		return beans.get(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#getConversationId()
-	 */
 	public String getConversationId() {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#registerDestructionCallback(java.lang.String,
-	 * java.lang.Runnable)
-	 */
 	public void registerDestructionCallback(String name, Runnable callback) {
 		// do nothing
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#remove(java.lang.String)
-	 */
 	public Object remove(String name) {
 		return beans.remove(name);
 	}
 
 	public Object resolveContextualObject(String key) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 

org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java

@@ -15,9 +15,8 @@
  */
 package test.beans;
 
-
-/** TODO: JAVADOC */
 public class DependsOnTestBean {
+
 	public TestBean tb;
 
 	private int state;

org.springframework.context/src/test/java/test/beans/INestedTestBean.java

@@ -15,8 +15,6 @@
  */
 package test.beans;
 
-
-/** TODO: JAVADOC */
 public interface INestedTestBean {
 
 	String getCompany();

org.springframework.context/src/test/java/test/beans/IOther.java

@@ -15,8 +15,6 @@
  */
 package test.beans;
 
-
-/** TODO: JAVADOC */
 public interface IOther {
 
 	void absquatulate();

org.springframework.context/src/test/java/test/beans/IndexedTestBean.java

@@ -27,8 +27,6 @@ import java.util.TreeSet;
 
 
 /**
- * TODO: JAVADOC
- * 
  * @author Juergen Hoeller
  * @since 11.11.2003
  */