#5692 Generics and warnings cleanup: TestClassesSerializable

svn changeset:15378/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index bebb629aa81abef3833ee6e19b4fa6304984ccd1..f7beafb9270cc53b6fb25b1945a00dc7f2df55dc 100644 (file)
--- a/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -63,7 +63,7 @@ public class TestClassesSerializable extends TestCase {
             classes.addAll(findServerClasses(location));\r
         }\r
 \r
-        List<Class> nonSerializableClasses = new ArrayList<Class>();\r
+        ArrayList<Class<?>> nonSerializableClasses = new ArrayList<Class<?>>();\r
         for (String className : classes) {\r
             Class<?> cls = Class.forName(className);\r
             // skip annotations and synthetic classes\r
@@ -82,7 +82,7 @@ public class TestClassesSerializable extends TestCase {
         // interfaces\r
         if (!nonSerializableClasses.isEmpty()) {\r
             String nonSerializableString = "";\r
-            Iterator<Class> it = nonSerializableClasses.iterator();\r
+            Iterator<Class<?>> it = nonSerializableClasses.iterator();\r
             nonSerializableString = it.next().getName();\r
             while (it.hasNext()) {\r
                 nonSerializableString += ", " + it.next().getName();\r
@@ -146,7 +146,7 @@ public class TestClassesSerializable extends TestCase {
             classes = findClassesInJar(file);\r
         } else {\r
             System.out.println("Ignoring " + classpathEntry);\r
-            return Collections.EMPTY_LIST;\r
+            return Collections.emptyList();\r
         }\r
 \r
         List<String> filteredClasses = new ArrayList<String>();\r
@@ -212,7 +212,7 @@ public class TestClassesSerializable extends TestCase {
             String parentPackage, File parent) {\r
         if (parent.isHidden()\r
                 || parent.getPath().contains(File.separator + ".")) {\r
-            return Collections.EMPTY_LIST;\r
+            return Collections.emptyList();\r
         }\r
 \r
         if (parentPackage == null) {\r