[Jamon-checkins] SF.net SVN: jamon: [1898] trunk/jamon/integration/src/org/jamon/integration

[<iro...@us...>]

Revision: 1898
Author:   iroberts
Date:     2006-08-19 14:24:20 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/jamon/?rev=1898&view=rev

Log Message:
-----------
Clean up warnings

Modified Paths:
--------------
    trunk/jamon/integration/src/org/jamon/integration/TemplateDescriberTest.java
    trunk/jamon/integration/src/org/jamon/integration/TemplateInspectorTest.java
    trunk/jamon/integration/src/org/jamon/integration/TestBase.java
Modified: trunk/jamon/integration/src/org/jamon/integration/TemplateDescriberTest.java
===================================================================
--- trunk/jamon/integration/src/org/jamon/integration/TemplateDescriberTest.java	2006-08-19 21:16:10 UTC (rev 1897)
+++ trunk/jamon/integration/src/org/jamon/integration/TemplateDescriberTest.java	2006-08-19 21:24:20 UTC (rev 1898)
@@ -70,14 +70,14 @@
     public void testFragmentUnitIntrospection()
         throws Exception
     {
-        List fragmentUnitIntfs =
+        List<FragmentArgument> fragmentUnitIntfs =
             m_describer.getTemplateDescription(
                 "/test/jamon/ClassOnly", null, null)
             .getFragmentInterfaces();
 
         assertEquals(2, fragmentUnitIntfs.size());
-        FragmentArgument f2 = (FragmentArgument) fragmentUnitIntfs.get(0);
-        FragmentArgument f1 = (FragmentArgument) fragmentUnitIntfs.get(1);
+        FragmentArgument f2 = fragmentUnitIntfs.get(0);
+        FragmentArgument f1 = fragmentUnitIntfs.get(1);
 
         assertEquals("f1", f1.getName());
         assertEquals("f2", f2.getName());
@@ -89,11 +89,11 @@
     public void testMethodUnitIntrospection()
         throws Exception
     {
-        Map methods = m_describer
+        Map<String, MethodUnit> methods = m_describer
             .getTemplateDescription("/test/jamon/ClassOnly", null, null)
             .getMethodUnits();
         assertEquals(1, methods.size());
-        MethodUnit method = (MethodUnit) methods.get("m");
+        MethodUnit method = methods.get("m");
 
         assertNotNull(method);
         assertEquals("m", method.getName());
@@ -120,13 +120,16 @@
                 "test/jamon/ClassOnly", null, null).getGenericParamsCount());
     }
 
-    private void checkArgs(Iterator p_args, String[] p_names, String[] p_types)
+    private void checkArgs(
+        Iterator<? extends AbstractArgument> p_args,
+        String[] p_names,
+        String[] p_types)
     {
         assertEquals(p_names.length, p_types.length);
         for (int i = 0; i < p_names.length; i++)
         {
             assertTrue(p_args.hasNext());
-            AbstractArgument a = (AbstractArgument) p_args.next();
+            AbstractArgument a = p_args.next();
             assertEquals(p_names[i], a.getName());
             assertEquals(p_types[i], a.getType());
         }
@@ -135,11 +138,11 @@
 
     private void checkFragArgArgs(FragmentArgument f, String[] p_names)
     {
-        Iterator args = f.getFragmentUnit().getRequiredArgs();
+        Iterator<RequiredArgument> args = f.getFragmentUnit().getRequiredArgs();
         for (int i = 0; i < p_names.length; i++)
         {
             assertTrue(args.hasNext());
-            RequiredArgument a = (RequiredArgument) args.next();
+            RequiredArgument a = args.next();
             assertEquals(p_names[i], a.getName());
             assertNull(a.getType());
         }

Modified: trunk/jamon/integration/src/org/jamon/integration/TemplateInspectorTest.java
===================================================================
--- trunk/jamon/integration/src/org/jamon/integration/TemplateInspectorTest.java	2006-08-19 21:16:10 UTC (rev 1897)
+++ trunk/jamon/integration/src/org/jamon/integration/TemplateInspectorTest.java	2006-08-19 21:24:20 UTC (rev 1898)
@@ -31,7 +31,7 @@
     {
         TemplateInspector inspector =
             new TemplateInspector("/test/jamon/Grandchild");
-        List args = inspector.getRequiredArgumentNames();
+        List<String> args = inspector.getRequiredArgumentNames();
         assertEquals(5, args.size());
         assertEquals("i", args.get(0));
         assertEquals("j", args.get(1));

Modified: trunk/jamon/integration/src/org/jamon/integration/TestBase.java
===================================================================
--- trunk/jamon/integration/src/org/jamon/integration/TestBase.java	2006-08-19 21:16:10 UTC (rev 1897)
+++ trunk/jamon/integration/src/org/jamon/integration/TestBase.java	2006-08-19 21:24:20 UTC (rev 1898)
@@ -142,7 +142,7 @@
         }
         catch(ParserErrors e)
         {
-            Iterator errors = e.getErrors();
+            Iterator<ParserError> errors = e.getErrors();
             assertTrue(errors.hasNext());
             assertEquals(
                 new ParserError(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.