incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r429208 [7/14] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/co...
Date Sun, 06 Aug 2006 23:12:54 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java Sun Aug  6 16:12:37 2006
@@ -99,20 +99,20 @@
     if (targetId == null || label == null)
       return;
 
-    Map labelMap = getLabelMap(true);
+    Map<String, String> labelMap = getLabelMap(true);
 
     labelMap.put(targetId, label);
   }
 
 
 
-  public Map getLabelMap(
+  public Map<String, String> getLabelMap(
     boolean  createIfNecessary
     )
   {
     if ((_labelMap == null) && createIfNecessary)
     {
-      _labelMap = new HashMap(31);
+      _labelMap = new HashMap<String, String>(31);
     }
 
     return _labelMap;
@@ -120,13 +120,13 @@
 
 
 
-  public Map getPatternMap(
+  public Map<String, String> getPatternMap(
     boolean createIfNecessary
     )
   {
     if ((_patternMap == null) && createIfNecessary)
     {
-      _patternMap = new HashMap();
+      _patternMap = new HashMap<String, String>();
     }
 
     return _patternMap;
@@ -141,7 +141,7 @@
     if (targetId == null || pattern == null)
       return;
 
-    Map patternMap = getPatternMap(true);
+    Map<String, String> patternMap = getPatternMap(true);
 
     patternMap.put(targetId, pattern);
   }
@@ -162,14 +162,14 @@
       return;
     }
 
-    List neededValues = getNeededValues(true);
+    List<String> neededValues = getNeededValues(true);
     neededValues.add(name);
   }
 
 
   public void addRenderedValue(String name)
   {
-    Set renderedSet = getRenderedValues(true);
+    Set<String> renderedSet = getRenderedValues(true);
     renderedSet.add(name);
   }
 
@@ -192,7 +192,7 @@
 
     if (call != null)
     {
-      List resetCalls = getResetCalls(true);
+      List<String> resetCalls = getResetCalls(true);
 
       // add the call
       resetCalls.add(call);
@@ -200,61 +200,61 @@
   }
 
 
-  public List getResetCalls(
+  public List<String> getResetCalls(
     boolean          createIfNecessary
     )
   {
 
     if (_resetCallsList == null && createIfNecessary)
     {
-      _resetCallsList = new ArrayList();
+      _resetCallsList = new ArrayList<String>();
     }
 
     return _resetCallsList;
   }
 
 
-  public List getClientDependencies(
+  public List<String> getClientDependencies(
     boolean          createIfNecessary
     )
   {
     if ((_clientDependencies == null) && createIfNecessary)
     {
-      _clientDependencies = new ArrayList(10);
+      _clientDependencies = new ArrayList<String>(10);
     }
 
     return _clientDependencies;
   }
 
-  public List getNeededValues(
+  public List<String> getNeededValues(
     boolean createIfNecessary
     )
   {
     if ((_neededValues == null) && createIfNecessary)
     {
-      _neededValues = new ArrayList(10);
+      _neededValues = new ArrayList<String>(10);
     }
 
     return _neededValues;
   }
 
 
-  public Set getRenderedValues(
+  public Set<String> getRenderedValues(
     boolean createIfNecessary
     )
   {
     if ((_renderedSet == null) && createIfNecessary)
     {
-      _renderedSet =  new HashSet(23);
+      _renderedSet =  new HashSet<String>(23);
     }
 
     return _renderedSet;
   }
 
 
-  public Iterator getValidationIterator()
+  public Iterator<String> getValidationIterator()
   {
-    Map validationMap = _getValidationMap(false);
+    Map<String, Integer> validationMap = _getValidationMap(false);
     if ( validationMap == null)
       return null;
 
@@ -262,36 +262,36 @@
   }
 
 
-  public Iterator getErrorFormatIterator()
+  public Iterator<String> getErrorFormatIterator()
   {
-    Map errorFormatMap = _getErrorFormatMap(false);
+    Map<String, Integer> errorFormatMap = _getErrorFormatMap(false);
     if ( errorFormatMap == null)
       return null;
 
     return errorFormatMap.keySet().iterator();
   }
 
-  public List getFormValidatorsInfo(
+  public List<ConvertValidate> getFormValidatorsInfo(
     boolean createIfNecessary
     )
   {
     // create the validators if they don't already exist
     if ((_formValidatorsInfo == null) && createIfNecessary)
     {
-      _formValidatorsInfo = new ArrayList();
+      _formValidatorsInfo = new ArrayList<ConvertValidate>();
     }
 
     return _formValidatorsInfo;
   }
 
 
-  public List getValidatedInputList(
+  public List<String> getValidatedInputList(
     boolean createIfNecessary
     )
   {
     if ((_validatedInputList == null) && createIfNecessary)
     {
-      _validatedInputList = new ArrayList();
+      _validatedInputList = new ArrayList<String>();
     }
 
     return _validatedInputList;
@@ -302,13 +302,13 @@
    * and this method should be killed.
    */
   public void addOnSubmitConverterValidators(
-    UIComponent      component,
-    Converter        converter,
-    Iterator         validators,
-    String           clientId,
-    boolean          immediate,
-    boolean          required,
-    String           requiredMessageKey
+    UIComponent         component,
+    Converter           converter,
+    Iterator<Validator> validators,
+    String              clientId,
+    boolean             immediate,
+    boolean             required,
+    String              requiredMessageKey
     ) throws IOException
   {
     if (clientId == null)
@@ -362,7 +362,7 @@
     {
       while (validators.hasNext())
       {
-        Validator validator = (Validator) validators.next();
+        Validator validator = validators.next();
 
         if (validator instanceof ClientValidator)
         {
@@ -419,7 +419,7 @@
     if (validator != null && convertValidate != null)
     {
       if (convertValidate.validators == null)
-        convertValidate.validators = new ArrayList();
+        convertValidate.validators = new ArrayList<Integer>();
 
       // add the validator
       convertValidate.validators.add(_addValidation(validator));
@@ -459,16 +459,16 @@
 
     }
 
-    Object clientDependency = submitConverter.getClientScript(fcontext,
-                                                                component);
+    String clientDependency = submitConverter.getClientScript(fcontext,
+                                                              component);
     if (clientDependency != null)
     {
-      List clientDependencies = getClientDependencies(true);
+      List<String> clientDependencies = getClientDependencies(true);
       clientDependencies.add(clientDependency);
     }
 
-    String converter = (String)submitConverter.getClientConversion(fcontext,
-                                                                   component);
+    String converter = submitConverter.getClientConversion(fcontext,
+                                                           component);
 
     if (converter != null)
     {
@@ -505,18 +505,17 @@
     }
     else
     {
-      Object clientDependency = submitValidator.getClientScript(fContext,
-                                                                  component);
+      String clientDependency = submitValidator.getClientScript(fContext,
+                                                                component);
       if (clientDependency != null)
       {
-        List clientDependencies = getClientDependencies(true);
+        List<String> clientDependencies = getClientDependencies(true);
         clientDependencies.add(clientDependency);
       }
     }
 
-    String validator = (String)submitValidator.getClientValidation(
-                                                     fContext,
-                                                     component);
+    String validator = submitValidator.getClientValidation(fContext,
+                                                           component);
 
     if (validator != null)
     {
@@ -535,9 +534,9 @@
     )
   {
     //TODO - not checking for null so map always getting created
-    Map validationMap = _getValidationMap(true);
+    Map<String, Integer> validationMap = _getValidationMap(true);
 
-    Integer validationIndex = (Integer)validationMap.get(validation);
+    Integer validationIndex = validationMap.get(validation);
 
     if (validationIndex == null)
     {
@@ -559,9 +558,9 @@
   {
     if (errorFormat != null)
     {
-      Map errorFormatMap = _getErrorFormatMap(true);
+      Map<String, Integer> errorFormatMap = _getErrorFormatMap(true);
 
-      Integer errorFormatIndex = (Integer)errorFormatMap.get(errorFormat);
+      Integer errorFormatIndex = errorFormatMap.get(errorFormat);
 
       if (errorFormatIndex == null)
       {
@@ -593,7 +592,7 @@
       convertValidateInfo.clientId = clientId;
 
       // add to list
-      List convertValidateList = getFormValidatorsInfo(true);
+      List<ConvertValidate> convertValidateList = getFormValidatorsInfo(true);
       convertValidateList.add(convertValidateInfo);
 
       return convertValidateInfo;
@@ -618,25 +617,25 @@
 
 
 
-  private Map _getValidationMap(
+  private Map<String, Integer> _getValidationMap(
     boolean          createIfNecessary
     )
   {
     if ((_validationMap == null) && createIfNecessary)
     {
-      _validationMap = new LinkedHashMap(31);
+      _validationMap = new LinkedHashMap<String, Integer>(31);
     }
 
     return _validationMap;
   }
 
-  private Map _getErrorFormatMap(
+  private Map<String, Integer> _getErrorFormatMap(
     boolean          createIfNecessary
     )
   {
     if ((_errorFormatMap == null) && createIfNecessary)
     {
-      _errorFormatMap = new LinkedHashMap(31);
+      _errorFormatMap = new LinkedHashMap<String, Integer>(31);
     }
 
     return _errorFormatMap;
@@ -716,51 +715,51 @@
   // map of unique validation string to index in map
   // used so that each converter and validator constructor
   // is only written out once
-  private Map _validationMap = null;
+  private Map<String, Integer> _validationMap = null;
 
   // map of unique error string to index in map
   // used so that each error string is only written out once
-  private Map _errorFormatMap = null;
+  private Map<String, Integer> _errorFormatMap = null;
 
   // List of ConvertValidate objects
-  private List _formValidatorsInfo;
+  private List<ConvertValidate> _formValidatorsInfo;
 
   // javascript needed for client validations
-  private List _clientDependencies;
+  private List<String> _clientDependencies;
 
 
   // List of id's of input controls that need to get validated
-  private List _validatedInputList;
+  private List<String> _validatedInputList;
 
 
   private boolean _useCompoundNames = false;
 
   // List of empty hidden fields that will be filled during event generation
-  private List _neededValues;
+  private List<String> _neededValues;
 
 
-  private Set _renderedSet;
+  private Set<String> _renderedSet;
 
   // maps labels to id's
   // need a label map because the label is not always an attribute
   // on the component
-  private Map _labelMap = null;
+  private Map<String, String> _labelMap = null;
 
   // List of reset calls
-  private List _resetCallsList = null;
+  private List<String> _resetCallsList = null;
 
   // maps patterns to id's
-  private Map _patternMap;
+  private Map<String, String> _patternMap;
 
   private String _formName = null;
 
  public static final class ConvertValidate
   {
-    public String    clientId;
-    public boolean   required = false;
-    public Integer   requiredFormatIndex;
-    public ArrayList validators;
-    public Object    converter;
+    public String             clientId;
+    public boolean            required = false;
+    public Integer            requiredFormatIndex;
+    public ArrayList<Integer> validators;
+    public Object             converter;
   }
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java Sun Aug  6 16:12:37 2006
@@ -33,6 +33,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -44,11 +45,13 @@
     _contentStyleKey = type.findKey("contentStyle");
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected final void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -140,6 +143,7 @@
   {
   }
 
+  @Override
   protected void renderEventHandlers(
     FacesContext context,
     FacesBean    bean) throws IOException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormInputRenderer.java Sun Aug  6 16:12:37 2006
@@ -33,6 +33,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -42,6 +43,7 @@
   /**
    * Render the client ID as both an "id" and a "name"
    */
+  @Override
   protected void renderId(
     FacesContext context,
     UIComponent  component) throws IOException
@@ -90,6 +92,7 @@
    * attribute values on the 'content' piece. This is usually false.
    * @throws IOException
    */
+  @Override
   protected void renderAllAttributes(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Sun Aug  6 16:12:37 2006
@@ -28,6 +28,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
+import javax.faces.validator.Validator;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.bean.FacesBean;
@@ -46,8 +47,6 @@
 // TODO: Remove this class
 import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/base/xhtml/FormRenderer.java#0 $) $Date: 10-nov-2005.18:53:51 $
  * @author The Oracle ADF Faces Team
@@ -59,10 +58,14 @@
     super(CoreForm.TYPE);
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   public void decode(FacesContext context,
                      UIComponent component)
   {
-    Map paramMap = context.getExternalContext().getRequestParameterMap();
+    Map<String, String> paramMap = 
+      context.getExternalContext().getRequestParameterMap();
+    
     Object formName = paramMap.get(CoreResponseStateManager.FORM_FIELD_NAME);
     boolean submitted = false;
 
@@ -76,11 +79,13 @@
       ((UIXForm) component).setSubmitted(submitted);
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return false;
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -91,7 +96,7 @@
     _targetFrameKey = type.findKey("targetFrame");
   }
 
-
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -193,7 +198,7 @@
     }
   }
 
-
+  @Override
   protected void encodeEnd(
     FacesContext        context,
     RenderingContext arc,
@@ -307,6 +312,7 @@
   /**
    * Returns the inline Style used to render this node.
    */
+  @Override
   protected String getInlineStyle(FacesBean bean)
   {
     String inlineStyle = super.getInlineStyle(bean);
@@ -320,6 +326,7 @@
   /**
    * Render the client ID as both an "id" and a "name"
    */
+  @Override
   protected void renderId(
     FacesContext context,
     UIComponent  component) throws IOException
@@ -334,6 +341,7 @@
   /**
    * All editable components need IDs.
    */
+  @Override
   protected boolean shouldRenderId(
     FacesContext context,
     UIComponent  component)
@@ -355,7 +363,7 @@
     // Write the array of reset calls
     //
     FormData fData = arc.getFormData();
-    List resetCallList = fData.getResetCalls(false);
+    List<String> resetCallList = fData.getResetCalls(false);
 
     int resetCallCount = (resetCallList != null)
                             ? resetCallList.size()
@@ -380,7 +388,7 @@
 
       for (int i = 0; i < resetCallCount; i++)
       {
-        String currCall = (String)resetCallList.get(i);
+        String currCall = resetCallList.get(i);
 
         if (firstCall)
         {
@@ -436,7 +444,7 @@
     // The dependencies may be needed - see bug
     // 4409339 TURNING OFF CLIENT SIDE VALIDATION CAUSES
     //                                ERRORS IN SELECTINPUTCOLOR & DATE
-    List clientDependencies = fData.getClientDependencies( false);
+    List<String> clientDependencies = fData.getClientDependencies( false);
     if (clientDependencies != null)
     {
       for (int d = 0; d < clientDependencies.size(); d++)
@@ -471,7 +479,7 @@
     // Write the array of validation calls
     //
 
-    Iterator validationIterator = fData.getValidationIterator();
+    Iterator<String> validationIterator = fData.getValidationIterator();
 
     if (validationIterator != null)
     {
@@ -483,7 +491,7 @@
 
       while(validationIterator.hasNext())
       {
-        String currValidation = (String)validationIterator.next();
+        String currValidation = validationIterator.next();
 
         if (firstValidation)
         {
@@ -514,7 +522,8 @@
     writer.writeText(jsID, null);
 
     // get the form validators
-    List validatorInfoList = fData.getFormValidatorsInfo(false);
+    List<FormData.ConvertValidate> validatorInfoList = 
+      fData.getFormValidatorsInfo(false);
 
     if (validatorInfoList == null)
     {
@@ -540,8 +549,7 @@
           writer.writeText("],", null);
         }
 
-        FormData.ConvertValidate convertValidate =
-          (FormData.ConvertValidate)validatorInfoList.get(j);
+        FormData.ConvertValidate convertValidate = validatorInfoList.get(j);
 
         writer.writeText("\"", null);
 
@@ -574,7 +582,7 @@
 
         writer.writeText(",[", null);
 
-        ArrayList validatorInfo = convertValidate.validators;
+        ArrayList<Integer> validatorInfo = convertValidate.validators;
 
         if (validatorInfo != null)
         {
@@ -615,7 +623,7 @@
     //
 
     // list of labels used for validation on this form
-    List inputList = fData.getValidatedInputList(false);
+    List<String> inputList = fData.getValidatedInputList(false);
 
     int inputCount = (inputList != null)
                          ? inputList.size()
@@ -623,7 +631,7 @@
 
     if (inputCount > 0)
     {
-      Map labelMap = fData.getLabelMap(false);
+      Map<String, String> labelMap = fData.getLabelMap(false);
 
       if (labelMap != null)
       {
@@ -635,11 +643,11 @@
 
         for (int i = 0; i < inputCount; i++)
         {
-          String currID = (String)inputList.get(i);
+          String currID = inputList.get(i);
 
           // remove the ID entry to prevent multiple labels from
           // being written
-          String currLabel = (String)labelMap.remove(currID);
+          String currLabel = labelMap.remove(currID);
 
           if (currLabel != null)
           {
@@ -671,7 +679,7 @@
       // =-= jrf: optimize pattern reuse?
       // BUG 2024773
 
-      Map patternMap = fData.getPatternMap(false);
+      Map<String, String> patternMap = fData.getPatternMap(false);
 
       if (patternMap != null)
       {
@@ -683,11 +691,11 @@
 
         for (int i = 0; i < inputCount; i++)
         {
-          String currID = (String)inputList.get(i);
+          String currID = inputList.get(i);
 
           // remove the ID entry to prevent multiple labels from
           // being written
-          String currPattern = (String)patternMap.remove(currID);
+          String currPattern = patternMap.remove(currID);
 
           if (currPattern != null)
           {
@@ -722,7 +730,7 @@
     //
 
     // list of error formats used for validation on this form
-    Iterator errorFormatIterator = fData.getErrorFormatIterator();
+    Iterator<String> errorFormatIterator = fData.getErrorFormatIterator();
 
     if (errorFormatIterator != null)
     {
@@ -734,7 +742,7 @@
 
       while(errorFormatIterator.hasNext())
       {
-        String currErrorFormat = (String)errorFormatIterator.next();
+        String currErrorFormat = errorFormatIterator.next();
 
         if (firstFormat)
         {
@@ -767,19 +775,21 @@
     ) throws IOException
   {
     ResponseWriter writer = context.getResponseWriter();
-    List subforms =
+    List<String> subforms =
       SubformRenderer.getSubformList(context, false, false);
+    
     writer.writeText("var ", null);
     writer.writeText(jsID, null);
     writer.writeText("_SF={", null);
     if ((subforms != null) && !subforms.isEmpty())
     {
-      List defaultSubforms =
+      List<String> defaultSubforms =
         SubformRenderer.getSubformList(context, true, false);
-      Iterator ids = subforms.iterator();
+      
+      Iterator<String> ids = subforms.iterator();
       while (ids.hasNext())
       {
-        String id = (String) ids.next();
+        String id = ids.next();
         writer.writeText("\"", null);
         writer.writeText(id, null);
         writer.writeText("\":", null);
@@ -836,13 +846,13 @@
   }
 
  public static void addOnSubmitConverterValidators(
-    UIComponent      component,
-    Converter        converter,
-    Iterator         validators,
-    String           clientId,
-    boolean          immediate,
-    boolean          required,
-    String           requiredMessageKey
+    UIComponent         component,
+    Converter           converter,
+    Iterator<Validator> validators,
+    String              clientId,
+    boolean             immediate,
+    boolean             required,
+    String              requiredMessageKey
     ) throws IOException
   {
     FormData fData = RenderingContext.getCurrentInstance().getFormData();
@@ -1017,6 +1027,7 @@
     return onKeypress;
   }
 
+  @Override
   protected String getOnkeypress(FacesBean bean)
   {
     // Back out the default keypress, since we need more info
@@ -1070,7 +1081,7 @@
     else
     {
       int realNeededIndex = 0;
-      List neededValues = fData.getNeededValues(false);
+      List<String> neededValues = fData.getNeededValues(false);
 
       //
       // loop over the list of needed names, creating hidden fields
@@ -1090,11 +1101,11 @@
                                 ? null
                                 : "a";
 
-        Set renderedValues = fData.getRenderedValues(true);
+        Set<String> renderedValues = fData.getRenderedValues(true);
 
         for (int i = 0; i < neededCount; i++)
         {
-          Object currName = neededValues.get(i);
+          String currName = neededValues.get(i);
 
           // if the needed name hasn't been rendered, add it to our
           // list of unrendered elements
@@ -1152,6 +1163,8 @@
   private PropertyKey _onsubmitKey;
   private PropertyKey _targetFrameKey;
 
-
+  // -= Simon Lessard =-
+  // FIXME: Nothing in this class is logged as of 2006-08-03
+  @SuppressWarnings("unused")
   static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FormRenderer.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Sun Aug  6 16:12:37 2006
@@ -41,6 +41,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -53,7 +54,7 @@
     _textKey = type.findKey("text");
   }
 
-
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -111,6 +112,7 @@
                                        "b");
   }
 
+  @Override
   public void encodeEnd(
     FacesContext        context,
     RenderingContext arc,
@@ -124,6 +126,7 @@
   /**
    * Renders the client ID as both "id" and "name"
    */
+  @Override
   protected void renderId(
     FacesContext context,
     UIComponent  component) throws IOException
@@ -137,6 +140,7 @@
     }
   }
 
+  @Override
   protected void renderEventHandlers(
     FacesContext context,
     FacesBean    bean) throws IOException
@@ -196,6 +200,7 @@
     return toString(bean.getProperty(_textKey));
   }
 
+  @Override
   protected String getStyleClass(FacesBean bean)
   {
     String styleClass = super.getStyleClass(bean);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GroupRenderer.java Sun Aug  6 16:12:37 2006
@@ -17,14 +17,11 @@
 
 import java.io.IOException;
 
-import java.util.List;
-
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.bean.FacesBean;
-import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.CoreGroup;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
@@ -36,11 +33,13 @@
     super(CoreGroup.TYPE);
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HeadRenderer.java Sun Aug  6 16:12:37 2006
@@ -52,12 +52,14 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _titleKey = type.findKey("title");
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -87,7 +89,7 @@
     _writeCookieScript(context, arc);
   }
 
-
+  @Override
   protected void encodeEnd(
     FacesContext        context,
     RenderingContext arc,
@@ -187,6 +189,7 @@
   private CoreRenderer _styleSheetRenderer = new StyleSheetRenderer()
   {
     // Don't render the ID
+    @Override
     protected void renderId(
       FacesContext context,
       UIComponent  component)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HtmlRenderer.java Sun Aug  6 16:12:37 2006
@@ -61,6 +61,7 @@
     super(type);
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -116,6 +117,7 @@
     }
   }
 
+  @Override
   public void encodeEnd(
     FacesContext        context,
     RenderingContext arc,
@@ -198,19 +200,15 @@
    * Determines whether we have a frameset component as a child
    * for determining which doctype to return
    */
+  @SuppressWarnings("unchecked")
   private boolean _hasFrameSet(UIComponent component)
   {
-    List children = component.getChildren();
-    int childCount = component.getChildCount();
-    
-    for (int i = 0; i < childCount; i++)
-    {
-      UIComponent currChild = (UIComponent) children.get(i);
-      
-      if (HtmlFrameBorderLayout.COMPONENT_FAMILY.equals(currChild.getFamily()))
+    for(UIComponent child : (List<UIComponent>)component.getChildren())
+    {
+      if (HtmlFrameBorderLayout.COMPONENT_FAMILY.equals(child.getFamily()))
       {
         return true;
-      }
+      }     
     }
 
     return false;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/IconRenderer.java Sun Aug  6 16:12:37 2006
@@ -38,12 +38,14 @@
     super(CoreIcon.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _nameKey = type.findKey("name");
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -111,6 +113,7 @@
     }
   }
 
+  @Override
   protected void renderShortDescAttribute(
     FacesContext        context,
     RenderingContext arc,
@@ -124,14 +127,14 @@
     return toString(bean.getProperty(_nameKey));
   }
 
-  private Map _getNodeAttributeMap(
+  private Map<String, Object> _getNodeAttributeMap(
     FacesContext        context,
     UIComponent         comp,
     FacesBean           bean,
     boolean             embed)
   {
-    Map attrs = null;
-    attrs = new ArrayMap(1);
+    Map<String, Object> attrs = null;
+    attrs = new ArrayMap<String, Object>(1);
 
     attrs.put(Icon.SHORT_DESC_KEY, getShortDesc(bean));
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ImageRenderer.java Sun Aug  6 16:12:37 2006
@@ -35,6 +35,7 @@
     super(CoreImage.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -43,6 +44,7 @@
     _sourceKey = type.findKey("source");
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -57,6 +59,7 @@
     rw.endElement("img");
   }
 
+  @Override
   protected void renderAllAttributes(
     FacesContext        context,
     RenderingContext arc,
@@ -72,6 +75,7 @@
     _renderImageMap(bean, rw);
   }
 
+  @Override
   protected void renderShortDescAttribute(
     FacesContext        context,
     RenderingContext arc,
@@ -95,7 +99,6 @@
     return toUri(bean.getProperty(_longDescURLKey));
   }
 
-
   protected String getSource(FacesBean bean)
   {
     return toUri(bean.getProperty(_sourceKey));
@@ -118,7 +121,6 @@
       writer.writeAttribute("name", clientId, null);
     }
   }
-
 
   private void _renderImageMap(
     FacesBean           bean,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputColorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputColorRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputColorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputColorRenderer.java Sun Aug  6 16:12:37 2006
@@ -30,16 +30,19 @@
     super(CoreInputColor.TYPE);
   }  
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputColor";
   }  
     
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleInputColor;
   }
   
+  @Override
   protected String getLabelFor(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputDateRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputDateRenderer.java Sun Aug  6 16:12:37 2006
@@ -26,11 +26,13 @@
     super(CoreInputDate.TYPE);
   }  
   
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleInputDate;
   }
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputDate";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java Sun Aug  6 16:12:37 2006
@@ -34,6 +34,7 @@
     super(CoreInputFile.TYPE);
   }
   
+  @Override
   protected final void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -48,11 +49,13 @@
     }
   }
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputFile";
   }
   
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleInputFile;
@@ -63,6 +66,7 @@
    * @param bean
    * @return false, since inputFile does not support the readOnly attribute
    */
+  @Override
   protected boolean isReadOnly(FacesBean bean)
   {
     return false;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java Sun Aug  6 16:12:37 2006
@@ -33,6 +33,7 @@
     super(CoreInputHidden.TYPE);
   }
   
+  @Override
   protected boolean wasSubmitted(
     FacesContext context,
     UIComponent  component)
@@ -40,11 +41,13 @@
     return true;
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected final void encodeAll(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java Sun Aug  6 16:12:37 2006
@@ -37,6 +37,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -45,11 +46,13 @@
     _readOnlyKey   = type.findKey("readOnly");
   }  
   
+  @Override
   public void decode(FacesContext context, UIComponent component)
   {
      getFormInputRenderer().decode(context, component);
   }
   
+  @Override
   public Object getConvertedValue(
     FacesContext context,
     UIComponent  component,
@@ -60,6 +63,7 @@
                                               submittedValue);
   }
 
+  @Override
   protected String getLabelFor(
     FacesContext        context,
     RenderingContext arc,
@@ -74,6 +78,7 @@
   }
 
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -116,13 +121,14 @@
    * If it's known that the field content is not editable, return false. 
    * Otherwise, assume it is editable and return true
    */
+  @Override
   protected boolean isContentEditable(FacesBean bean)
   {
     return !getFormInputRenderer().getReadOnly(
                                    FacesContext.getCurrentInstance(), bean);  
   }
  
-  
+  @Override
   protected void renderFieldCellContents(
     FacesContext        context,
     RenderingContext arc,
@@ -131,8 +137,6 @@
   {
     delegateRenderer(context, arc, component, bean, getFormInputRenderer());
   }
-  
-
  
   protected boolean getSimple(FacesBean bean)
   {
@@ -152,6 +156,7 @@
    * @param bean
    * @throws IOException
    */
+  @Override
   protected void renderRootDomElementStyles(
    FacesContext        context,
    RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputListOfValuesRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputListOfValuesRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputListOfValuesRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputListOfValuesRenderer.java Sun Aug  6 16:12:37 2006
@@ -28,11 +28,13 @@
     super(CoreInputListOfValues.TYPE);
   }  
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputListOfValues";
   } 
  
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleInputListOfValue;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputTextRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputTextRenderer.java Sun Aug  6 16:12:37 2006
@@ -27,11 +27,13 @@
     super(CoreInputText.TYPE);
   } 
 
+  @Override
   protected String getRootStyleClass(FacesBean bean)  
   {
     return "af|inputText";
   } 
   
+  @Override
   protected String getDefaultLabelValign(FacesBean bean)
   {
     if (_simpleInputText.isTextArea(bean))
@@ -40,6 +42,7 @@
     return null;
   }
 
+  @Override
   protected FormInputRenderer getFormInputRenderer()
   {
     return _simpleInputText;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java Sun Aug  6 16:12:37 2006
@@ -49,6 +49,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -63,6 +64,7 @@
   }
 
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -137,6 +139,7 @@
     // do nothing for now
   } 
 
+  @Override
   protected boolean shouldRenderId(
     FacesContext context,
     UIComponent  component)
@@ -158,6 +161,7 @@
 
   /**
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -403,6 +407,7 @@
   /**
    * Returns the client ID.
    */
+  @Override
   protected String getClientId(
     FacesContext context,
     UIComponent  component)
@@ -489,6 +494,7 @@
       _inTable = inTable;
     }
 
+    @Override
     protected boolean shouldRenderId(
       FacesContext context,
       UIComponent  component)
@@ -496,6 +502,7 @@
       return false;
     }
 
+    @Override
     protected void renderAllAttributes(
       FacesContext        context,
       RenderingContext arc,
@@ -504,6 +511,7 @@
       // Block everything
     }
 
+    @Override
     protected String getDefaultValign(FacesBean bean)
     {
       // get the defaultLabelValign from the form component.
@@ -511,6 +519,7 @@
     }
 
 
+    @Override
     protected String getConvertedString(
       FacesContext context,
       UIComponent  component,
@@ -526,6 +535,7 @@
      * Only display the required icon indicator if we're required
      * or showRequired is on.
      */
+    @Override
     protected boolean getShowRequired(FacesBean bean)
     {
       // Inside the table, never show the required icon.
@@ -535,6 +545,7 @@
       return (LabelAndMessageRenderer.this.labelShowRequired(bean));
     }
 
+    @Override
     protected char getAccessKey(FacesBean bean)
     {
       if (LabelAndMessageRenderer.this.showAccessKeyOnLabel(bean))
@@ -543,6 +554,7 @@
       return CHAR_UNDEFINED;
     }
 
+    @Override
     protected String getShortDesc(FacesBean bean)
     {
       String shortDesc = super.getShortDesc(bean);
@@ -556,6 +568,7 @@
       return shortDesc;
     }
 
+    @Override
     protected String getForId(
       FacesContext context,
       UIComponent  component,
@@ -567,6 +580,7 @@
                          bean);
     }
 
+    @Override
     protected boolean isLabelTagNeeded(
       RenderingContext arc,
       FacesBean           bean,
@@ -590,6 +604,7 @@
       super(type);
     }
 
+    @Override
     protected boolean shouldRenderId(
       FacesContext context,
       UIComponent  component)
@@ -597,16 +612,19 @@
       return false;
     }
 
+    @Override
     protected String getShortDesc(FacesBean bean)
     {
       return null;
     }
 
+    @Override
     protected boolean getIndented(FacesBean bean)
     {
       return LabelAndMessageRenderer.this.isIndented();
     }
 
+    @Override
     protected void renderAllAttributes(
       FacesContext        context,
       RenderingContext arc,
@@ -614,6 +632,7 @@
     {
     }
 
+    @Override
     protected String getForId(
       FacesContext context,
       UIComponent  component,
@@ -693,9 +712,9 @@
     RenderingContext arc,
     String              styleClass)  
   {
-    Map keyMap = arc.getSkinResourceKeyMap();
+    Map<String, String> keyMap = arc.getSkinResourceKeyMap();
     return (keyMap != null) ?
-            (String) keyMap.get(styleClass) :
+            keyMap.get(styleClass) :
             null;
   }
   

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java Sun Aug  6 16:12:37 2006
@@ -45,6 +45,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -53,11 +54,13 @@
     _messageKey     = type.findKey("message");
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Sun Aug  6 16:12:37 2006
@@ -47,6 +47,7 @@
     super(CoreNavigationPane.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -55,11 +56,13 @@
     _titleKey = type.findKey("title");
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -96,6 +99,7 @@
     return stamp;
   }
 
+  @SuppressWarnings("unchecked")
   protected void renderContent(
     FacesContext        context,
     RenderingContext arc,
@@ -110,13 +114,11 @@
     if (nodeStamp == null)
     {
       // we aren't stamping, but rather have explicitly defined children:
-      List<UIComponent> children = component.getChildren();
-      int childrenLength = children.size();
-      for (int i=0; i<childrenLength; i++)
+      for(UIComponent child : (List<UIComponent>)component.getChildren())
       {
         try
         {
-          UIXCommand navItem = (UIXCommand)children.get(i);
+          UIXCommand navItem = (UIXCommand)child;
           if (navItem.isRendered())
           {
             // collect the information needed to render this nav item:
@@ -174,7 +176,7 @@
       int nextActiveIndex = navItemData.getEffectiveActiveIndex() - 1;
       for (int i=0; i<visibleItemCount; i++)
       {
-        Map currentItemData = navItemData.getItemData(i);
+        Map<String, Object> currentItemData = navItemData.getItemData(i);
         currentItemData.put("isFirst", (i == 0));
         currentItemData.put("isLast", (i == lastRowIndex));
         currentItemData.put("previousActive", previousActive);
@@ -252,6 +254,7 @@
     return renderingHint;
   }
 
+  @Override
   protected String getShortDesc(FacesBean bean)
   {
     return toString(bean.getProperty(_shortDescKey));
@@ -314,7 +317,7 @@
         isActive = false; // there can only be 1 active item
       }
     }
-    HashMap itemDataMap = new HashMap();
+    HashMap<String, Object> itemDataMap = new HashMap<String, Object>();
     itemDataMap.put("accessKey", _getCommandChildProperty(commandChild, "accessKey"));
     itemDataMap.put("component", commandChild);
     itemDataMap.put("dataIndex", itemDataIndex);
@@ -378,7 +381,7 @@
     FacesContext context,
     RenderingContext arc,
     ResponseWriter rw,
-    Map itemData,
+    Map<String, Object> itemData,
     String renderingHint,
     boolean isRtl
     ) throws IOException
@@ -456,7 +459,7 @@
     RenderingContext arc,
     ResponseWriter rw,
     String iconUri,
-    Map itemData,
+    Map<String, Object> itemData,
     boolean isDisabled,
     boolean isRtl
     ) throws IOException
@@ -501,7 +504,7 @@
     FacesContext context,
     RenderingContext arc,
     ResponseWriter rw,
-    Map itemData,
+    Map<String, Object> itemData,
     boolean isDisabled
     ) throws IOException
   {
@@ -658,7 +661,7 @@
     FacesContext context,
     RenderingContext arc,
     ResponseWriter rw,
-    Map itemData,
+    Map<String, Object> itemData,
     boolean isRtl,
     boolean isBar,
     boolean isList
@@ -845,7 +848,7 @@
     FacesContext context,
     RenderingContext arc,
     ResponseWriter rw,
-    Map itemData
+    Map<String, Object> itemData
     ) throws IOException
   {
     // Choice items do not support icons at this time.
@@ -1016,7 +1019,7 @@
     FacesContext context,
     RenderingContext arc,
     ResponseWriter rw,
-    Map itemData,
+    Map<String, Object> itemData,
     boolean isRtl
     ) throws IOException
   {
@@ -1211,7 +1214,7 @@
     String topStyleClass,
     String bottomStyleClass,
     String bottomContentStyleClass,
-    Map itemData,
+    Map<String, Object> itemData,
     boolean isDisabled,
     boolean isRtl
     ) throws IOException
@@ -1263,7 +1266,7 @@
   {
     NavItemData()
     {
-      _list = new ArrayList<Map>();
+      _list = new ArrayList<Map<String, Object>>();
       _effectiveActiveIndex = -1;
     }
 
@@ -1282,17 +1285,17 @@
       return _list.size();
     }
 
-    void addItemData(Map itemData)
+    void addItemData(Map<String, Object> itemData)
     {
       _list.add(itemData);
     }
 
-    Map getItemData(int index)
+    Map<String, Object> getItemData(int index)
     {
       return _list.get(index);
     }
 
-    private List<Map> _list;
+    private List<Map<String, Object>> _list;
     private int _effectiveActiveIndex;
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputFormattedRenderer.java Sun Aug  6 16:12:37 2006
@@ -37,13 +37,14 @@
     super(CoreOutputFormatted.TYPE);
   }
   
-  
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _styleUsageKey = type.findKey("styleUsage");
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -57,6 +58,7 @@
     renderAllAttributes(context, arc, bean);
   }
 
+  @Override
   public void encodeEnd(
     FacesContext        context,
     RenderingContext arc,
@@ -74,6 +76,7 @@
     return toString(bean.getProperty(_styleUsageKey));
   }
 
+  @Override
   protected String getStyleClass(FacesBean bean)
   {
     String styleClass = super.getStyleClass(bean);
@@ -82,16 +85,17 @@
       String usage = getStyleUsage(bean);
       if (usage != null)
       {
-        styleClass = (String) _USAGES.get(usage);
+        styleClass = _USAGES.get(usage);
       }
     }
 
     return styleClass;
   }
 
-  static private final Map _USAGES = new HashMap();
+  static private final Map<String, String> _USAGES;
   static
   {
+    _USAGES = new HashMap<String, String>();
     _USAGES.put(CoreOutputFormatted.STYLE_USAGE_IN_CONTEXT_BRANDING,
                 XhtmlConstants.IN_CONTEXT_TEXT_STYLE_CLASS);
     _USAGES.put(CoreOutputFormatted.STYLE_USAGE_INSTRUCTION,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java Sun Aug  6 16:12:37 2006
@@ -48,6 +48,13 @@
     super(type);
   }
 
+  @Override
+  public boolean getRendersChildren()
+  {
+    return true;
+  }
+
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -57,18 +64,13 @@
     _showRequiredKey       = type.findKey("showRequired");
   }
 
-
-  public boolean getRendersChildren()
-  {
-    return true;
-  }
-
   /**
    * @todo Often, we can get by with just a single label, not
    * a span and a label
    * @todo If all that is set is "required", it seems that we
    *  *don't* render a span, but do render the icon.  This is strange.
    */
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -273,6 +275,7 @@
   // OVERRIDES
   //
   
+  @Override
    protected void renderAllAttributes(
      FacesContext        context,
      RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputTextRenderer.java Sun Aug  6 16:12:37 2006
@@ -35,6 +35,7 @@
     super(CoreOutputText.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -44,6 +45,7 @@
     _descriptionKey = type.findKey("description");
   }
 
+  @Override
   protected void encodeBegin(
     FacesContext        context,
     RenderingContext arc,
@@ -60,6 +62,7 @@
     }
   }
 
+  @Override
   public void encodeEnd(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java Sun Aug  6 16:12:37 2006
@@ -232,13 +232,13 @@
     if (icon.isNull())
       return;
 
-    Map attrs = null;
+    Map<String, Object> attrs = null;
 
     if ((shortDesc != null)  ||
         (align != null)      ||
          embedded)
     {
-      attrs = new ArrayMap(3);
+      attrs = new ArrayMap<String, Object>(3);
       attrs.put(Icon.SHORT_DESC_KEY, shortDesc);
       attrs.put(Icon.ALIGN_KEY, align);
       attrs.put(Icon.EMBEDDED_KEY, Boolean.valueOf(embedded));

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java Sun Aug  6 16:12:37 2006
@@ -41,6 +41,7 @@
     super(type);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -50,11 +51,13 @@
     _contentStyleKey = type.findKey("contentStyle");
   }
   
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -79,6 +82,7 @@
     writer.endElement("table");
   }
   
+  @Override
   protected void renderAllAttributes(FacesContext context, 
     RenderingContext arc, 
     FacesBean bean) throws IOException
@@ -87,6 +91,7 @@
     OutputUtils.renderLayoutTableAttributes(context, arc, "0", null);
   }
   
+  @Override
   protected void renderStyleAttributes(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java Sun Aug  6 16:12:37 2006
@@ -48,6 +48,7 @@
     super(CorePanelFormLayout.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -58,6 +59,7 @@
     _maxColumnsKey = type.findKey("maxColumns");
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -67,6 +69,7 @@
    * This is how we can render both the user defined styleClass and our
    * component style class.
    */
+  @Override
   protected void renderStyleAttributes(
     FacesContext        context,
     RenderingContext arc,
@@ -130,6 +133,8 @@
     return XhtmlConstants.AF_LABEL_TEXT_STYLE_CLASS;
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -197,6 +202,7 @@
     rw.endElement("div"); // the root element
   }
   
+  @SuppressWarnings("unchecked")
   private void _encodeChildren(
     FacesContext        context,
     RenderingContext arc,
@@ -208,7 +214,9 @@
   {
     // We cannot render a nested panelForm with any more than a single column
     // so we must monitor whether we are nested or not:
-    Map requestMap = context.getExternalContext().getRequestMap();
+    Map<String, Object> requestMap = 
+      context.getExternalContext().getRequestMap();
+    
     Integer nestLevelObject = (Integer)requestMap.get(PANEL_FORM_NEST_LEVEL_KEY);
     int nestLevel = 0;
     if (nestLevelObject != null)
@@ -220,7 +228,7 @@
     // Iterate through the childPeers extracting and counting the number of
     // visible children, also count the visible children inside of visible
     // DhtmlGroupPeers:
-    List childComponents = component.getChildren();
+    List<UIComponent> childComponents = component.getChildren();
     FormItemInfo visibleFormItemInfo = _extractVisibleItems(childComponents);
     List<FormItem> visibleFormItems = visibleFormItemInfo.getFormItems();
     int totalFormItemCount = visibleFormItemInfo.getTotalFormItemCount();
@@ -353,6 +361,7 @@
    * UIXGroups.
    * @param 
    */
+  @SuppressWarnings("unchecked")
   private FormItemInfo _extractVisibleItems(List<UIComponent> children)
   {
     FormItemInfo formItemInfo = new FormItemInfo();
@@ -568,6 +577,7 @@
       outerTableWidth);
   }
 
+  @SuppressWarnings("unchecked")
   private void _encodeFormColumns(
     FacesContext        context,
     RenderingContext arc,
@@ -717,7 +727,7 @@
       // If a peer wants to play well with panelForm, it must use the proper
       // PanelForm wrapper APIs to ensure proper DOM structure.
       _encodeBeforeLabelTd(context, arc, rw, startAlignedLabels);
-      Map originalResourceKeyMap = arc.getSkinResourceKeyMap();
+      Map<String, String> originalResourceKeyMap = arc.getSkinResourceKeyMap();
       try
       {
         if (startAlignedLabels)
@@ -797,12 +807,15 @@
    * @param rw ResponseWriter
    * @throws IOException
    */
+  @SuppressWarnings("unchecked")
   protected static void encodeBetweenLabelAndFieldCells(
     FacesContext        context,
     RenderingContext arc,
     ResponseWriter      rw) throws IOException
   {
-    Map requestMap = context.getExternalContext().getRequestMap();
+    Map<String, Object> requestMap = 
+      context.getExternalContext().getRequestMap();
+    
     Integer nestLevelObject = (Integer)requestMap.get(PANEL_FORM_NEST_LEVEL_KEY);
     if ( (nestLevelObject != null) &&
       (nestLevelObject.intValue() > 0) ) // top-aligned (labels stacked above fields)
@@ -942,9 +955,10 @@
   private PropertyKey _maxColumnsKey;
 
   // Overallocate because we basically want everything to miss
-  private static final Set _UNSUPPORTED_RENDERER_TYPES = new HashSet(64);
+  private static final Set<String> _UNSUPPORTED_RENDERER_TYPES;
   static
   {
+    _UNSUPPORTED_RENDERER_TYPES = new HashSet<String>(64);
     _UNSUPPORTED_RENDERER_TYPES.add("org.apache.myfaces.trinidad.Hidden");
     _UNSUPPORTED_RENDERER_TYPES.add("org.apache.myfaces.trinidad.Shuttle");
     _UNSUPPORTED_RENDERER_TYPES.add("org.apache.myfaces.trinidad.rich.Hidden");
@@ -957,8 +971,8 @@
   private static final int _COLUMNS_DEFAULT = 3;
 
   // we need a  resource key map since we are using LabelAndMessageRenderer.
-  private static final Map _RESOURCE_KEY_SIDE_BY_SIDE_MAP = new HashMap();
-  private static final Map _RESOURCE_KEY_STACKED_MAP = new HashMap();
+  private static final Map<String, String> _RESOURCE_KEY_SIDE_BY_SIDE_MAP;
+  private static final Map<String, String> _RESOURCE_KEY_STACKED_MAP;
 
   static
   {
@@ -967,6 +981,8 @@
     // instead of the generic prompt cell style.
 
     // Start-aligned labels for side-by-side orientation:
+    _RESOURCE_KEY_SIDE_BY_SIDE_MAP = new HashMap<String, String>();
+    
     _RESOURCE_KEY_SIDE_BY_SIDE_MAP.put(
       XhtmlConstants.AF_LABEL_TEXT_STYLE_CLASS,
       XhtmlConstants.AF_PANEL_FORM_LABEL_CELL_STYLE_CLASS);
@@ -978,6 +994,8 @@
       XhtmlConstants.AF_PANEL_FORM_MESSAGE_CELL_STYLE_CLASS);
 
     // Stacked labels for one-over-the-other orientation:
+    _RESOURCE_KEY_STACKED_MAP = new HashMap<String, String>();
+    
     _RESOURCE_KEY_STACKED_MAP.put(
       XhtmlConstants.AF_LABEL_TEXT_STYLE_CLASS,
       XhtmlConstants.AF_PANEL_FORM_LABEL_STACKED_CELL_STYLE_CLASS);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupLayoutRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelGroupLayoutRenderer.java Sun Aug  6 16:12:37 2006
@@ -36,18 +36,20 @@
     super(CorePanelGroupLayout.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
     _layoutKey = type.findKey("layout");
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -102,6 +104,7 @@
   /**
    * Render all the children of the PanelGroup
    */
+  @SuppressWarnings("unchecked")
   private void _encodeChildren(
     FacesContext context,
     UIComponent  component,
@@ -111,16 +114,12 @@
   {
     ResponseWriter rw = context.getResponseWriter();
 
-    List children   = component.getChildren();
-    int  childCount = component.getChildCount();
-
     UIComponent separator = getFacet(component,
                                      CorePanelGroupLayout.SEPARATOR_FACET);
 
     boolean needSeparator = false;
-    for (int i = 0; i < childCount; i++)
+    for(UIComponent child : (List<UIComponent>)component.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
       if (!child.isRendered())
         continue;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java Sun Aug  6 16:12:37 2006
@@ -26,6 +26,7 @@
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelHeader;
 
 
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
@@ -48,6 +49,7 @@
     super(type);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -57,12 +59,13 @@
     _messageTypeKey = type.findKey("messageType");
   }
   
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -138,7 +141,7 @@
     // need to clear after the header or you get strange behavior
     if ( nesting &&
          isIE(arc) &&
-         arc.getAgent().OS_WINDOWS == arc.getAgent().getAgentOS())
+         TrinidadAgent.OS_WINDOWS == arc.getAgent().getAgentOS())
     {
       writer.startElement("div", component);
       writer.writeAttribute("style","clear:both", null);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHorizontalLayoutRenderer.java Sun Aug  6 16:12:37 2006
@@ -36,6 +36,7 @@
     super(CorePanelHorizontalLayout.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -43,12 +44,13 @@
     _halignKey = type.findKey("halign");
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -94,6 +96,7 @@
   /**
    * Render all the children of the PanelGroup
    */
+  @SuppressWarnings("unchecked")
   private void _encodeChildren(
     FacesContext context,
     RenderingContext arc,
@@ -103,10 +106,6 @@
     ) throws IOException
   {
 
-    List children   = component.getChildren();
-    int  childCount = component.getChildCount();
-
-
     UIComponent separator = getFacet(component,
                                      CorePanelHorizontalLayout.SEPARATOR_FACET);
 
@@ -123,9 +122,8 @@
     else
       isEndAlignment = false;
     
-    for (int i = 0; i < childCount; i++)
+    for(UIComponent child : (List<UIComponent>)component.getChildren())
     {
-      UIComponent child = (UIComponent) children.get(i);
       if (!child.isRendered())
         continue;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelLabelAndMessageRenderer.java Sun Aug  6 16:12:37 2006
@@ -39,6 +39,7 @@
     super(CorePanelLabelAndMessage.TYPE);
   }
   
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -46,18 +47,20 @@
     _labelInlineStyleKey = type.findKey("labelStyle");
   }    
 
+  @Override
   protected boolean labelShowRequired(FacesBean bean)
   {
     // Simpler algorithm for panelLabelAndMessage
     return getShowRequired(bean);
-  }
-  
+  } 
  
+  @Override
   protected String getRootStyleClass(FacesBean bean)
   {
     return "af|panelLabelAndMessage";
   }
   
+  @Override
   protected String getLabelFor(
     FacesContext        context,
     RenderingContext arc,
@@ -71,6 +74,7 @@
                                        forValue);
   }
 
+  @Override
   protected void renderFieldCellContents(
     FacesContext        context,
     RenderingContext arc,
@@ -124,6 +128,7 @@
     rw.endElement("table");
   }
 
+  @Override
   protected boolean hasMessage(
     FacesContext        context,
     RenderingContext arc,
@@ -138,6 +143,7 @@
     return toString(bean.getProperty(_forKey));
   }
 
+  @Override
   protected String getLabelInlineStyleKey(FacesBean bean)
   {
     return toString(bean.getProperty(_labelInlineStyleKey));

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelListRenderer.java Sun Aug  6 16:12:37 2006
@@ -38,6 +38,7 @@
     super(CorePanelList.TYPE);
   }
 
+  @Override
   protected void findTypeConstants(FacesBean.Type type)
   {
     super.findTypeConstants(type);
@@ -51,6 +52,7 @@
    * We want to render the styleClass/inlineStyle attributes as well
    * as our component styleClass.
    */
+  @Override
   protected void renderStyleAttributes(
     FacesContext        context,
     RenderingContext arc,
@@ -60,12 +62,13 @@
                           XhtmlConstants.AF_PANEL_LIST_STYLE_CLASS);
   }
 
-
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -126,6 +129,7 @@
 
   // render without columns. Called when rows > children or when we have
   // multiple columns, and we are rendering a single column.
+  @SuppressWarnings("unchecked")
   private int _renderNoColumns(
     FacesContext context,
     RenderingContext arc,
@@ -139,14 +143,14 @@
     int maxChildIndex = component.getChildCount();
     int numRendered = 0;
     int childIndex = start;
-    List children   = component.getChildren();
+    List<UIComponent> children   = component.getChildren();
 
     writer.startElement("ul", null);
     _renderListStyle(context, bean);
 
     while ( numRendered < numToRender  && childIndex < maxChildIndex)
     {
-      UIComponent child = (UIComponent) children.get(childIndex);
+      UIComponent child = children.get(childIndex);
 
       // if visible child
       if ( child != null && child.isRendered())

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java Sun Aug  6 16:12:37 2006
@@ -59,6 +59,7 @@
     super(type);
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
@@ -73,7 +74,7 @@
     encodeAllChildren(context, component);
   }
 
-
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,
@@ -185,7 +186,7 @@
     PartialPageContext pprContext = arc.getPartialPageContext();
     if (_shouldRenderPartialScripts(pprContext))
     {
-      Iterator targets = pprContext.getRenderedPartialTargets();
+      Iterator<String> targets = pprContext.getRenderedPartialTargets();
       String scripts = scriptBufferingWriter.getBufferedScripts();
 
       ResponseWriter writer = context.getResponseWriter();
@@ -205,7 +206,7 @@
         writer.startElement("pprtargets",null);
         while (targets.hasNext())
         {
-          String target = (String) targets.next();
+          String target = targets.next();
           if (pprContext.isPartialTargetRendered(target))
           {
             writer.startElement("pprtarget", null);
@@ -240,7 +241,8 @@
 
         writer.endElement("script");
 
-        Iterator libraries = scriptBufferingWriter.getBufferedLibraries();
+        Iterator<Object> libraries = 
+          scriptBufferingWriter.getBufferedLibraries();
 
         writer.startElement("script", null);
         XhtmlRenderer.renderScriptTypeAttribute(context, arc);
@@ -287,7 +289,7 @@
 
         while (targets.hasNext())
         {
-          String target = (String) targets.next();
+          String target = targets.next();
           if (pprContext.isPartialTargetRendered(target))
           {
             if (firstRenderedTarget)
@@ -496,11 +498,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _PARTIAL_CACHE_LIBRARY_SCRIPTLET;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc) throws IOException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java Sun Aug  6 16:12:37 2006
@@ -22,7 +22,6 @@
 import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
-import org.apache.myfaces.trinidadinternal.context.RequestContextBean;
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
@@ -50,9 +49,12 @@
    * a "partial" parameter.
    * @todo This is probably unnecessary.
    */
+  @SuppressWarnings("unchecked")
   public static void forcePartialRendering(FacesContext context)
   {
-    Map requestMap = context.getExternalContext().getRequestMap();
+    Map<String, Object> requestMap = 
+      context.getExternalContext().getRequestMap();
+    
     requestMap.put(_PARTIAL_KEY, Boolean.TRUE);
   }
 
@@ -125,20 +127,24 @@
   /**
    * Test if PPR is active during rendering.
    */
+  @SuppressWarnings("unchecked")
   public static boolean isPPRActive(FacesContext context)
   {
-    Map requestScope =
+    Map<String, Object> requestScope =
       context.getExternalContext().getRequestMap();
+    
     return Boolean.TRUE.equals(requestScope.get(_PPR_ACTIVE_FLAG_NAME));
   }
 
   /**
    * Mark that PPR is in fact active during rendering.
    */
+  @SuppressWarnings("unchecked")
   public static void markPPRActive(FacesContext context)
   {
-    Map requestScope =
+    Map<String, Object> requestScope =
       context.getExternalContext().getRequestMap();
+    
     requestScope.put(_PPR_ACTIVE_FLAG_NAME, Boolean.TRUE);
   }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PdaPanelPageHeaderRenderer.java Sun Aug  6 16:12:37 2006
@@ -41,11 +41,13 @@
     super(CorePanelPageHeader.TYPE);
   }
 
+  @Override
   public boolean getRendersChildren()
   {
     return true;
   }
 
+  @Override
   protected void encodeAll(
     FacesContext        context,
     RenderingContext arc,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java Sun Aug  6 16:12:37 2006
@@ -205,11 +205,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _NAV_SUBMIT_SCRIPTLET;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc) throws IOException
@@ -229,11 +231,13 @@
       return _sInstance;
     }
 
+    @Override
     public Object getScriptletKey()
     {
       return _NAV_CHOICE_SUBMIT_SCRIPTLET;
     }
 
+    @Override
     protected void outputScriptletContent(
       FacesContext context,
       RenderingContext arc) throws IOException

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResourceKeyUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResourceKeyUtils.java?rev=429208&r1=429207&r2=429208&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResourceKeyUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResourceKeyUtils.java Sun Aug  6 16:12:37 2006
@@ -34,8 +34,8 @@
    * @param toComponent eg: treeTable
    * @return A new map with the replacesment values.
    */
-  public static Map convertResourceKeyMap(
-    Map original, 
+  public static Map<String, String> convertResourceKeyMap(
+    Map<String, String> original, 
     String fromComponent, 
     String toComponent)
   {
@@ -44,18 +44,27 @@
     String pattern2 = "af|"+fromComponent+":";
     String replace2 = "af|"+toComponent+":";
     
-    Map result = new HashMap(original.size());
-    Iterator entries = original.entrySet().iterator();
-    while(entries.hasNext())
+    Map<String, String> result = 
+      new HashMap<String, String>(original.size());
+    
+    Iterator<Map.Entry<String, String>> entries = 
+      original.entrySet().iterator();
+    
+    for(Map.Entry<String, String> entry : original.entrySet())
     {
-      Map.Entry en = (Map.Entry) entries.next();
-      String value = (String) en.getValue();
+      String value = entry.getValue();
       if (value.startsWith(pattern1))
+      {
         value = _replace(value, pattern1, replace1);
+      }
       else if (value.startsWith(pattern2))
+      {
         value = _replace(value, pattern2, replace2);
-      result.put(en.getKey(), value);
+      }
+      
+      result.put(entry.getKey(), value);
     }
+    
     return result;
   }
   



Mime
View raw message