incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r430818 [8/9] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-api/src/test/java/org/apache/myfaces/trinida...
Date Fri, 11 Aug 2006 16:25:11 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/NullViewHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/NullViewHandler.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/NullViewHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/NullViewHandler.java Fri Aug 11 09:24:50 2006
@@ -24,42 +24,49 @@
 
 public class NullViewHandler extends ViewHandler
 {
+  @Override
   public Locale calculateLocale(FacesContext context)
   {
     return null;
   }
 
+  @Override
   public String calculateRenderKitId(FacesContext context)
   {
     return null;
   }
   
+  @Override
   public UIViewRoot createView(FacesContext context, String viewId)
   {
     return null;
   }
 
+  @Override
   public String getActionURL(FacesContext context, String viewId)
   {
     return viewId;
   }
 
+  @Override
   public String getResourceURL(FacesContext context, String path)
   {
     return path;
   }
 
-
+  @Override
   public void renderView(FacesContext context, UIViewRoot viewToRender)
         throws IOException, FacesException
   {
   }
 
+  @Override
   public UIViewRoot restoreView(FacesContext context, String viewId)
   {
     return null;
   }
 
+  @Override
   public void writeState(FacesContext context) throws IOException
   {
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/TestInternalView.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/TestInternalView.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/TestInternalView.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/TestInternalView.java Fri Aug 11 09:24:50 2006
@@ -30,6 +30,7 @@
   {
   }
 
+  @Override
   public UIViewRoot createView(FacesContext context, String viewId)
   {
     ViewHandlerImplTest.__internalViewCalled = "create";
@@ -39,6 +40,7 @@
   /**
    * Restores the UIViewRoot;  return null if no view should be returned.
    */
+  @Override
   public UIViewRoot restoreView(FacesContext context, String viewId)
   {
     ViewHandlerImplTest.__internalViewCalled = "restore";
@@ -48,6 +50,7 @@
   /**
    * Renders the view.
    */
+  @Override
   public void renderView(
     FacesContext context, 
     UIViewRoot   viewToRender) throws IOException, FacesException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImplTest.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImplTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImplTest.java Fri Aug 11 09:24:50 2006
@@ -32,11 +32,13 @@
     super(testName);
   }
   
+  @Override
   public void setUp()
   {
     super.setUp();
   }
   
+  @Override
   public void tearDown()
   {
     super.tearDown();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageFlowScopeProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageFlowScopeProvider.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageFlowScopeProvider.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageFlowScopeProvider.java Fri Aug 11 09:24:50 2006
@@ -23,24 +23,27 @@
 
 public class TestPageFlowScopeProvider extends PageFlowScopeProvider
 {
-  public Map getPageFlowScope(FacesContext context)
+  @Override
+  public Map<String, Object> getPageFlowScope(FacesContext context)
   {
     return null;
   }
 
-  public Map pushPageFlowScope(
+  @Override
+  public Map<String, Object> pushPageFlowScope(
     FacesContext context,
     boolean copyParent)
   {
     return null;
   }
 
-  public Map popPageFlowScope(FacesContext context, boolean discardScope)
+  @Override
+  public Map<String, Object> popPageFlowScope(FacesContext context, boolean discardScope)
   {
     return null;
   }
 
-
+  @Override
   public String encodeCurrentPageFlowScopeURL(
      FacesContext context,
      String url)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageResolver.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/TestPageResolver.java Fri Aug 11 09:24:50 2006
@@ -23,11 +23,13 @@
  */
 public class TestPageResolver extends PageResolver
 {
+  @Override
   public String getPhysicalURI(String viewId)
   {
     return viewId;
   }
 
+  @Override
   public String encodeActionURI(String actionURI)
   {
     return actionURI;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/FormatterMapTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/FormatterMapTest.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/FormatterMapTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/FormatterMapTest.java Fri Aug 11 09:24:50 2006
@@ -35,8 +35,8 @@
 
   public void testFormatterMap()
   {
-    Map test = FormatterMap.sharedInstance();
-    Map subMap = (Map) test.get("Foo{0}Bar");
+    Map<Object, Map<Object, String>> test = FormatterMap.sharedInstance();
+    Map<Object, String> subMap = test.get("Foo{0}Bar");
     Object result = subMap.get("Test");
     assertEquals(result, "FooTestBar");
 
@@ -46,7 +46,7 @@
     result = subMap.get("");
     assertEquals(result, "FooBar");
 
-    subMap = (Map) test.get("FooBar");
+    subMap = test.get("FooBar");
     result = subMap.get("Test");
     assertEquals(result, "FooBar");
 
@@ -56,7 +56,7 @@
     result = subMap.get("");
     assertEquals(result, "FooBar");
 
-    subMap = (Map) test.get(null);
+    subMap = test.get(null);
     result = subMap.get("Test");
     assertEquals(result, null);
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/TokenizerTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/TokenizerTest.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/TokenizerTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/el/TokenizerTest.java Fri Aug 11 09:24:50 2006
@@ -137,7 +137,7 @@
   
   private void _testToken(Tokenizer tokens, int expectedType, String expected)
   {
-    Token tok = (Token) tokens.next();
+    Token tok = tokens.next();
     assertEquals("correct token type", expectedType, tok.type);
     assertEquals("correct token text", expected, tok.getText());
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadataTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadataTest.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadataTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/metadata/RegionMetadataTest.java Fri Aug 11 09:24:50 2006
@@ -47,11 +47,13 @@
     super(testName);
   }
   
+  @Override
   public void setUp()
   {
     super.setUp();
   }
   
+  @Override
   public void tearDown()
   {
     super.tearDown();
@@ -88,16 +90,16 @@
     ComponentMetaData comp = 
       (ComponentMetaData) rmd.getRegionConfig("org.apache.myfaces.trinidad.view.test.TestRegion1");
     assertEquals("/regions/testRegion1.jspx", comp.getJspUIDef());
-    List attrs = comp.getAttributes();
+    List<AttributeMetaData> attrs = comp.getAttributes();
     assertEquals(2, attrs.size());
 
-    AttributeMetaData attr = (AttributeMetaData) attrs.get(0);
+    AttributeMetaData attr = attrs.get(0);
     assertEquals("stock", attr.getAttrName());
     assertEquals(Integer.class, attr.getAttrClass());
     assertTrue(attr.isRequired());
     assertNull(attr.getDefaultValue());
 
-    attr = (AttributeMetaData) attrs.get(1);
+    attr = attrs.get(1);
     assertEquals("desc", attr.getAttrName());
     assertEquals(String.class, attr.getAttrClass());
     assertFalse(attr.isRequired());
@@ -127,7 +129,8 @@
       super(parent);
     }
     
-    public Enumeration findResources(String name) throws IOException
+    @Override
+    public Enumeration<URL> findResources(String name) throws IOException
     {
       if (RegionMetadata.__CONFIG_FILE_OTHER == name)
       {
@@ -135,7 +138,7 @@
         assertNotNull("resource does not exist:"+_TEST_FILE, url);
         URL url2 = this.getClass().getResource(_TEST_FILE2);
         assertNotNull("resource does not exist:"+_TEST_FILE2, url2);
-        Object[] resources = new Object[] {url, url2};
+        URL[] resources = new URL[] {url, url2};
         return Collections.enumeration(Arrays.asList(resources));
       }
       return super.findResources(name);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/BasicHtmlRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/BasicHtmlRenderKit.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/BasicHtmlRenderKit.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/BasicHtmlRenderKit.java Fri Aug 11 09:24:50 2006
@@ -60,16 +60,22 @@
     */
     Renderer n = new Renderer()
     {
+      @Override
       public void decode(FacesContext context, UIComponent component)
       {
       }
 
+      @Override
       public void encodeBegin(FacesContext context, UIComponent component)
       {
       }
+      
+      @Override
       public void encodeChildren(FacesContext context, UIComponent component)
       {
       }
+      
+      @Override
       public void encodeEnd(FacesContext context, UIComponent component)
       {
       }
@@ -95,16 +101,19 @@
 
   }
 
+  @Override
   public ResponseStateManager getResponseStateManager()
   {
     return null;
   }
 
+  @Override
   public ResponseStream createResponseStream(OutputStream out)
   {
     return null;
   }
 
+  @Override
   public ResponseWriter createResponseWriter(Writer out, String contentType, String encoding)
   {
     return null;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/ComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/ComponentDefinition.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/ComponentDefinition.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/ComponentDefinition.java Fri Aug 11 09:24:50 2006
@@ -50,16 +50,17 @@
     _usesUpload = usesUpload;
   }
 
+  @SuppressWarnings("unchecked")
   public UIComponent createComponent(FacesContext context)
   {
     Application appl = context.getApplication();
     UIComponent comp = appl.createComponent(_componentType);
     FacesConfigInfo.ComponentInfo info = getComponentInfo();
     
-    Iterator names = _attributes.keySet().iterator();
+    Iterator<String> names = _attributes.keySet().iterator();
     while (names.hasNext())
     {
-      String name = (String) names.next();
+      String name = names.next();
       String valueStr = (String) _attributes.get(name);
       if (isValueExpression(valueStr))
       {
@@ -79,18 +80,18 @@
       }
     }
 
-    Iterator children = getChildren().iterator();
+    Iterator<ComponentDefinition> children = getChildren().iterator();
     while (children.hasNext())
     {
-      ComponentDefinition cd = (ComponentDefinition) children.next();
+      ComponentDefinition cd = children.next();
       comp.getChildren().add(cd.createComponent(context));
     }
 
-    Iterator facets = getFacets().keySet().iterator();
+    Iterator<String> facets = getFacets().keySet().iterator();
     while (facets.hasNext())
     {
-      String name = (String) facets.next();
-      ComponentDefinition cd = (ComponentDefinition) getFacets().get(name);
+      String name = facets.next();
+      ComponentDefinition cd = getFacets().get(name);
       comp.getFacets().put(name, cd.createComponent(context));
     }
 
@@ -104,25 +105,25 @@
             expression.endsWith("}"));
   }
 
-  public Map getAttributes()
+  public Map<String, Object> getAttributes()
   {
     return _attributes;
   }
 
-  public Map getFacets()
+  public Map<String, ComponentDefinition> getFacets()
   {
     return _facets;
   }
 
-  public List getChildren()
+  public List<ComponentDefinition> getChildren()
   {
     return _children;
   }
 
   private final String _componentType;
   private boolean      _usesUpload;
-  private final Map    _attributes = new HashMap();
-  private final Map    _facets = new HashMap();
-  private final List   _children = new ArrayList();
+  private final Map<String, Object> _attributes = new HashMap<String, Object>();
+  private final Map<String, ComponentDefinition> _facets = new HashMap<String, ComponentDefinition>();
+  private final List<ComponentDefinition> _children = new ArrayList<ComponentDefinition>();
   private final FacesConfigInfo _info;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitPerf.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitPerf.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitPerf.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitPerf.java Fri Aug 11 09:24:50 2006
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 
 import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
 import javax.faces.component.UIColumn;
 import javax.faces.component.UIComponentBase;
 import javax.faces.component.UIViewRoot;
@@ -31,23 +30,17 @@
 import javax.faces.component.html.HtmlSelectOneMenu;
 import javax.faces.component.html.HtmlSelectOneRadio;
 import javax.faces.component.UISelectItem;
-import javax.faces.render.Renderer;
 
-import org.apache.myfaces.trinidad.component.core.CoreDocument;
-import org.apache.myfaces.trinidad.component.core.CoreForm;
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
 import org.apache.myfaces.trinidad.component.core.data.CoreTable;
 import org.apache.myfaces.trinidad.component.core.data.CoreSelectRangeChoiceBar;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelGroupLayout;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
-import org.apache.myfaces.trinidad.component.core.output.CoreOutputFormatted;
 import org.apache.myfaces.trinidad.component.core.input.CoreInputHidden;
 import org.apache.myfaces.trinidad.component.core.input.CoreInputText;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneChoice;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectOneRadio;
 import org.apache.myfaces.trinidad.component.core.input.CoreInputDate;
-import org.apache.myfaces.trinidad.component.core.input.CoreSelectItem;
-
 
 
 public class CoreRenderKitPerf extends RenderKitPerfTestCase
@@ -217,12 +210,14 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   public void testRITable() throws IOException
   {
     HtmlDataTable table = new HtmlDataTable();
-    ArrayList l = new ArrayList();
+    ArrayList<Integer> l = new ArrayList<Integer>();
     for (int i = 0 ; i < 10; i++)
       l.add(new Integer(i));
+    
     table.setValue(l);
     table.setStyleClass("TableContent");
     table.setHeaderClass("af_column_header-text SomeBorderStyle");
@@ -251,10 +246,11 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   public void testTable() throws IOException
   {
     CoreTable table = new CoreTable();
-    ArrayList l = new ArrayList();
+    ArrayList<Integer> l = new ArrayList<Integer>();
     for (int i = 0 ; i < 10; i++)
       l.add(new Integer(i));
     table.setValue(l);
@@ -285,6 +281,7 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   public void testPanelGroupPerf() throws IOException
   {
     CorePanelGroupLayout group = new CorePanelGroupLayout();
@@ -335,6 +332,7 @@
     renderRoot(root);
   }
 
+  @SuppressWarnings("unchecked")
   public void testSelectOneChoice() throws IOException
   {
     CoreSelectOneChoice choice = new CoreSelectOneChoice();
@@ -356,6 +354,7 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   public void testRISelectOneMenu() throws IOException
   {
     //
@@ -377,6 +376,7 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   public void testSelectOneRadio() throws IOException
   {
     CoreSelectOneRadio radio = new CoreSelectOneRadio();
@@ -398,6 +398,7 @@
   }
 
 
+  @SuppressWarnings("unchecked")
   public void testRISelectOneRadio() throws IOException
   {
     //
@@ -444,24 +445,29 @@
       setRendererType(null);
     }
 
+    @Override
     public String getFamily()
     {
       return "org.apache.myfaces.trinidadtest.PerfComp";
     }
 
+    @Override
     public boolean getRendersChildren()
     {
       return true;
     }
 
+    @Override
     public void encodeBegin(FacesContext context) throws IOException
     {
     }
 
+    @Override
     public void encodeChildren(FacesContext context) throws IOException
     {
     }
 
+    @Override
     public void encodeEnd(FacesContext context) throws IOException
     {
     }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java Fri Aug 11 09:24:50 2006
@@ -52,17 +52,20 @@
     super(testName);
   }
 
-
+  @Override
   protected Iterable<SuiteDefinition> getSuiteDefinitions()
   {
     return _definitions;
   }
 
+  @Override
   protected String getRenderKitId()
   {
     return "org.apache.myfaces.trinidad.core";
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   protected UIComponent populateDefaultComponentTree(
     UIViewRoot  root,
     TestScript  script)
@@ -98,7 +101,7 @@
 
   static private List<SuiteDefinition> _definitions =
     new ArrayList<SuiteDefinition>();
-  private static HashSet _sHtmlComponents;
+  private static HashSet<String> _sHtmlComponents;
 
   static
   {
@@ -144,7 +147,7 @@
                                          RenderKitBootstrap.getGeckoAgent(),
                                          false));
 
-    _sHtmlComponents = new HashSet(5);
+    _sHtmlComponents = new HashSet<String>(5);
     _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlBody");
     _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlFrame");
     _sHtmlComponents.add("org.apache.myfaces.trinidad.HtmlFrameBorderLayout");

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigInfo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigInfo.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigInfo.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigInfo.java Fri Aug 11 09:24:50 2006
@@ -30,7 +30,6 @@
 
 import javax.faces.application.Application;
 import javax.faces.render.RenderKit;
-import javax.faces.render.Renderer;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
@@ -46,13 +45,13 @@
 
   public void registerConverters(Application appl)
   {
-    Iterator convertersByType = _convertersByType.keySet().iterator();
+    Iterator<String> convertersByType = _convertersByType.keySet().iterator();
     while (convertersByType.hasNext())
     {
       try
       {
-        String type = (String) convertersByType.next();
-        String converterType = (String) _convertersByType.get(type);
+        String type = convertersByType.next();
+        String converterType = _convertersByType.get(type);
         appl.addConverter(Class.forName(type), converterType);
       }
       catch (Exception e)
@@ -61,13 +60,13 @@
       }
     }
 
-    Iterator convertersById = _convertersById.keySet().iterator();
+    Iterator<String> convertersById = _convertersById.keySet().iterator();
     while (convertersById.hasNext())
     {
       try
       {
-        String id = (String) convertersById.next();
-        String converterType = (String) _convertersById.get(id);
+        String id = convertersById.next();
+        String converterType = _convertersById.get(id);
         appl.addConverter(id, converterType);
       }
       catch (Exception e)
@@ -79,11 +78,11 @@
 
   public void registerComponents(Application appl)
   {
-    Iterator components = _components.keySet().iterator();
+    Iterator<String> components = _components.keySet().iterator();
     while (components.hasNext())
     {
-      String type = (String) components.next();
-      ComponentInfo info = (ComponentInfo) _components.get(type);
+      String type =components.next();
+      ComponentInfo info = _components.get(type);
       String className = info.componentClass;
       appl.addComponent(type, className);
     }
@@ -120,7 +119,7 @@
 
   public ComponentInfo getComponentInfo(String componentType)
   {
-    return (ComponentInfo) _components.get(componentType);
+    return _components.get(componentType);
   }
   
   public void load(String file) throws IOException, SAXException
@@ -134,10 +133,10 @@
     er.registerPublicId(publicID, dtdSource);
     builder.setEntityResolver(er);
 
-    Enumeration resources = getClass().getClassLoader().getResources(file);
+    Enumeration<URL> resources = getClass().getClassLoader().getResources(file);
     while (resources.hasMoreElements())
     {
-      URL resource = (URL) resources.nextElement();
+      URL resource = resources.nextElement();
       _LOG.info("PARSING " + resource);
       InputStream inputStream = null;
       // Try to get the inputStream off of a file
@@ -172,24 +171,26 @@
     public String componentClass;
     // Use a TreeMap so the properties always come back in 
     // sorted order.
-    public Map properties = new TreeMap();
+    public Map<String, PropertyInfo> properties = 
+      new TreeMap<String, PropertyInfo>();
+    
     public PropertyInfo getPropertyInfo(String name)
     {
-      return (PropertyInfo) properties.get(name);
+      return properties.get(name);
     }
   }
 
   static public class PropertyInfo
   {
-    public Class type;
+    public Class<?> type;
     public Object defaultValue;
-    public List  enumValues;
+    public List<Object> enumValues;
   }
 
-  private Map _components = new HashMap();
+  private Map<String, ComponentInfo> _components = new HashMap<String, ComponentInfo>();
   private Map<String, RenderKit> _renderKits  = new HashMap<String, RenderKit>();
-  private Map _convertersByType  = new HashMap();
-  private Map _convertersById  = new HashMap();
+  private Map<String, String> _convertersByType  = new HashMap<String, String>();
+  private Map<String, String> _convertersById  = new HashMap<String, String>();
 
   private static final TrinidadLogger _LOG =
     TrinidadLogger.createTrinidadLogger(FacesConfigInfo.class);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java Fri Aug 11 09:24:50 2006
@@ -23,8 +23,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 
 import org.apache.myfaces.trinidadinternal.share.expl.Coercions;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
@@ -43,6 +41,7 @@
     _info = info;
   }
   
+  @Override
   public NodeParser startChildElement(
     ParseContext context,
     String       namespaceURI,
@@ -59,6 +58,7 @@
     return BaseNodeParser.getIgnoreParser();
   }
 
+  @Override
   public void addCompletedChild(
     ParseContext context,
     String       namespaceURI,
@@ -80,6 +80,7 @@
       _info = info;
     }
 
+    @Override
     public NodeParser startChildElement(
       ParseContext context,
       String       namespaceURI,
@@ -96,6 +97,7 @@
       return BaseNodeParser.getIgnoreParser();
     }
     
+    @Override
     public void addCompletedChild(
       ParseContext context,
       String       namespaceURI,
@@ -132,6 +134,7 @@
       }
     }
     
+    @Override
     public Object endElement(
       ParseContext context,
       String       namespaceURI,
@@ -149,6 +152,7 @@
 
   private class ComponentParser extends BaseNodeParser
   {
+    @Override
     public NodeParser startChildElement(
       ParseContext context,
       String       namespaceURI,
@@ -166,7 +170,7 @@
       return BaseNodeParser.getIgnoreParser();
     }
     
-   
+    @Override
     public void addCompletedChild(
       ParseContext context,
       String       namespaceURI,
@@ -183,6 +187,7 @@
       }
     }
 
+    @Override
     public Object endElement(
       ParseContext context,
       String       namespaceURI,
@@ -201,6 +206,7 @@
     {
     }
 
+    @Override
     public NodeParser startChildElement(
       ParseContext context,
       String       namespaceURI,
@@ -215,7 +221,7 @@
       return BaseNodeParser.getIgnoreParser();
     }
     
-   
+    @Override
     public void addCompletedChild(
       ParseContext context,
       String       namespaceURI,
@@ -234,6 +240,7 @@
       }
     }
 
+    @Override
     public Object endElement(
       ParseContext context,
       String       namespaceURI,
@@ -259,6 +266,7 @@
       _property = new FacesConfigInfo.PropertyInfo();
     }
 
+    @Override
     public NodeParser startChildElement(
       ParseContext context,
       String       namespaceURI,
@@ -279,7 +287,7 @@
       return BaseNodeParser.getIgnoreParser();
     }
     
-    
+    @Override
     public void addCompletedChild(
       ParseContext context,
       String       namespaceURI,
@@ -295,7 +303,7 @@
         }
         else if ("property-class".equals(localName))
         {
-          Class c = (Class) _sPrimitiveTypes.get(s);
+          Class<?> c = _sPrimitiveTypes.get(s);
           if (c == null)
           {
             boolean isArray = s.endsWith("[]");
@@ -318,20 +326,21 @@
         }
         else if ("default-value".equals(localName))
         {
-          Class c = _property.type;
+          Class<?> c = _property.type;
           if (c == null)
             c = String.class;
           _property.defaultValue = Coercions.coerce(null, s, c);
         }
         else if ("attribute-values".equals(localName))
         {
-          _property.enumValues = new ArrayList();
+          _property.enumValues = new ArrayList<Object>();
           String[] values = XMLUtils.parseNameTokens(s);
           _property.enumValues.addAll(Arrays.asList(values));
         }
       }
     }
 
+    @Override
     public Object endElement(
       ParseContext context,
       String       namespaceURI,
@@ -346,6 +355,7 @@
 
   private class RendererParser extends BaseNodeParser
   {
+    @Override
     public NodeParser startChildElement(
       ParseContext context,
       String       namespaceURI,
@@ -359,6 +369,7 @@
       return BaseNodeParser.getIgnoreParser();
     }
    
+    @Override
     public void addCompletedChild(
       ParseContext context,
       String       namespaceURI,
@@ -377,6 +388,7 @@
       }
     }
 
+    @Override
     public Object endElement(
       ParseContext context,
       String       namespaceURI,
@@ -397,14 +409,15 @@
 
   private FacesConfigInfo _info;
 
-  static private Class _getArrayType(Class baseClass)
+  static private Class<?> _getArrayType(Class<?> baseClass)
   {
     return Array.newInstance(baseClass, 0).getClass();
   }
 
-  static private final HashMap _sPrimitiveTypes = new HashMap();
+  static private final HashMap<String, Class<?>> _sPrimitiveTypes;
   static
   {
+    _sPrimitiveTypes = new HashMap<String, Class<?>>();
     _sPrimitiveTypes.put("int[]",     _getArrayType(Integer.TYPE));
     _sPrimitiveTypes.put("boolean[]", _getArrayType(Boolean.TYPE));
     _sPrimitiveTypes.put("char[]",    _getArrayType(Character.TYPE));

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java Fri Aug 11 09:24:50 2006
@@ -32,6 +32,7 @@
 
 public class FastRenderer extends Renderer
 {
+  @Override
   public void encodeBegin(FacesContext context,
                           UIComponent comp) throws IOException
   {
@@ -59,6 +60,7 @@
     }
   }
 
+  @Override
   public void encodeEnd(FacesContext context,
                         UIComponent comp) throws IOException
   {
@@ -136,7 +138,7 @@
     if (binding == null)
       return null;
 
-    Class type = binding.getType(context);
+    Class<?> type = binding.getType(context);
     return ConverterUtils.createConverter(context, type);
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java Fri Aug 11 09:24:50 2006
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import javax.faces.render.Renderer;
 import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
@@ -57,6 +56,7 @@
     _valueKey = type.findKey("value");
   }
 
+  @Override
   public void encodeBegin(FacesContext context,
                           UIComponent comp) throws IOException
   {
@@ -84,6 +84,7 @@
     }
   }
 
+  @Override
   public void encodeEnd(FacesContext context,
                         UIComponent comp) throws IOException
   {
@@ -158,7 +159,7 @@
     if (binding == null)
       return null;
 
-    Class type = binding.getType(context);
+    Class<?> type = binding.getType(context);
     return ConverterUtils.createConverter(context, type);
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java Fri Aug 11 09:24:50 2006
@@ -33,6 +33,7 @@
 
 public class GatherContent extends UIComponentBase
 {
+  @SuppressWarnings("unchecked")
   public GatherContent(Writer writer,
                        UIComponent child,
                        TestResult result,
@@ -47,11 +48,13 @@
     getChildren().add(child);
   }
 
+  @Override
   public String getFamily()
   {
     return "org.apache.myfaces.trinidadtest.GatherContent";
   }
 
+  @Override
   public void encodeBegin(FacesContext context)
   {
     _savedWriter = context.getResponseWriter();
@@ -62,7 +65,7 @@
         new CheckUIComponent(_savedWriter.cloneWithWriter(_writer)));
   }
 
-  
+  @Override
   public void encodeEnd(FacesContext context)
   {
     context.setResponseWriter(_savedWriter);
@@ -81,6 +84,7 @@
       super(out);
     }
 
+    @Override
     public void startElement(String name,
                              UIComponent component) throws IOException
     {
@@ -114,6 +118,7 @@
       super.startElement(name, component);
     }
 
+    @Override
     public void endElement(String name) throws IOException
     {
       super.endElement(name);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MApplication.java Fri Aug 11 09:24:50 2006
@@ -48,109 +48,129 @@
   {
   }
 
+  @Override
   public ActionListener getActionListener()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void setActionListener(ActionListener listener)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public Locale getDefaultLocale()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public void setDefaultLocale(Locale locale)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public String getDefaultRenderKitId()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public void setDefaultRenderKitId(String renderKitId)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public String getMessageBundle()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public void setMessageBundle(String bundle)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public NavigationHandler getNavigationHandler()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void setNavigationHandler(NavigationHandler handler)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public PropertyResolver getPropertyResolver()
   {
     return _propertyResolver;
   }
 
+  @Override
   public void setPropertyResolver(PropertyResolver resolver)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public VariableResolver getVariableResolver()
   {
     return _variableResolver;
   }
 
+  @Override
   public void setVariableResolver(VariableResolver resolver)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public ViewHandler getViewHandler()
   {
     return _viewHandler;
   }
 
+  @Override
   public void setViewHandler(ViewHandler viewHandler)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public StateManager getStateManager()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public void setStateManager(StateManager stateManager)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void addComponent(String type, String className)
   {
     _components.put(type, className);
   }
 
+  @Override
   public UIComponent createComponent(String type) throws FacesException
   {
-    String s = (String) _components.get(type);
+    String s = _components.get(type);
     if (s == null)
       throw new IllegalArgumentException("No component for type " + type);
     try
     {
-      Class c = Class.forName(s);
+      Class<?> c = Class.forName(s);
       return (UIComponent) c.newInstance();
     }
     catch (Exception e)
@@ -161,26 +181,32 @@
     }
   }
 
+  @Override
   public UIComponent createComponent(ValueBinding binding, FacesContext context, String type)
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Iterator getComponentTypes()
+  @Override
+  public Iterator<String> getComponentTypes()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void addConverter(String id, String className)
   {
     _converterIdMap.put(id,className);
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void addConverter(Class type, String className)
   {
-    _converterIdMap.put(type,className);
+    _converterTypeMap.put(type,className);
   }
 
+  @Override
   public Converter createConverter(String className)
   {
     //copy the RI code
@@ -198,26 +224,33 @@
     
   }
   
-  private Object _mapLookUp(Object key, Map map) throws InstantiationException,
-      IllegalAccessException, ClassNotFoundException
+  private Object _mapLookUp(
+      Object key, 
+      Map<Object, Object> map) 
+        throws InstantiationException, 
+               IllegalAccessException, 
+               ClassNotFoundException
   {
-    Object result;
-    Object value;
-    Class klass;
-    value = map.get(key);
+    Class<?> klass;
+    Object value = map.get(key);
     if (value == null)
       return null;
+    
     if (value instanceof String)
     {      
       klass = Class.forName((String)value);
       map.put(key, klass);
     }
     else
+    {
       klass = (Class) value;
-    result = klass.newInstance();
-    return result;
+    }
+    
+    return klass.newInstance();
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public Converter createConverter(Class type)
   {
     Converter converter = null;
@@ -238,7 +271,8 @@
       if (converter != null)
         return converter;
     }
-    Class superclass = type.getSuperclass();
+    
+    Class<?> superclass = type.getSuperclass();
     if (superclass != null)
     {
       converter = createConverter(superclass);
@@ -248,46 +282,56 @@
     return converter;
   }
 
-  public Iterator getConverterIds()
+  @Override
+  public Iterator<String> getConverterIds()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
-  public Iterator getConverterTypes()
+  @Override
+  public Iterator<Class<?>> getConverterTypes()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public MethodBinding createMethodBinding(String expr, Class[] paramTypes)
   {
     return null;
   }
 
-  public Iterator getSupportedLocales()
+  @Override
+  public Iterator<Locale> getSupportedLocales()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void setSupportedLocales(Collection locales)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void addValidator(String id, String className)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public Validator createValidator(String validatorId)
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Iterator getValidatorIds()
+  @Override
+  public Iterator<String> getValidatorIds()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public ValueBinding createValueBinding(String expression)
   {
     if (!expression.startsWith("#{") ||
@@ -296,12 +340,12 @@
     return new MValueBinding(expression);
   }
 
-  private Map _components = new HashMap();
+  private Map<String, String> _components = new HashMap<String, String>();
   private ViewHandler _viewHandler = new MViewHandler();
   private VariableResolver _variableResolver = new MVariableResolver();
   private PropertyResolver _propertyResolver = new MPropertyResolver();
   static private MApplication _INSTANCE = new MApplication();
-  private Map _converterIdMap = new HashMap();
-  private Map _converterTypeMap = new HashMap();
+  private Map<Object, Object> _converterIdMap = new HashMap<Object, Object>();
+  private Map<Object, Object> _converterTypeMap = new HashMap<Object, Object>();
   static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StateUtils.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java Fri Aug 11 09:24:50 2006
@@ -53,59 +53,68 @@
     _external = new External(testMode);
   }
 
+  @Override
   public ResponseWriter getResponseWriter()
   {
     return _responseWriter;
   }
 
+  @Override
   public void setResponseWriter(ResponseWriter responseWriter)
   {
     _responseWriter = responseWriter;
   }
 
-  public Iterator getMessages()
+  @Override
+  public Iterator<FacesMessage> getMessages()
   {
     return getMessages(_GLOBAL_MESSAGE);
   }
 
-  public Iterator getMessages(String id)
+  @SuppressWarnings("unchecked")
+  @Override
+  public Iterator<FacesMessage> getMessages(String id)
   {
     if (id == null)
       id = _GLOBAL_MESSAGE;
 
-    List messages = (List) _messages.get(id);
+    List<FacesMessage> messages = _messages.get(id);
     if (messages == null)
       messages = Collections.EMPTY_LIST;
+    
     return messages.iterator();
   }
 
+  @Override
   public void addMessage(String id, FacesMessage message)
   {
     if (id == null)
       id = _GLOBAL_MESSAGE;
 
-    List messages = (List) _messages.get(id);
+    List<FacesMessage> messages = _messages.get(id);
     if (messages == null)
     {
-      messages = new ArrayList();
+      messages = new ArrayList<FacesMessage>();
       _messages.put(id, messages);
     }
+    
     messages.add(message);
   }
 
+  @Override
   public FacesMessage.Severity getMaximumSeverity()
   {
     FacesMessage.Severity max = FacesMessage.SEVERITY_INFO;
 
-    Iterator clients = getClientIdsWithMessages();
+    Iterator<String> clients = getClientIdsWithMessages();
     while (clients.hasNext())
     {
-      String messagesKey = (String) clients.next();
-      List messages = (List) _messages.get(messagesKey);
+      String messagesKey = clients.next();
+      List<FacesMessage> messages = _messages.get(messagesKey);
       int len = _messages.size();
       for (int i = 0; i < len; i++)
       {
-        FacesMessage fm = (FacesMessage) messages.get(i);
+        FacesMessage fm = messages.get(i);
         FacesMessage.Severity nextSev = fm.getSeverity();
 
         if (max.compareTo(nextSev) < 0)
@@ -121,21 +130,25 @@
     return max;
   }
 
-  public Iterator getClientIdsWithMessages()
+  @Override
+  public Iterator<String> getClientIdsWithMessages()
   {
     return _messages.keySet().iterator();
   }
 
+  @Override
   public Application getApplication()
   {
     return MApplication.sharedInstance();
   }
 
+  @Override
   public UIViewRoot getViewRoot()
   {
     return _viewRoot;
   }
 
+  @Override
   public void setViewRoot(UIViewRoot viewRoot)
   {
     _viewRoot = viewRoot;
@@ -157,7 +170,7 @@
     return Locale.ENGLISH;
   }
 
-
+  @Override
   public ExternalContext getExternalContext()
   {
     // this method is called a lot, so we don't want to use the "mock"
@@ -165,6 +178,7 @@
     return _external;
   }
 
+  @Override
   public RenderKit getRenderKit()
   {
     if (_viewRoot == null)
@@ -178,7 +192,8 @@
   private ExternalContext _external;
   private ResponseWriter  _responseWriter;
   private UIViewRoot      _viewRoot;
-  private Map             _messages = new HashMap();
+  private Map<String, List<FacesMessage>> _messages = 
+    new HashMap<String, List<FacesMessage>>();
 
   private static final class External extends MockExternalContext
   {
@@ -203,12 +218,25 @@
       }
     }
 
+    @Override
     public Object getContext() { return null; }
+    
+    @Override
     public Object getRequest() { return null; }
+    
+    @Override
     public Object getResponse() { return null; }
+    
+    @Override
     public Object getSession(boolean create) { return null; }
+    
+    @Override
     public String getRequestContextPath() { return "/test-context-path"; }
+    
+    @Override
     public String getRequestServletPath() { return "/test-faces"; }
+    
+    @Override
     public String getInitParameter(String name)
     {
       if (_testMode && Configuration.DISABLE_CONTENT_COMPRESSION.equals(name))
@@ -219,48 +247,59 @@
       return null;
     }
 
+    @Override
     public String encodeNamespace(String in) { return in; }
 
+    @Override
     public String encodeResourceURL(String url) { return "encoded-resource-url:" + url; }
+    
+    @Override
     public String encodeActionURL(String url) { return "encoded-action-url:" + url; }
 
-    public Map getRequestHeaderMap()
+    @SuppressWarnings("unchecked")
+    @Override
+    public Map<String, String> getRequestHeaderMap()
     {
       return Collections.EMPTY_MAP;
     }
 
-    public Map getRequestParameterMap()
+    @SuppressWarnings("unchecked")
+    @Override
+    public Map<String, String> getRequestParameterMap()
     {
       return Collections.EMPTY_MAP;
     }
 
-
+    @Override
     public InputStream getResourceAsStream(String path)
     {
       return MFacesContext.class.getResourceAsStream(path);
     }
 
+    @Override
     public URL getResource(String path) throws MalformedURLException
     {
       return MFacesContext.class.getResource(path);
     }
 
-    public Map getApplicationMap()
+    @Override
+    public Map<String, Object> getApplicationMap()
     {
       // Return an unmodifiable map - noone should be putting
       // things into application scope during rendering.
       return Collections.unmodifiableMap(_applicationMap);
     }
 
-    public Map getRequestMap()
+    @Override
+    public Map<String, Object> getRequestMap()
     {
       // this method is called a lot, so we don't want to use the "mock"
       // implementations as those expect a specific number of calls:
       return _requestMap;
     }
 
-    private final Map _requestMap = new HashMap(2);
-    private final Map _applicationMap = new HashMap(2);
+    private final Map<String, Object> _requestMap = new HashMap<String, Object>(2);
+    private final Map<String, Object> _applicationMap = new HashMap<String, Object>(2);
     private final boolean _testMode;
   }
   private static final String _GLOBAL_MESSAGE = "org.apache.myfaces.trinidadinternal.renderkit.MFacesContext.GLOBAL_MESSAGE";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MPropertyResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MPropertyResolver.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MPropertyResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MPropertyResolver.java Fri Aug 11 09:24:50 2006
@@ -21,12 +21,12 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyNotFoundException;
 import javax.faces.el.PropertyResolver;
 
 public class MPropertyResolver extends PropertyResolver
 {
+  @Override
   public Object getValue(Object o , Object key)
   {
     if (o == null)
@@ -60,37 +60,44 @@
     throw new PropertyNotFoundException("Couldn't find getter for " + propertyName);
   }
 
+  @Override
   public Object getValue(Object o , int index )
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public void setValue(Object o , Object key, Object value)
   {
     throw new UnsupportedOperationException("Should not be called when rendering");
   }
 
+  @Override
   public void setValue(Object o , int index , Object value )
   {
     throw new UnsupportedOperationException("Should not be called when rendering");
   }
 
+  @Override
   public boolean isReadOnly(Object o , Object key )
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public boolean isReadOnly(Object o , int index )
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Class getType(Object o , Object key)
+  @Override
+  public Class<?> getType(Object o , Object key)
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Class getType(Object o , int index )
+  @Override
+  public Class<?> getType(Object o , int index )
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRenderKitFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRenderKitFactory.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRenderKitFactory.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRenderKitFactory.java Fri Aug 11 09:24:50 2006
@@ -29,22 +29,25 @@
   {
   }
 
+  @Override
   public void addRenderKit(String renderKitId,
                            RenderKit renderKit)
   {
     _kits.put(renderKitId, renderKit);
   }
 
+  @Override
   public RenderKit getRenderKit(FacesContext context, 
                                 String renderKitId)
   {
-    return (RenderKit) _kits.get(renderKitId);
+    return _kits.get(renderKitId);
   }
   
-  public Iterator getRenderKitIds()
+  @Override
+  public Iterator<String> getRenderKitIds()
   {
     return _kits.keySet().iterator();
   }
 
-  private Map _kits = new HashMap();
+  private Map<String, RenderKit> _kits = new HashMap<String, RenderKit>();
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java Fri Aug 11 09:24:50 2006
@@ -15,6 +15,8 @@
 */
 package org.apache.myfaces.trinidadinternal.renderkit;
 
+import java.awt.Color;
+import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 import javax.faces.component.UIComponent;
@@ -49,62 +51,80 @@
     _agent = agent;
   }
 
+  @Override
   public Agent getAgent()
   {
     return _agent;
   }
 
+  @Override
   public PageResolver getPageResolver()
   {
     return PageResolverDefaultImpl.sharedInstance();
   }
 
+  @Override
   public PageFlowScopeProvider getPageFlowScopeProvider()
   {
     return PageFlowScopeProviderImpl.sharedInstance();
   }
 
-
+  @Override
   public DialogService getDialogService()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Map getPageFlowScope()
+  @Override
+  public Map<String, Object> getPageFlowScope()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public void returnFromDialog(Object returnValue, Map returnParam)
+  @Override
+  public void returnFromDialog(
+      Object returnValue, 
+      Map<Object, Object> returnParam)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
-  public void launchDialog(UIViewRoot dialogRoot, Map dialogParameters, UIComponent source, boolean useWindow, Map windowProperties)
+  @Override
+  public void launchDialog(
+      UIViewRoot dialogRoot, 
+      Map<String, Object> dialogParameters, 
+      UIComponent source, 
+      boolean useWindow, 
+      Map<String, Object> windowProperties)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public boolean isPostback()
   {
     return false;
   }
   
+  @Override
   public boolean isPartialRequest(FacesContext context)
   {
     return false;
   }
 
+  @Override
   public boolean isDebugOutput()
   {
     return false;
   }
 
+  @Override
   public boolean isClientValidationDisabled()
   {
     return false;
   }
 
+  @Override
   public String getOutputMode()
   {
     return null;
@@ -115,11 +135,13 @@
     _skin = skin;
   }
 
+  @Override
   public String getSkinFamily()
   {
     return _skin;
   }
 
+  @Override
   public String getAccessibilityMode()
   {
     return _accMode;
@@ -130,6 +152,7 @@
     _accMode = accMode;
   }
 
+  @Override
   public boolean isRightToLeft()
   {
     return _rtl;
@@ -140,81 +163,97 @@
     _rtl = rtl;
   }
 
+  @Override
   public char getNumberGroupingSeparator()
   {
     return ',';
   }
 
+  @Override
   public char getDecimalSeparator()
   {
     return '.';
   }
 
+  @Override
   public String getCurrencyCode()
   {
     return null;
   }
 
+  @Override
   public int getTwoDigitYearStart()
   {
     return 1950;
   }
 
+  @Override
   public String getOracleHelpServletUrl()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Map getHelpTopic()
+  @Override
+  public Map<String, Object> getHelpTopic()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Map getHelpSystem()
+  @Override
+  public Map<String, Object> getHelpSystem()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public TimeZone getTimeZone()
   {
     return _FIXED_TIME_ZONE;
   }
 
+  @Override
   public void addPartialTarget(UIComponent newTarget)
   {
     // throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public void addPartialTriggerListeners(UIComponent listener, String[] trigger)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void partialUpdateNotify(UIComponent updated)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public UploadedFileProcessor getUploadedFileProcessor()
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
-  public Map getColorPalette()
+  @Override
+  public Map<String, List<Color>> getColorPalette()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
-  public Map getFormatter()
+  @Override
+  public Map<Object, Map<Object,String>> getFormatter()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public ChangeManager getChangeManager()
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public RegionManager getRegionManager()
   {
     throw new UnsupportedOperationException("Not implemented yet");

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MValueBinding.java Fri Aug 11 09:24:50 2006
@@ -27,6 +27,7 @@
     _expression = expression.substring(2, expression.length() - 1);
   }
 
+  @Override
   public Object getValue(FacesContext context)
   {
     String varName;
@@ -60,21 +61,25 @@
     return _resolveProperty(context, var, expr.substring(period + 1));
   }
   
+  @Override
   public void setValue(FacesContext context, Object value)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");    
   }
 
+  @Override
   public boolean isReadOnly(FacesContext context)
   {
     return true;
   }
 
-  public Class getType(FacesContext context)
+  @Override
+  public Class<?> getType(FacesContext context)
   {
     return Object.class;
   }
 
+  @Override
   public String getExpressionString()
   {
     return "#{" + _expression + "}";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MVariableResolver.java Fri Aug 11 09:24:50 2006
@@ -42,6 +42,7 @@
 
 public class MVariableResolver extends VariableResolver
 {
+  @Override
   public Object resolveVariable(FacesContext context, String name)
   {
     Object o =  context.getExternalContext().getRequestMap().get(name);
@@ -55,7 +56,7 @@
       {
         if (_pageList == null)
         {
-          List al = _createPageList();
+          List<PageImpl> al = _createPageList();
           _pageList = new MenuModelImpl(al, "viewId", "/1.jspx");
         }
 
@@ -73,7 +74,7 @@
       {
         if (_menu == null)
         {
-          List al = _createPageList();
+          List<PageImpl> al = _createPageList();
           TreeModel treeModel = new ChildPropertyTreeModel(al, "children");
           _menu = new MenuModelImpl(treeModel, "viewId", "/4.jspx");
         }
@@ -92,7 +93,7 @@
       {
         if (_navigationpath == null)
         {
-          List al = _createPageList();
+          List<PageImpl> al = _createPageList();
           TreeModel treeModel = new ChildPropertyTreeModel(al, "children");
           _navigationpath = new MenuModelImpl(treeModel, "viewId", "/7.jspx");
         }
@@ -109,7 +110,7 @@
     {
       if (_simpleList == null)
       {
-        _simpleList = new ArrayList();
+        _simpleList = new ArrayList<Map<String, Object>>();
         _simpleList.add(_createHashMap("First", 1));
         _simpleList.add(_createHashMap("Second", 2));
         _simpleList.add(_createHashMap("Three", 3));
@@ -124,19 +125,24 @@
     {
       if (_iteratorList == null)
       {
-        _iteratorList = new ArrayList();
-        _iteratorList.add(new HashMap().put("data","One"));
-        _iteratorList.add(new HashMap().put("data","Two"));
-        _iteratorList.add(new HashMap().put("data","Three"));
-        _iteratorList.add(new HashMap().put("data","Four"));
-        _iteratorList.add(new HashMap().put("data","Five"));
+        // -= Simon Lessard =-
+        // FIXME: _iteratorList will contains 5 null value since 
+        //        put return the value before the insertion at  
+        //        specified key. 
+        // Ref: http://java.sun.com/j2se/1.5.0/docs/api/java/util/Map.html#put(K, V)
+        _iteratorList = new ArrayList<String>();
+        _iteratorList.add(new HashMap<String, String>().put("data","One"));
+        _iteratorList.add(new HashMap<String, String>().put("data","Two"));
+        _iteratorList.add(new HashMap<String, String>().put("data","Three"));
+        _iteratorList.add(new HashMap<String, String>().put("data","Four"));
+        _iteratorList.add(new HashMap<String, String>().put("data","Five"));
       }
 
       return _iteratorList;
     }
     else if("colorList".equals(name))
     {
-      ArrayList colorList = new ArrayList();
+      ArrayList<Color> colorList = new ArrayList<Color>();
       colorList.add(new Color(255, 0, 0));
       colorList.add(new Color(0, 0, 255));
       colorList.add(new Color(255, 255, 0));
@@ -159,7 +165,7 @@
         tom.getKids().add(zoe);
         ira.getKids().add(mallika);
 
-        List people = new ArrayList();
+        List<Person> people = new ArrayList<Person>();
         people.add(john);
         people.add(ira);
 
@@ -202,14 +208,17 @@
     }
     else if ("oldDate".equals(name))
     {
+      // FIXME: Should be able to use Calendar for non deprecated calls.
       return new Date(70, 5, 10);
     }
     else if ("midDate".equals(name))
     {
+      // FIXME: Should be able to use Calendar for non deprecated calls.
       return new Date(105, 6, 27);
     }
     else if ("newDate".equals(name))
     {
+      // FIXME: Should be able to use Calendar for non deprecated calls.
       return new Date(130, 0, 5);
     }
     else if("simpleDocument".equals(name))
@@ -235,18 +244,18 @@
       _currentViewId = currentViewId;
     }
 
+    @Override
     protected String getCurrentViewId()
     {
-
       return _currentViewId;
     }
 
     private String _currentViewId;
   }
 
-  static private Map _createHashMap(String s, int i)
+  static private Map<String, Object> _createHashMap(String s, int i)
   {
-    HashMap m = new HashMap();
+    HashMap<String, Object> m = new HashMap<String, Object>();
     m.put("string", s);
     m.put("int", new Integer(i));
     return m;
@@ -276,31 +285,27 @@
       _disabled = disabled;
     }
 
-
-    public void setChildren(List children)
+    public void setChildren(List<Object> children)
     {
       _children = children;
     }
 
-
     public String getViewId()
     {
       return _viewId;
     }
 
-
     public String getLabel()
     {
       return _label;
     }
 
-
     public boolean isDisabled()
     {
       return _disabled;
     }
 
-    public List getChildren()
+    public List<Object> getChildren()
     {
       return _children;
     }
@@ -308,25 +313,27 @@
     private String _viewId;
     private String _label;
     private boolean _disabled;
-    private List _children;
+    private List<Object> _children;
   }
 
-  public static class BigList extends AbstractList
+  public static class BigList extends AbstractList<Integer>
   {
+    @Override
     public int size()
     {
       return 10000;
     }
 
-    public Object get(int i)
+    @Override
+    public Integer get(int i)
     {
       return new Integer(i);
     }
   }
 
-  private static List _createPageList()
+  private static List<PageImpl> _createPageList()
   {
-    ArrayList al = new ArrayList();
+    ArrayList<PageImpl> al = new ArrayList<PageImpl>();
     PageImpl page1 = new PageImpl("/1.jspx", "First", false);
 
     al.add(page1);
@@ -334,11 +341,11 @@
     al.add(new PageImpl("/3.jspx", "Third", false));
 
     PageImpl page5 = new PageImpl("/5.jspx", "fifth", false);
-    ArrayList p1 = new ArrayList();
+    ArrayList<Object> p1 = new ArrayList<Object>();
     p1.add(new PageImpl("/4.jspx", "fourth", false));
     p1.add(page5);
 
-    ArrayList p2 = new ArrayList();
+    ArrayList<Object> p2 = new ArrayList<Object>();
     p2.add(new PageImpl("/6.jspx", "sixth", false));
     p2.add(new PageImpl("/7.jspx", "seventh", false));
 
@@ -350,24 +357,24 @@
 
   private static class RangeChoiceBarModelImpl
   {
-    private List _names;
+    private List<String> _names;
     private int _start;
     private int _end;
 
     public RangeChoiceBarModelImpl()
     {
-      _names = new ArrayList();
+      _names = new ArrayList<String>();
       _names.add("vox");
       _names.add("populi");
       _names.add("en");
       _names.add("vogue");
     }
-    public void setNames(List names)
+    public void setNames(List<String> names)
     {
       this._names = names;
     }
 
-    public List getNames()
+    public List<String> getNames()
     {
       return _names;
     }
@@ -397,8 +404,8 @@
   private MenuModelImpl _menu;
   private MenuModelImpl _navigationpath;
 
-  private List _iteratorList;
-  private List _simpleList;
+  private List<String> _iteratorList;
+  private List<Map<String, Object>> _simpleList;
 
   private ChildPropertyTreeModel _treeModel;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MViewHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MViewHandler.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MViewHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MViewHandler.java Fri Aug 11 09:24:50 2006
@@ -26,41 +26,49 @@
   {
   }
 
+  @Override
   public Locale calculateLocale(FacesContext context)
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public String calculateRenderKitId(FacesContext context)
   {
     throw new UnsupportedOperationException("Not implemented yet");
  }
 
+  @Override
   public UIViewRoot createView(FacesContext context, String viewId)
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public String getActionURL(FacesContext context, String viewId)
   {
     return "action-url:" + viewId;
   }
 
+  @Override
   public String getResourceURL(FacesContext context, String viewId)
   {
     return "resource-url:" + viewId;
   }
 
+  @Override
   public void renderView(FacesContext context, UIViewRoot root)
   {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Override
   public UIViewRoot restoreView(FacesContext context, String root)
   {
     throw new UnsupportedOperationException("Should not be called during rendering");
   }
 
+  @Override
   public void writeState(FacesContext context) throws IOException 
   {
     context.getResponseWriter().startElement("VIEW-STATE", null);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/NullWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/NullWriter.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/NullWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/NullWriter.java Fri Aug 11 09:24:50 2006
@@ -19,30 +19,37 @@
 
 public class NullWriter extends Writer
 {
+  @Override
   public void write(char[] buffer)
   {
   }
 
+  @Override
   public void write(char[] buffer, int off, int len)
   {
   }
 
+  @Override
   public void write(String str)
   {
   }
 
+  @Override
   public void write(int c)
   {
   }
 
+  @Override
   public void write(String str, int off, int len)
   {
   }
 
+  @Override
   public void close()
   {
   }
 
+  @Override
   public void flush()
   {
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitBootstrap.java Fri Aug 11 09:24:50 2006
@@ -29,8 +29,6 @@
 
 import org.apache.myfaces.trinidadinternal.agent.AgentFactoryImpl;
 
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
-
 import org.apache.myfaces.trinidadinternal.skin.SkinFactory;
 import org.apache.myfaces.trinidadinternal.skin.SkinFactoryImpl;
 import org.apache.myfaces.trinidadinternal.skin.SkinUtils;
@@ -158,7 +156,10 @@
   }
 
   private FacesConfigInfo _facesConfigInfo;
-  private CoreRenderKit   _coreRenderKit;
+  
+  // -= Simon Lessard =- 
+  // TODO: Never read as of 2006-08-09, remove for good if no problem show up.
+  //private CoreRenderKit   _coreRenderKit;
 
   static private Agent           _geckoAgent;
   static private Agent           _ieAgent;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java Fri Aug 11 09:24:50 2006
@@ -85,6 +85,7 @@
     return "org.apache.myfaces.trinidad.core";
   }
 
+  @SuppressWarnings("unchecked")
   protected UIViewRoot createTestTree(
                UIComponent compToTest, String testName, int count)
     throws IOException
@@ -111,6 +112,7 @@
     return root;
   }
 
+  @Override
   protected void setUp() throws IOException
   {
     RenderKitBootstrap.clearFactories();
@@ -133,6 +135,7 @@
     _requestContext.setAgent(RenderKitBootstrap.getGeckoAgent());
   }
   
+  @Override
   protected void tearDown() throws IOException
   {
     MFacesContext.clearContext();
@@ -165,16 +168,19 @@
       setRendererType(null);
     }
 
+    @Override
     public String getFamily()
     {
       return "org.apache.myfaces.trinidadtest.PerfComp";
     }
 
+    @Override
     public boolean getRendersChildren()
     {
       return true;
     }
 
+    @Override
     public void encodeChildren(FacesContext context) throws IOException
     {
       long start = System.currentTimeMillis();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java Fri Aug 11 09:24:50 2006
@@ -90,6 +90,7 @@
       _rightToLeft = rightToLeft;
     }
 
+    @Override
     public void run(TestResult result)
     {
       // Cache the TestResult so we can directly add failure without
@@ -111,6 +112,7 @@
       }
     }
 
+    @Override
     protected void setUp() throws IOException  
     {
       _facesContext = new MFacesContext(true);
@@ -132,6 +134,7 @@
         
     }
 
+    @Override
     protected void tearDown() throws IOException  
     {
       ExtendedRenderKitService service =
@@ -150,6 +153,7 @@
       _result = null;
     }
 
+    @Override
     abstract protected void runTest() throws Throwable;
 
     protected FacesContext getFacesContext()
@@ -190,6 +194,7 @@
     // Severe errors should count as a test failure
     private class CatchSevere extends Handler
     {
+      @Override
       public void publish(LogRecord record)
       {
         if (record.getLevel() == Level.SEVERE)
@@ -200,8 +205,10 @@
         }
       }
 
+      @Override
       public void flush() { }
 
+      @Override
       public void close() { }
     }
 
@@ -241,11 +248,13 @@
       _testCaseCount = (_script.getTests().size() * 3) + 1;
     }
 
+    @Override
     public int countTestCases()
     {
       return _testCaseCount;
     }
 
+    @Override
     public void run(TestResult result)
     {
       if (!_script.isSupportedAgentType(getAgent().getType()))
@@ -261,12 +270,15 @@
       super.run(result);
     }
 
+    @Override
     protected void tearDown() throws IOException  
     {
       super.tearDown();
       _script = null;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
     protected void runTest() throws Throwable
     {
       UIViewRoot root = getFacesContext().getViewRoot();
@@ -290,10 +302,10 @@
                                                this,
                                                _lenient));
 
-      Iterator tests = _script.getTests().iterator();
+      Iterator<TestScript.Test> tests = _script.getTests().iterator();
       while (tests.hasNext())
       {
-        TestScript.Test test = (TestScript.Test) tests.next();
+        TestScript.Test test = tests.next();
 
         UIComponent testComponent = _createComponent();
 
@@ -340,7 +352,7 @@
       tests = _script.getTests().iterator();
       while (tests.hasNext())
       {
-        TestScript.Test test = (TestScript.Test) tests.next();
+        TestScript.Test test = tests.next();
         out.write("\n<!--");
         out.write(test.toString());
         out.write("-->\n");
@@ -441,11 +453,11 @@
   private void _initTests() throws IOException, SAXException
   {
     String script = System.getProperty("trinidad.renderkit.script");
-    Set includedScripts = null;
+    Set<String> includedScripts = null;
     if (script != null)
     {
       String[] scripts = script.split(",");
-      includedScripts = new HashSet();
+      includedScripts = new HashSet<String>();
       for (int i = 0; i < scripts.length; i++)
       {
         System.out.println("Including " + scripts[i]);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java?rev=430818&r1=430817&r2=430818&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/TestResponseWriter.java Fri Aug 11 09:24:50 2006
@@ -68,45 +68,55 @@
       throw new NullPointerException();
 
     _out = out;
-    _contentType = contentType;
+    // -= Simon Lessard =-
+    // TODO: Never read locally as of 2006-08-09. Remove for good if no problem 
+    //       show up.
+    //_contentType = contentType;
     _encoding = encoding;
     _test = test;
     _result = result;
     CaboHttpUtils.validateEncoding(encoding);
   }
 
+  @Override
   public String getCharacterEncoding()
   {
     return _encoding;
   }
 
+  @Override
   public String getContentType()
   {
     return XHTML_CONTENT_TYPE;
   }
 
+  @Override
   public void startDocument() throws IOException
   {
   }
 
 
+  @Override
   public void endDocument() throws IOException
   {
     _out.flush();
   }
 
+  @Override
   public void flush() throws IOException
   {
     _closeStartIfNecessary();
   }
 
 
+  @Override
   public void close()throws IOException
   {
     flush();
     // =-=AEW And anything else?
   }
 
+  @Override
   public void startElement(String name,
                            UIComponent component) throws IOException
   {
@@ -137,7 +147,7 @@
     _startElementImpl(name);
   }
 
-
+  @Override
   public void endElement(String name) throws IOException
   {
     // eliminate any <pending></pending> combinations
@@ -180,7 +190,7 @@
     }
   }
 
-
+  @Override
   public void writeAttribute(String name,
                              Object value,
                              String componentPropertyName)
@@ -225,7 +235,7 @@
   {
     Writer out = _out;
 
-    Class valueClass = value.getClass();
+    Class<?> valueClass = value.getClass();
 
     // Output Boolean values specially
     if (valueClass == _BOOLEAN_CLASS)
@@ -266,6 +276,7 @@
     return false;
   }
 
+  @Override
   public void writeURIAttribute(String name,
                                 Object value,
                                 String componentPropertyName)
@@ -303,6 +314,7 @@
     _uriAttributes.put(name, value);
   }
 
+  @Override
   public void writeComment(Object comment) throws IOException
   {
     if (comment != null)
@@ -313,7 +325,7 @@
     }
   }
 
-
+  @Override
   public void writeText(Object text, String componentPropertyName)
      throws IOException
   {
@@ -333,6 +345,7 @@
   }
 
 
+  @Override
   public void writeText(char text[], int off, int len)
         throws IOException
   {
@@ -340,25 +353,28 @@
     writeText(new String(text, off, len), null);
   }
 
+  @Override
   public void write(char cbuf[], int off, int len) throws IOException
   {
     _closeStartIfNecessary();
     _out.write(cbuf, off, len);
   }
 
+  @Override
   public void write(String str) throws IOException
   {
     _closeStartIfNecessary();
     _out.write(str);
   }
 
+  @Override
   public void write(int c) throws IOException
   {
     _closeStartIfNecessary();
     _out.write((char) c);
   }
 
-
+  @Override
   public ResponseWriter cloneWithWriter(Writer writer)
   {
     try
@@ -407,7 +423,7 @@
    * Writes the value of an object
    */
   private void _writeValue(
-    Class       valueClass,
+    Class<?>    valueClass,
     Object      value,
     boolean     isAttribute
     ) throws IOException
@@ -460,10 +476,10 @@
 
     if (_closeStart)
     {
-      Iterator iter = _attributes.keySet().iterator();
+      Iterator<String> iter = _attributes.keySet().iterator();
       while (iter.hasNext())
       {
-        String name = (String) iter.next();
+        String name = iter.next();
         Object value = _attributes.get(name);
         // Ignore FALSE values, since they won't be written out at all
         if (Boolean.FALSE.equals(value))
@@ -508,7 +524,7 @@
       iter = _uriAttributes.keySet().iterator();
       while (iter.hasNext())
       {
-        String name = (String) iter.next();
+        String name = iter.next();
         Object value = _uriAttributes.get(name);
         // "id" and "name" are treated as URI attrs in link,
         // and "href" sometimes contains "#..." links to IDs
@@ -601,7 +617,7 @@
     if (size == 0)
       return null;
 
-    return (String)_skippedElements.remove(size - 1);
+    return _skippedElements.remove(size - 1);
   }
 
   /**
@@ -649,12 +665,15 @@
   private boolean     _dontEscape;
 
   private boolean _isCachedImage;
-  private Map     _attributes = new TreeMap();
-  private Map     _uriAttributes = new TreeMap();
+  private Map<String, Object> _attributes = new TreeMap<String, Object>();
+  private Map<String, Object> _uriAttributes = new TreeMap<String, Object>();
   private int     _depth;
 
   private Writer       _out;
-  private String       _contentType;
+  // -= Simon Lessard =-
+  // TODO: Never read locally as of 2006-08-09. Remove for good if no problem 
+  //       show up.
+  //private String       _contentType;
   private String       _encoding;
 
   // holds an element that will only be started if it has attributes
@@ -665,13 +684,13 @@
 
   // stack of skipped and unskipped elements used to determine when
   // to suppress the end tag of a skipped element
-  private final ArrayList   _skippedElements = new ArrayList(20);
+  private final ArrayList<String> _skippedElements = new ArrayList<String>(20);
 
 
-  private static final Class _CHAR_ARRAY_CLASS = (new char[0]).getClass();
-  private static final Class _BOOLEAN_CLASS = Boolean.class;
-  private static final Class _INTEGER_CLASS = Integer.class;
-  private static final Class _ESCAPED_TEXT_CLASS = EscapedText.class;
+  private static final Class<?> _CHAR_ARRAY_CLASS = (new char[0]).getClass();
+  private static final Class<Boolean> _BOOLEAN_CLASS = Boolean.class;
+  private static final Class<Integer> _INTEGER_CLASS = Integer.class;
+  private static final Class<EscapedText> _ESCAPED_TEXT_CLASS = EscapedText.class;
 
   static private final int _MAX_INDENT = 50;
   static private final int _SPACES_PER_LEVEL = 2;



Mime
View raw message